X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19008b7bb87c7fdbc2c6fd9b44f6ab24ca4d6c47..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index f350965e66..5fe6703021 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -35,38 +35,61 @@ IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) +#if wxUSE_MIMETYPE static wxFileTypeInfo *gs_FSMimeFallbacks = NULL; +#endif wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) { - wxString ext = wxEmptyString, mime = wxEmptyString; + wxString ext, mime; wxString loc = GetRightLocation(location); char c; int l = loc.Length(), l2; - wxFileType *ft; l2 = l; - for (int i = l-1; i >= 0; i--) { + for (int i = l-1; i >= 0; i--) + { c = loc[(unsigned int) i]; - if (c == wxT('#')) l2 = i + 1; - if (c == wxT('.')) {ext = loc.Right(l2-i-1); break;} - if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;} + if ( c == wxT('#') ) + l2 = i + 1; + if ( c == wxT('.') ) + { + ext = loc.Right(l2-i-1); + break; + } + if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) ) + return wxEmptyString; } +#if wxUSE_MIMETYPE static bool s_MinimalMimeEnsured = FALSE; if (!s_MinimalMimeEnsured) { - wxTheMimeTypesManager -> AddFallbacks(gs_FSMimeFallbacks); + wxTheMimeTypesManager->AddFallbacks(gs_FSMimeFallbacks); s_MinimalMimeEnsured = TRUE; } - ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext); - if ( !ft || !ft -> GetMimeType(&mime) ) { + wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); + if ( !ft || !ft -> GetMimeType(&mime) ) + { mime = wxEmptyString; } delete ft; return mime; +#else + if ( ext.IsSameAs(wxT("htm"), FALSE) || ext.IsSameAs(_T("html"), FALSE) ) + return wxT("text/html"); + if ( ext.IsSameAs(wxT("jpg"), FALSE) || ext.IsSameAs(_T("jpeg"), FALSE) ) + return wxT("image/jpeg"); + if ( ext.IsSameAs(wxT("gif"), FALSE) ) + return wxT("image/gif"); + if ( ext.IsSameAs(wxT("png"), FALSE) ) + return wxT("image/png"); + if ( ext.IsSameAs(wxT("bmp"), FALSE) ) + return wxT("image/bmp"); + return wxEmptyString; +#endif } @@ -151,10 +174,10 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& // location has Unix path separators wxString right = ms_root + GetRightLocation(location); wxFileName fn(right, wxPATH_UNIX); - + if (!wxFileExists(fn.GetFullPath())) return (wxFSFile*) NULL; - + return new wxFSFile(new wxFileInputStream(fn.GetFullPath()), right, GetMimeTypeFromExt(location), @@ -181,6 +204,7 @@ wxString wxLocalFSHandler::FindNext() //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject) wxList wxFileSystem::m_Handlers; @@ -407,6 +431,7 @@ class wxFileSystemModule : public wxModule { wxFileSystem::AddHandler(new wxLocalFSHandler); + #if wxUSE_MIMETYPE gs_FSMimeFallbacks = new wxFileTypeInfo[6]; gs_FSMimeFallbacks[0] = wxFileTypeInfo("image/jpeg", @@ -441,12 +466,14 @@ class wxFileSystemModule : public wxModule gs_FSMimeFallbacks[5] = // must terminate the table with this! wxFileTypeInfo(); - + #endif return TRUE; } virtual void OnExit() { + #if wxUSE_MIMETYPE delete [] gs_FSMimeFallbacks; + #endif wxFileSystem::CleanUpHandlers(); } };