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

workarounded false memory leak report

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-11-04 23:32:29 +00:00
parent 3351077305
commit dbb88122c9
1 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/common/filesys.cpp
View File

@@ -35,6 +35,8 @@
IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location) wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
{ {
wxString ext = wxEmptyString, mime = wxEmptyString; wxString ext = wxEmptyString, mime = wxEmptyString;
@@ -53,39 +55,8 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
static bool s_MinimalMimeEnsured = FALSE; static bool s_MinimalMimeEnsured = FALSE;
if (!s_MinimalMimeEnsured) { if (!s_MinimalMimeEnsured) {
static const wxFileTypeInfo fallbacks[] = wxTheMimeTypesManager -> AddFallbacks(gs_FSMimeFallbacks);
{ s_MinimalMimeEnsured = TRUE;
wxFileTypeInfo("image/jpeg",
"",
"",
"JPEG image (from fallback)",
"jpg", "jpeg", NULL),
wxFileTypeInfo("image/gif",
"",
"",
"GIF image (from fallback)",
"gif", NULL),
wxFileTypeInfo("image/png",
"",
"",
"PNG image (from fallback)",
"png", NULL),
wxFileTypeInfo("image/bmp",
"",
"",
"windows bitmap image (from fallback)",
"bmp", NULL),
wxFileTypeInfo("text/html",
"",
"",
"HTML document (from fallback)",
"htm", "html", NULL),
// must terminate the table with this!
wxFileTypeInfo()
};
wxTheMimeTypesManager -> AddFallbacks(fallbacks);
} }
ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext); ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);
@@ -439,10 +410,47 @@ class wxFileSystemModule : public wxModule
virtual bool OnInit() virtual bool OnInit()
{ {
wxFileSystem::AddHandler(new wxLocalFSHandler); wxFileSystem::AddHandler(new wxLocalFSHandler);
gs_FSMimeFallbacks = new wxFileTypeInfo[6];
gs_FSMimeFallbacks[0] =
wxFileTypeInfo("image/jpeg",
"",
"",
"JPEG image (from fallback)",
"jpg", "jpeg", NULL);
gs_FSMimeFallbacks[1] =
wxFileTypeInfo("image/gif",
"",
"",
"GIF image (from fallback)",
"gif", NULL);
gs_FSMimeFallbacks[2] =
wxFileTypeInfo("image/png",
"",
"",
"PNG image (from fallback)",
"png", NULL);
gs_FSMimeFallbacks[3] =
wxFileTypeInfo("image/bmp",
"",
"",
"windows bitmap image (from fallback)",
"bmp", NULL);
gs_FSMimeFallbacks[4] =
wxFileTypeInfo("text/html",
"",
"",
"HTML document (from fallback)",
"htm", "html", NULL);
gs_FSMimeFallbacks[5] =
// must terminate the table with this!
wxFileTypeInfo();
return TRUE; return TRUE;
} }
virtual void OnExit() virtual void OnExit()
{ {
delete gs_FSMimeFallbacks;
wxFileSystem::CleanUpHandlers(); wxFileSystem::CleanUpHandlers();
} }
}; };