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

reverted rev 1.26, workarounds for memchecking code no longer needed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-02-28 23:57:15 +00:00
parent b598205862
commit 121680bff0
1 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/common/filesys.cpp
View File

@@ -35,10 +35,6 @@
IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
#if wxUSE_MIMETYPE
static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
#endif
wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
{ {
wxString ext, mime; wxString ext, mime;
@@ -62,10 +58,41 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
} }
#if wxUSE_MIMETYPE #if wxUSE_MIMETYPE
static bool s_MinimalMimeEnsured = FALSE; static bool s_MinimalMimeEnsured = false;
if (!s_MinimalMimeEnsured) { if (!s_MinimalMimeEnsured)
wxTheMimeTypesManager->AddFallbacks(gs_FSMimeFallbacks); {
s_MinimalMimeEnsured = TRUE; static const wxFileTypeInfo fallbacks[] =
{
wxFileTypeInfo(_T("image/jpeg"),
_T(""),
_T(""),
_T("JPEG image (from fallback)"),
_T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
wxFileTypeInfo(_T("image/gif"),
_T(""),
_T(""),
_T("GIF image (from fallback)"),
_T("gif"), _T("GIF"), NULL),
wxFileTypeInfo(_T("image/png"),
_T(""),
_T(""),
_T("PNG image (from fallback)"),
_T("png"), _T("PNG"), NULL),
wxFileTypeInfo(_T("image/bmp"),
_T(""),
_T(""),
_T("windows bitmap image (from fallback)"),
_T("bmp"), _T("BMP"), NULL),
wxFileTypeInfo(_T("text/html"),
_T(""),
_T(""),
_T("HTML document (from fallback)"),
_T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
// must terminate the table with this!
wxFileTypeInfo()
};
wxTheMimeTypesManager->AddFallbacks(fallbacks);
s_MinimalMimeEnsured = true;
} }
wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
@@ -522,50 +549,10 @@ class wxFileSystemModule : public wxModule
virtual bool OnInit() virtual bool OnInit()
{ {
wxFileSystem::AddHandler(new wxLocalFSHandler); wxFileSystem::AddHandler(new wxLocalFSHandler);
return true;
#if wxUSE_MIMETYPE
gs_FSMimeFallbacks = new wxFileTypeInfo[6];
gs_FSMimeFallbacks[0] =
wxFileTypeInfo(_T("image/jpeg"),
_T(""),
_T(""),
_T("JPEG image (from fallback)"),
_T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL);
gs_FSMimeFallbacks[1] =
wxFileTypeInfo(_T("image/gif"),
_T(""),
_T(""),
_T("GIF image (from fallback)"),
_T("gif"), _T("GIF"), NULL);
gs_FSMimeFallbacks[2] =
wxFileTypeInfo(_T("image/png"),
_T(""),
_T(""),
_T("PNG image (from fallback)"),
_T("png"), _T("PNG"), NULL);
gs_FSMimeFallbacks[3] =
wxFileTypeInfo(_T("image/bmp"),
_T(""),
_T(""),
_T("windows bitmap image (from fallback)"),
_T("bmp"), _T("BMP"), NULL);
gs_FSMimeFallbacks[4] =
wxFileTypeInfo(_T("text/html"),
_T(""),
_T(""),
_T("HTML document (from fallback)"),
_T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL);
gs_FSMimeFallbacks[5] =
// must terminate the table with this!
wxFileTypeInfo();
#endif
return TRUE;
} }
virtual void OnExit() virtual void OnExit()
{ {
#if wxUSE_MIMETYPE
delete [] gs_FSMimeFallbacks;
#endif
wxFileSystem::CleanUpHandlers(); wxFileSystem::CleanUpHandlers();
} }
}; };