updated after wxFileType change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 3745b47e4b2e7232f5232049abcb995fb45a9a30..e6a1c6822eb854cfdc88f8bfc0eaf653e7b53aa9 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -1529,8 +1529,17 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
     wxFileType *ft = (mime.IsEmpty()) ?
                    wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
                    wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
     wxFileType *ft = (mime.IsEmpty()) ?
                    wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
                    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;
         m_HashTable->Put(extension, new wxFileIconEntry(newid));
     {
         int newid = file;
         m_HashTable->Put(extension, new wxFileIconEntry(newid));


@@ -1541,8 +1550,6 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
     tmpBmp.CopyFromIcon(ic);
     wxImage img = tmpBmp.ConvertToImage();
 
     tmpBmp.CopyFromIcon(ic);
     wxImage img = tmpBmp.ConvertToImage();
 

-    delete ft;
-

     int id = m_smallImageList->GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)
         m_smallImageList->Add(wxBitmap(img));
     int id = m_smallImageList->GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)
         m_smallImageList->Add(wxBitmap(img));