fixing notebook icons for panther

[wxWidgets.git] / src / common / fldlgcmn.cpp

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index c6059ddb0f1b196be09df426cc786f2bb42a24c6..3f08486a1a545c91713d473391eea15b26a3db40 100644 (file)
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "filedlg.h"
 #endif
 
 #pragma implementation "filedlg.h"
 #endif
 


@@ -30,6 +30,132 @@
 
 #if wxUSE_FILEDLG
 
 
 #if wxUSE_FILEDLG
 

+//----------------------------------------------------------------------------
+// wxFileDialogBase
+//----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
+
+wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
+                                   const wxString& message,
+                                   const wxString& defaultDir,
+                                   const wxString& defaultFile,
+                                   const wxString& wildCard,
+                                   long style,
+                                   const wxPoint& WXUNUSED(pos))
+{
+    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 )
+    {
+        m_wildCard.Printf(_("Files (%s)|%s"),
+                          m_wildCard.c_str(), m_wildCard.c_str());
+    }
+}
+
+// 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();
+}
+
+wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
+                                           const wxString &extensionList)
+{
+    // strip off path, to avoid problems with "path.bar/foo"
+    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);
+    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.Len() - 1))
+        return filePath;
+
+    // get the first extension from extensionList, or all of it
+    wxString ext = extensionList.BeforeFirst(wxT(';'));
+
+    // if ext == "foo" or "foo." there's no extension
+    int idx_ext_dot = ext.Find(wxT('.'), TRUE);
+    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.Len() - 1))
+        return filePath;
+    else
+        ext = ext.AfterLast(wxT('.'));
+
+    // if ext == "*" or "bar*" or "b?r" or " " then its not valid
+    if ((ext.Find(wxT('*')) != wxNOT_FOUND) ||
+        (ext.Find(wxT('?')) != wxNOT_FOUND) ||
+        (ext.Strip(wxString::both).IsEmpty()))
+        return filePath;
+
+    // if fileName doesn't have a '.' then add one
+    if (filePath.Last() != wxT('.'))
+        ext = wxT(".") + ext;
+
+    return filePath + ext;
+}
+
+//----------------------------------------------------------------------------
+// wxFileDialog convenience functions
+//----------------------------------------------------------------------------
+

 wxString wxFileSelector(const wxChar *title,
                                const wxChar *defaultDir,
                                const wxChar *defaultFileName,
 wxString wxFileSelector(const wxChar *title,
                                const wxChar *defaultDir,
                                const wxChar *defaultFileName,


@@ -67,41 +193,28 @@ wxString wxFileSelector(const wxChar *title,
     wxFileDialog fileDialog(parent, title, defaultDirString,
                             defaultFilenameString, filter2,
                             flags, wxPoint(x, y));
     wxFileDialog fileDialog(parent, title, defaultDirString,
                             defaultFilenameString, filter2,
                             flags, wxPoint(x, y));

-    if( wxStrlen(defaultExtension) != 0 )
-    {
-        int filterFind = 0,
-            filterIndex = 0;

 
 

-        for( unsigned int i = 0; i < filter2.Len(); i++ )
-        {
-            if( filter2.GetChar(i) == wxT('|') )
+   // if filter is of form "All files (*)|*|..." set correct filter index
+    if((wxStrlen(defaultExtension) != 0) && (filter2.Find(wxT('|')) != wxNOT_FOUND))

             {
             {

-                // save the start index of the new filter
-                unsigned int is = i++;
-
-                // find the end of the filter
-                for( ; i < filter2.Len(); i++ )
-                {
-                    if(filter2[i] == wxT('|'))
-                        break;
-                }
+        int filterIndex = 0;

 
 

-                if( i-is-1 > 0 && is+1 < filter2.Len() )
+        wxArrayString descriptions, filters;
+        // don't care about errors, handled already by wxFileDialog
+        (void)wxFileDialogBase::ParseWildcard(filter2, descriptions, filters);
+        for (size_t n=0; n<filters.GetCount(); n++)

                 {
                 {

-                    if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )
+            if (filters[n].Contains(defaultExtension))

                     {
                     {

-                        filterFind = filterIndex;
+                filterIndex = n;

                         break;
                     }
                 }
 
                         break;
                     }
                 }
 

-                filterIndex++;
-            }
+        if (filterIndex > 0)
+            fileDialog.SetFilterIndex(filterIndex);

         }
 
         }
 

-        fileDialog.SetFilterIndex(filterFind);
-    }
-

     wxString filename;
     if ( fileDialog.ShowModal() == wxID_OK )
     {
     wxString filename;
     if ( fileDialog.ShowModal() == wxID_OK )
     {


@@ -111,45 +224,9 @@ wxString wxFileSelector(const wxChar *title,
     return filename;
 }
 
     return filename;
 }
 

-
-/*
-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;
-    }
-}
-*/
-
+//----------------------------------------------------------------------------
+// wxFileSelectorEx
+//----------------------------------------------------------------------------

 
 wxString wxFileSelectorEx(const wxChar *title,
                           const wxChar *defaultDir,
 
 wxString wxFileSelectorEx(const wxChar *title,
                           const wxChar *defaultDir,


@@ -181,10 +258,10 @@ wxString wxFileSelectorEx(const wxChar *title,
     return filename;
 }
 
     return filename;
 }
 

+//----------------------------------------------------------------------------
+// wxDefaultFileSelector - Generic load/save dialog (for internal use only)
+//----------------------------------------------------------------------------

 
 

-
-// Generic file load/save dialog (for internal use only)
-//   see wx[Load/Save]FileSelector

 static wxString wxDefaultFileSelector(bool load,
                                       const wxChar *what,
                                       const wxChar *extension,
 static wxString wxDefaultFileSelector(bool load,
                                       const wxChar *what,
                                       const wxChar *extension,


@@ -217,7 +294,10 @@ static wxString wxDefaultFileSelector(bool load,
                           load ? wxOPEN : wxSAVE, parent);
 }
 
                           load ? wxOPEN : wxSAVE, parent);
 }
 

-// Generic file load dialog
+//----------------------------------------------------------------------------
+// wxLoadFileSelector
+//----------------------------------------------------------------------------
+

 WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
                                         const wxChar *extension,
                                         const wxChar *default_name,
 WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
                                         const wxChar *extension,
                                         const wxChar *default_name,


@@ -226,7 +306,10 @@ WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
     return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
 }
 
     return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
 }
 

-// Generic file save dialog
+//----------------------------------------------------------------------------
+// wxSaveFileSelector
+//----------------------------------------------------------------------------
+

 WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
                                         const wxChar *extension,
                                         const wxChar *default_name,
 WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
                                         const wxChar *extension,
                                         const wxChar *default_name,


@@ -235,60 +318,5 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 

-
-// 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 wxParseFileFilter(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();
-}
-

 #endif // wxUSE_FILEDLG
 
 #endif // wxUSE_FILEDLG