Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename wxSTREAM_FILEEXTENSION to wxSTREAM_FILEEXT.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-10-29 16:47:20 +00:00
parent 64f8f94ca0
commit 489a164c1c
5 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/stream.h
View File

@@ -328,9 +328,9 @@ protected:
enum wxStreamProtocolType enum wxStreamProtocolType
{ {
wxSTREAM_PROTOCOL, // wxFileSystem protocol (should be only one) wxSTREAM_PROTOCOL, // wxFileSystem protocol (should be only one)
wxSTREAM_MIMETYPE, // Mime types the stream handles wxSTREAM_MIMETYPE, // MIME types the stream handles
wxSTREAM_ENCODING, // The http Content-Encodings the stream handles wxSTREAM_ENCODING, // The HTTP Content-Encodings the stream handles
wxSTREAM_FILEEXTENSION // File extensions the stream handles wxSTREAM_FILEEXT // File extensions the stream handles
}; };
void WXDLLIMPEXP_BASE wxUseFilterClasses(); void WXDLLIMPEXP_BASE wxUseFilterClasses();

8
src/common/stream.cpp
View File

@@ -1121,9 +1121,7 @@ wxString::size_type wxFilterClassFactoryBase::FindExtension(
{ {
size_t len = wxStrlen(location); size_t len = wxStrlen(location);
for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXTENSION); for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXT); *p; p++)
p && *p;
p++)
{ {
size_t l = wxStrlen(*p); size_t l = wxStrlen(*p);
@@ -1137,10 +1135,10 @@ wxString::size_type wxFilterClassFactoryBase::FindExtension(
bool wxFilterClassFactoryBase::CanHandle(const wxChar *protocol, bool wxFilterClassFactoryBase::CanHandle(const wxChar *protocol,
wxStreamProtocolType type) const wxStreamProtocolType type) const
{ {
if (type == wxSTREAM_FILEEXTENSION) if (type == wxSTREAM_FILEEXT)
return FindExtension(protocol) != wxString::npos; return FindExtension(protocol) != wxString::npos;
else else
for (const wxChar *const *p = GetProtocols(type); p && *p; p++) for (const wxChar *const *p = GetProtocols(type); *p; p++)
if (wxStrcmp(*p, protocol) == 0) if (wxStrcmp(*p, protocol) == 0)
return true; return true;

2
src/common/tarstrm.cpp
View File

@@ -110,7 +110,7 @@ wxTarClassFactory::GetProtocols(wxStreamProtocolType type) const
switch (type) { switch (type) {
case wxSTREAM_PROTOCOL: return protocols; case wxSTREAM_PROTOCOL: return protocols;
case wxSTREAM_MIMETYPE: return mimetypes; case wxSTREAM_MIMETYPE: return mimetypes;
case wxSTREAM_FILEEXTENSION: return fileexts; case wxSTREAM_FILEEXT: return fileexts;
default: return empty; default: return empty;
} }
} }

2
src/common/zipstrm.cpp
View File

@@ -159,7 +159,7 @@ wxZipClassFactory::GetProtocols(wxStreamProtocolType type) const
switch (type) { switch (type) {
case wxSTREAM_PROTOCOL: return protocols; case wxSTREAM_PROTOCOL: return protocols;
case wxSTREAM_MIMETYPE: return mimetypes; case wxSTREAM_MIMETYPE: return mimetypes;
case wxSTREAM_FILEEXTENSION: return fileexts; case wxSTREAM_FILEEXT: return fileexts;
default: return empty; default: return empty;
} }
} }

2
src/common/zstream.cpp
View File

@@ -103,7 +103,7 @@ wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
case wxSTREAM_PROTOCOL: return protos; case wxSTREAM_PROTOCOL: return protos;
case wxSTREAM_MIMETYPE: return mimes; case wxSTREAM_MIMETYPE: return mimes;
case wxSTREAM_ENCODING: return encs; case wxSTREAM_ENCODING: return encs;
case wxSTREAM_FILEEXTENSION: return exts; case wxSTREAM_FILEEXT: return exts;
default: return empty; default: return empty;
} }
} }