Use wxBitmapBase in wxCocoa

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 0fdf57d687be8c1b599bff527c4ff209d82a8872..de203552250f84bcdcde357f9351a2633f3607c1 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -55,6 +55,8 @@
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"
+#include "wx/hash.h"
+#include "wx/file.h"        // for wxS_IXXX constants only
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
@@ -366,16 +368,11 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
-#ifdef __WIN32__
-    wxBitmap myBitmap (ic.GetWidth(), ic.GetHeight() ) ;
-    wxMemoryDC memDC;
-    memDC.SelectObject( myBitmap );
-    memDC.DrawIcon(ic,0,0);
-    memDC.SelectObject( wxNullBitmap );
-    wxImage img = myBitmap.ConvertToImage();
-#else
-    wxImage img = ic.ConvertToImage();
-#endif
+    
+    wxBitmap tmpBmp;
+    tmpBmp.CopyFromIcon(ic);
+    wxImage img = tmpBmp.ConvertToImage();
+    
     delete ft;
 
     int id = m_ImageList.GetImageCount();
@@ -1226,6 +1223,12 @@ wxFileDialog::~wxFileDialog()
         wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
                                ms_lastShowHidden);
     }
+
+    const int count = m_choice->GetCount();
+    for ( int i = 0; i < count; i++ )
+    {
+        delete (wxString *)m_choice->GetClientData(i);
+    }
 }
 
 int wxFileDialog::ShowModal()
@@ -1243,8 +1246,8 @@ void wxFileDialog::DoSetFilterIndex(int filterindex)
     m_filterIndex = filterindex;
     if ( str->Left(2) == wxT("*.") )
     {
-        m_filterExtension = str->Mid(2);
-        if (m_filterExtension == _T("*"))
+        m_filterExtension = str->Mid(1);
+        if (m_filterExtension == _T(".*"))
             m_filterExtension.clear();
     }
     else
@@ -1545,50 +1548,98 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
 // global functions
 // ----------------------------------------------------------------------------
 
+// common part of both wxFileSelectorEx() and wxFileSelector()
+static wxString
+DoSelectFile(const wxChar *title,
+             const wxChar *defaultDir,
+             const wxChar *defaultFileName,
+             const wxChar *defaultExtension,
+             int *indexDefaultExtension,
+             const wxChar *filter,
+             int flags,
+             wxWindow *parent,
+             int x,
+             int y)
+{
+    // the filter may be either given explicitly or created automatically from
+    // the default extension
+    wxString filterReal;
+    if ( filter )
+    {
+        // the user has specified the filter explicitly, use it
+        filterReal = filter;
+    }
+    else if ( !wxIsEmpty(defaultExtension) )
+    {
+        // create the filter to match the given extension
+        filterReal << wxT("*.") << defaultExtension;
+    }
+
+    wxFileDialog fileDialog(parent,
+                            title,
+                            defaultDir,
+                            defaultFileName,
+                            filterReal,
+                            flags,
+                            wxPoint(x, y));
+
+    wxString path;
+    if ( fileDialog.ShowModal() == wxID_OK )
+    {
+        path = fileDialog.GetPath();
+        if ( indexDefaultExtension )
+        {
+            *indexDefaultExtension = fileDialog.GetFilterIndex();
+        }
+    }
+
+    return path;
+}
+
 wxString
-wxFileSelectorEx(const wxChar *message,
-                 const wxChar *default_path,
-                 const wxChar *default_filename,
-                 int *WXUNUSED(indexDefaultExtension),
-                 const wxChar *wildcard,
+wxFileSelectorEx(const wxChar *title,
+                 const wxChar *defaultDir,
+                 const wxChar *defaultFileName,
+                 int *indexDefaultExtension,
+                 const wxChar *filter,
                  int flags,
                  wxWindow *parent,
-                 int x, int y)
+                 int x,
+                 int y)
 {
-    // TODO: implement this somehow
-    return wxFileSelector(message, default_path, default_filename, wxT(""),
-                          wildcard, flags, parent, x, y);
+    return DoSelectFile(title,
+                        defaultDir,
+                        defaultFileName,
+                        wxT(""),                // def ext determined by index
+                        indexDefaultExtension,
+                        filter,
+                        flags,
+                        parent,
+                        x,
+                        y);
 }
 
-wxString wxFileSelector( const wxChar *title,
-                      const wxChar *defaultDir, const wxChar *defaultFileName,
-                      const wxChar *defaultExtension, const wxChar *filter, int flags,
-                      wxWindow *parent, int x, int y )
+wxString
+wxFileSelector(const wxChar *title,
+               const wxChar *defaultDir,
+               const wxChar *defaultFileName,
+               const wxChar *defaultExtension,
+               const wxChar *filter,
+               int flags,
+               wxWindow *parent,
+               int x,
+               int y)
 {
-    wxString filter2;
-    if ( defaultExtension && !filter )
-        filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;
-    else if ( filter )
-        filter2 = filter;
-
-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
-
-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-
-    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
-
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        return fileDialog.GetPath();
-    }
-    else
-    {
-        return wxEmptyString;
-    }
+    return DoSelectFile(title,
+                        defaultDir,
+                        defaultFileName,
+                        defaultExtension,
+                        NULL,               // not interested in filter index
+                        filter,
+                        flags,
+                        parent,
+                        x,
+                        y);
 }
 
 static wxString GetWildcardString(const wxChar *ext)