From 659a6064215c9bf622515b4b4fe2cb8e897555df Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 7 Dec 2001 22:39:35 +0000 Subject: [PATCH] wxFileSystem w/o wxUSE_MIMETYPE fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filesys.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index f350965e66..e83909d847 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -35,10 +35,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) +#if wxUSE_MIMETYPE static wxFileTypeInfo *gs_FSMimeFallbacks = NULL; +#endif wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) { +#if wxUSE_MIMETYPE wxString ext = wxEmptyString, mime = wxEmptyString; wxString loc = GetRightLocation(location); char c; @@ -67,6 +70,9 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) delete ft; return mime; +#else + return wxEmptyString; +#endif } @@ -407,6 +413,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 +448,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(); } }; -- 2.47.2