oops, more fixes needed

[wxWidgets.git] / src / generic / dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index a32eb64c4ce10a6bc4a32e9e07c2cc7dbe0206b8..660128edf2d91223705608e6eaa8ba164ae15e15 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -1146,11 +1146,7 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin
 
 int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
 {
 
 int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
 {

-#if wxUSE_FILEDLG

     return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters );
     return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters );

-#else
-    return 0;
-#endif

 }
 
 void wxGenericDirCtrl::DoResize()
 }
 
 void wxGenericDirCtrl::DoResize()


@@ -1645,9 +1641,13 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
 
     wxIconLocation iconLoc;
     wxIcon ic;
 
     wxIconLocation iconLoc;
     wxIcon ic;

-    if ( ft && ft->GetIcon(&iconLoc) )
+

     {
     {

-        ic = wxIcon(iconLoc);
+        wxLogNull logNull;
+        if ( ft && ft->GetIcon(&iconLoc) )
+        {
+            ic = wxIcon(iconLoc);
+        }

     }
 
     delete ft;
     }
 
     delete ft;


@@ -1662,6 +1662,13 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
     wxBitmap bmp;
     bmp.CopyFromIcon(ic);
 
     wxBitmap bmp;
     bmp.CopyFromIcon(ic);
 

+    if ( !bmp.Ok() )
+    {
+        int newid = file;
+        m_HashTable->Put(extension, new wxFileIconEntry(newid));
+        return newid;
+    }
+

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