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

8
include/wx/stream.h
View File

@@ -327,10 +327,10 @@ protected:
enum wxStreamProtocolType
{
wxSTREAM_PROTOCOL, // wxFileSystem protocol (should be only one)
wxSTREAM_MIMETYPE, // Mime types the stream handles
wxSTREAM_ENCODING, // The http Content-Encodings the stream handles
wxSTREAM_FILEEXTENSION // File extensions the stream handles
wxSTREAM_PROTOCOL, // wxFileSystem protocol (should be only one)
wxSTREAM_MIMETYPE, // MIME types the stream handles
wxSTREAM_ENCODING, // The HTTP Content-Encodings the stream handles
wxSTREAM_FILEEXT // File extensions the stream handles
};
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);
for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXTENSION);
p && *p;
p++)
for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXT); *p; p++)
{
size_t l = wxStrlen(*p);
@@ -1137,10 +1135,10 @@ wxString::size_type wxFilterClassFactoryBase::FindExtension(
bool wxFilterClassFactoryBase::CanHandle(const wxChar *protocol,
wxStreamProtocolType type) const
{
if (type == wxSTREAM_FILEEXTENSION)
if (type == wxSTREAM_FILEEXT)
return FindExtension(protocol) != wxString::npos;
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)
return true;

8
src/common/tarstrm.cpp
View File

@@ -108,10 +108,10 @@ wxTarClassFactory::GetProtocols(wxStreamProtocolType type) const
static const wxChar *empty[] = { NULL };
switch (type) {
case wxSTREAM_PROTOCOL: return protocols;
case wxSTREAM_MIMETYPE: return mimetypes;
case wxSTREAM_FILEEXTENSION: return fileexts;
default: return empty;
case wxSTREAM_PROTOCOL: return protocols;
case wxSTREAM_MIMETYPE: return mimetypes;
case wxSTREAM_FILEEXT: return fileexts;
default: return empty;
}
}

8
src/common/zipstrm.cpp
View File

@@ -157,10 +157,10 @@ wxZipClassFactory::GetProtocols(wxStreamProtocolType type) const
static const wxChar *empty[] = { NULL };
switch (type) {
case wxSTREAM_PROTOCOL: return protocols;
case wxSTREAM_MIMETYPE: return mimetypes;
case wxSTREAM_FILEEXTENSION: return fileexts;
default: return empty;
case wxSTREAM_PROTOCOL: return protocols;
case wxSTREAM_MIMETYPE: return mimetypes;
case wxSTREAM_FILEEXT: return fileexts;
default: return empty;
}
}

10
src/common/zstream.cpp
View File

@@ -100,11 +100,11 @@ wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
{ NULL };
switch (type) {
case wxSTREAM_PROTOCOL: return protos;
case wxSTREAM_MIMETYPE: return mimes;
case wxSTREAM_ENCODING: return encs;
case wxSTREAM_FILEEXTENSION: return exts;
default: return empty;
case wxSTREAM_PROTOCOL: return protos;
case wxSTREAM_MIMETYPE: return mimes;
case wxSTREAM_ENCODING: return encs;
case wxSTREAM_FILEEXT: return exts;
default: return empty;
}
}