X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc197ed421a6a9bac9de570fa6a8beceb7d8c3e1..6c2cd2a2116c5eff1646e0acb7cad2c887300300:/src/common/fldlgcmn.cpp

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 307c1ffd8a..7c6e7fda2c 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -19,6 +19,7 @@
 #if wxUSE_FILEDLG
 
 #include "wx/filedlg.h"
+#include "wx/dirdlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
@@ -34,8 +35,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
 
 void wxFileDialogBase::Init()
 {
-    m_filterIndex =
+    m_filterIndex = 0;
     m_windowStyle = 0;
+    m_extraControl = NULL;
+    m_extraControlCreator = NULL;
 }
 
 bool wxFileDialogBase::Create(wxWindow *parent,
@@ -101,18 +104,6 @@ bool wxFileDialogBase::Create(wxWindow *parent,
     return true;
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-// Parses the filterStr, returning the number of filters.
-// Returns 0 if none or if there's a problem.
-// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
-int wxFileDialogBase::ParseWildcard(const wxString& filterStr,
-                                    wxArrayString& descriptions,
-                                    wxArrayString& filters)
-{
-    return ::wxParseCommonDialogsFilter(filterStr, descriptions, filters);
-}
-#endif // WXWIN_COMPATIBILITY_2_4
-
 #if WXWIN_COMPATIBILITY_2_6
 long wxFileDialogBase::GetStyle() const
 {
@@ -160,20 +151,37 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
     return filePath + ext;
 }
 
+bool wxFileDialogBase::SetExtraControlCreator(ExtraControlCreatorFunction c)
+{
+    wxCHECK_MSG( !m_extraControlCreator, false,
+                 "wxFileDialog::SetExtraControl() called second time" );
+
+    m_extraControlCreator = c;
+    return SupportsExtraControl();
+}
+
+bool wxFileDialogBase::CreateExtraControl()
+{
+    if (!m_extraControlCreator || m_extraControl)
+        return false;
+    m_extraControl = (*m_extraControlCreator)(this);
+    return true;
+}
+
 //----------------------------------------------------------------------------
 // wxFileDialog convenience functions
 //----------------------------------------------------------------------------
 
-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 wxString& title,
+                        const wxString& defaultDir,
+                        const wxString& defaultFileName,
+                        const wxString& defaultExtension,
+                        const wxString& filter,
+                        int flags,
+                        wxWindow *parent,
+                        int x, int y)
 {
-    // The defaultExtension, if non-NULL, is
+    // The defaultExtension, if non-empty, is
     // appended to the filename if the user fails to type an extension. The new
     // implementation (taken from wxFileSelectorEx) appends the extension
     // automatically, by looking at the filter specification. In fact this
@@ -185,25 +193,17 @@ wxString wxFileSelector(const wxChar *title,
     // suitable filter.
 
     wxString filter2;
-    if ( defaultExtension && !filter )
+    if ( !defaultExtension.empty() && filter.empty() )
         filter2 = wxString(wxT("*.")) + defaultExtension;
-    else if ( filter )
+    else if ( !filter.empty() )
         filter2 = filter;
 
-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
-
-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-
-    wxFileDialog fileDialog(parent, title, defaultDirString,
-                            defaultFilenameString, filter2,
+    wxFileDialog fileDialog(parent, title, defaultDir,
+                            defaultFileName, filter2,
                             flags, wxPoint(x, y));
 
-   // if filter is of form "All files (*)|*|..." set correct filter index
-    if((wxStrlen(defaultExtension) != 0) && (filter2.Find(wxT('|')) != wxNOT_FOUND))
+    // if filter is of form "All files (*)|*|..." set correct filter index
+    if ( !defaultExtension.empty() && filter2.find(wxT('|')) != wxString::npos )
     {
         int filterIndex = 0;
 
@@ -215,7 +215,7 @@ wxString wxFileSelector(const wxChar *title,
             if (filters[n].Contains(defaultExtension))
             {
                 filterIndex = n;
-                        break;
+                break;
             }
         }
 
@@ -236,22 +236,22 @@ wxString wxFileSelector(const wxChar *title,
 // wxFileSelectorEx
 //----------------------------------------------------------------------------
 
-wxString wxFileSelectorEx(const wxChar *title,
-                          const wxChar *defaultDir,
-                          const wxChar *defaultFileName,
-                          int* defaultFilterIndex,
-                          const wxChar *filter,
-                          int       flags,
-                          wxWindow* parent,
-                          int       x,
-                          int       y)
+wxString wxFileSelectorEx(const wxString& title,
+                          const wxString& defaultDir,
+                          const wxString& defaultFileName,
+                          int*            defaultFilterIndex,
+                          const wxString& filter,
+                          int             flags,
+                          wxWindow*       parent,
+                          int             x,
+                          int             y)
 
 {
     wxFileDialog fileDialog(parent,
-                            title ? title : wxEmptyString,
-                            defaultDir ? defaultDir : wxEmptyString,
-                            defaultFileName ? defaultFileName : wxEmptyString,
-                            filter ? filter : wxEmptyString,
+                            title,
+                            defaultDir,
+                            defaultFileName,
+                            filter,
                             flags, wxPoint(x, y));
 
     wxString filename;
@@ -271,9 +271,9 @@ wxString wxFileSelectorEx(const wxChar *title,
 //----------------------------------------------------------------------------
 
 static wxString wxDefaultFileSelector(bool load,
-                                      const wxChar *what,
-                                      const wxChar *extension,
-                                      const wxChar *default_name,
+                                      const wxString& what,
+                                      const wxString& extension,
+                                      const wxString& default_name,
                                       wxWindow *parent)
 {
     wxString prompt;
@@ -285,11 +285,13 @@ static wxString wxDefaultFileSelector(bool load,
     prompt.Printf(str, what);
 
     wxString wild;
-    const wxChar *ext = extension;
-    if ( ext )
+    wxString ext;
+    if ( !extension.empty() )
     {
-        if ( *ext == wxT('.') )
-            ext++;
+        if ( extension[0u] == _T('.') )
+            ext = extension.substr(1);
+        else
+            ext = extension;
 
         wild.Printf(wxT("*.%s"), ext);
     }
@@ -298,7 +300,7 @@ static wxString wxDefaultFileSelector(bool load,
         wild = wxFileSelectorDefaultWildcardStr;
     }
 
-    return wxFileSelector(prompt, NULL, default_name, ext, wild,
+    return wxFileSelector(prompt, wxEmptyString, default_name, ext, wild,
                           load ? wxFD_OPEN : wxFD_SAVE, parent);
 }
 
@@ -306,9 +308,9 @@ static wxString wxDefaultFileSelector(bool load,
 // wxLoadFileSelector
 //----------------------------------------------------------------------------
 
-WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
-                                        const wxChar *extension,
-                                        const wxChar *default_name,
+WXDLLEXPORT wxString wxLoadFileSelector(const wxString& what,
+                                        const wxString& extension,
+                                        const wxString& default_name,
                                         wxWindow *parent)
 {
     return wxDefaultFileSelector(true, what, extension, default_name, parent);
@@ -318,9 +320,9 @@ WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
 // wxSaveFileSelector
 //----------------------------------------------------------------------------
 
-WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
-                                        const wxChar *extension,
-                                        const wxChar *default_name,
+WXDLLEXPORT wxString wxSaveFileSelector(const wxString& what,
+                                        const wxString& extension,
+                                        const wxString& default_name,
                                         wxWindow *parent)
 {
     return wxDefaultFileSelector(false, what, extension, default_name, parent);