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

don't leak wxFileType returned from GetFileTypeFromExtension(); fix compilation with wxUSE_MIMETYPE==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-02 11:25:29 +00:00
parent 6608fdab17
commit e74f12021d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/wxrc/wxrc.cpp
View File

@@ -673,12 +673,17 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
wxString ext = wxFileName(flist[i]).GetExt(); wxString ext = wxFileName(flist[i]).GetExt();
if ( ext.Lower() == _T("xrc") ) if ( ext.Lower() == _T("xrc") )
mime = _T("text/xml"); mime = _T("text/xml");
#if wxUSE_MIMETYPE
else else
{ {
wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext); wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
if ( ft ) if ( ft )
{
ft->GetMimeType(&mime); ft->GetMimeType(&mime);
delete ft;
}
} }
#endif // wxUSE_MIMETYPE
s.Printf(" XRC_ADD_FILE(wxT(\"XRC_resource/" + flist[i] + s.Printf(" XRC_ADD_FILE(wxT(\"XRC_resource/" + flist[i] +
"\"), xml_res_file_%i, xml_res_size_%i, _T(\"%s\"));\n", "\"), xml_res_file_%i, xml_res_size_%i, _T(\"%s\"));\n",