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

rewritten to use wxTheMimeTypesManager

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-19 23:06:59 +00:00
parent d2a190fe37
commit 737255678c
3 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/filesys.cpp
View File

@@ -26,6 +26,10 @@
#include "wx/wfstream.h"
#include "wx/module.h"
#include "wx/filesys.h"
#include "wx/mimetype.h"
//--------------------------------------------------------------------------------
// wxFileSystemHandler
@@ -33,14 +37,6 @@
IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
wxMimeTypesManager *wxFileSystemHandler::m_MimeMng = NULL;
void wxFileSystemHandler::CleanUpStatics()
{
if (m_MimeMng) delete m_MimeMng;
m_MimeMng = NULL;
}
wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
{
@@ -58,9 +54,8 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;}
}
if (m_MimeMng == NULL) {
m_MimeMng = new wxMimeTypesManager;
static bool s_MinimalMimeEnsured = FALSE;
if (!s_MinimalMimeEnsured) {
static const wxFileTypeInfo fallbacks[] =
{
wxFileTypeInfo("image/jpeg",
@@ -93,10 +88,10 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
wxFileTypeInfo()
};
m_MimeMng -> AddFallbacks(fallbacks);
wxTheMimeTypesManager -> AddFallbacks(fallbacks);
}
ft = m_MimeMng -> GetFileTypeFromExtension(ext);
ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);
if (ft && (ft -> GetMimeType(&mime))) {
delete ft;
return mime;
@@ -412,7 +407,6 @@ class wxFileSystemModule : public wxModule
}
virtual void OnExit()
{
wxFileSystemHandler::CleanUpStatics();
wxFileSystem::CleanUpHandlers();
}
};