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

updated after wxFileType change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-22 00:22:39 +00:00
parent 3e3362daa8
commit 55d0aaa372
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/generic/dirctrlg.cpp
View File

@@ -1529,8 +1529,17 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
wxFileType *ft = (mime.IsEmpty()) ? wxFileType *ft = (mime.IsEmpty()) ?
wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) : wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime); wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
wxIconLocation iconLoc;
wxIcon ic; wxIcon ic;
if (ft == NULL || (!ft->GetIcon(&ic)) || (!ic.Ok())) if ( ft && ft->GetIcon(&iconLoc) )
{
ic = wxIcon(iconLoc);
}
delete ft;
if ( !ic.Ok() )
{ {
int newid = file; int newid = file;
m_HashTable->Put(extension, new wxFileIconEntry(newid)); m_HashTable->Put(extension, new wxFileIconEntry(newid));
@@ -1541,8 +1550,6 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
tmpBmp.CopyFromIcon(ic); tmpBmp.CopyFromIcon(ic);
wxImage img = tmpBmp.ConvertToImage(); wxImage img = tmpBmp.ConvertToImage();
delete ft;
int id = m_smallImageList->GetImageCount(); int id = m_smallImageList->GetImageCount();
if (img.GetWidth() == 16 && img.GetHeight() == 16) if (img.GetWidth() == 16 && img.GetHeight() == 16)
m_smallImageList->Add(wxBitmap(img)); m_smallImageList->Add(wxBitmap(img));