X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f74172ab4256c9e7c665e44e2f94ce12bf84a37f..c1ce7c198801c1766083a245874f07ea20b16407:/src/common/fldlgcmn.cpp

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 512c5a3a70..6736072ba1 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "filedlg.h"
 #endif
 
@@ -42,81 +42,55 @@ wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
                                    const wxString& defaultFile,
                                    const wxString& wildCard,
                                    long style,
-                                   const wxPoint& pos)
+                                   const wxPoint& WXUNUSED(pos))
+                : m_message(message),
+                  m_dir(defaultDir),
+                  m_fileName(defaultFile),
+                  m_wildCard(wildCard)
 {
     m_parent = parent;
-    m_message = message;
-    m_dir = defaultDir;
-    m_fileName = defaultFile;
-    m_wildCard = wildCard;
     m_dialogStyle = style;
-    m_path = wxT("");
     m_filterIndex = 0;
 
-    if (m_wildCard.IsEmpty())
-        m_wildCard = wxFileSelectorDefaultWildcardStr;
-
-    // convert m_wildCard from "*.bar" to "Files (*.bar)|*.bar"
-    if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND )
+    if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
+    {
+        m_wildCard = wxString::Format(_("All files (%s)|%s"),
+                                      wxFileSelectorDefaultWildcardStr,
+                                      wxFileSelectorDefaultWildcardStr);
+    }
+    else // have wild card
     {
-        m_wildCard.Printf(_("Files (%s)|%s"),
-                          m_wildCard.c_str(), m_wildCard.c_str());
+        // convert m_wildCard from "*.bar" to "bar files (*.bar)|*.bar"
+        if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND )
+        {
+            wxString::size_type nDot = m_wildCard.find(_T("*."));
+            if ( nDot != wxString::npos )
+                nDot++;
+            else
+                nDot = 0;
+
+            m_wildCard = wxString::Format
+                         (
+                            _("%s files (%s)|%s"),
+                            wildCard.c_str() + nDot,
+                            wildCard.c_str(),
+                            wildCard.c_str()
+                         );
+        }
     }
 }
 
+#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)
 {
-    descriptions.Clear();
-    filters.Clear();
-
-    wxString str(filterStr);
-
-    wxString description, filter;
-    for ( int pos = 0; pos != wxNOT_FOUND; )
-    {
-        pos = str.Find(wxT('|'));
-        if ( pos == wxNOT_FOUND )
-        {
-            // if there are no '|'s at all in the string just take the entire
-            // string as filter
-            if ( filters.IsEmpty() )
-            {
-                descriptions.Add(filterStr);
-                filters.Add(filterStr);
-            }
-            else
-            {
-                wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
-            }
-
-            break;
-        }
-
-        description = str.Left(pos);
-        str = str.Mid(pos + 1);
-        pos = str.Find(wxT('|'));
-        if ( pos == wxNOT_FOUND )
-        {
-            filter = str;
-        }
-        else
-        {
-            filter = str.Left(pos);
-            str = str.Mid(pos + 1);
-        }
-
-        descriptions.Add(description);
-        filters.Add(filter);
-    }
-
-    return filters.GetCount();
+    return ::wxParseCommonDialogsFilter(filterStr, descriptions, filters);
 }
+#endif // WXWIN_COMPATIBILITY_2_4
 
 wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
                                            const wxString &extensionList)
@@ -125,7 +99,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
     wxString fileName = filePath.AfterLast(wxFILE_SEP_PATH);
 
     // if fileName is of form "foo.bar" it's ok, return it
-    int idx_dot = fileName.Find(wxT('.'), TRUE);
+    int idx_dot = fileName.Find(wxT('.'), true);
     if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.Len() - 1))
         return filePath;
 
@@ -133,7 +107,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
     wxString ext = extensionList.BeforeFirst(wxT(';'));
 
     // if ext == "foo" or "foo." there's no extension
-    int idx_ext_dot = ext.Find(wxT('.'), TRUE);
+    int idx_ext_dot = ext.Find(wxT('.'), true);
     if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.Len() - 1))
         return filePath;
     else
@@ -201,7 +175,7 @@ wxString wxFileSelector(const wxChar *title,
 
         wxArrayString descriptions, filters;
         // don't care about errors, handled already by wxFileDialog
-        (void)wxFileDialogBase::ParseWildcard(filter2, descriptions, filters);
+        (void)wxParseCommonDialogsFilter(filter2, descriptions, filters);
         for (size_t n=0; n<filters.GetCount(); n++)
                 {
             if (filters[n].Contains(defaultExtension))
@@ -303,7 +277,7 @@ WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
                                         const wxChar *default_name,
                                         wxWindow *parent)
 {
-    return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(true, what, extension, default_name, parent);
 }
 
 //----------------------------------------------------------------------------
@@ -315,7 +289,7 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
                                         const wxChar *default_name,
                                         wxWindow *parent)
 {
-    return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(false, what, extension, default_name, parent);
 }
 
 #endif // wxUSE_FILEDLG