take pixel sizes into account as well when comparing fonts, not just point sizes...

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

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index df96a83102dc8e46ca73fb3d902e79cabdfc2070..adb37ede67ecc84cfc3775040d1f3c1c97c77ea3 100644 (file)
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/fldlgcmn.cpp
+// Name:        src/common/fldlgcmn.cpp

 // Purpose:     wxFileDialog common functions
 // Author:      John Labenski
 // Modified by:
 // Created:     14.06.03 (extracted from src/*/filedlg.cpp)
 // Purpose:     wxFileDialog common functions
 // Author:      John Labenski
 // Modified by:
 // Created:     14.06.03 (extracted from src/*/filedlg.cpp)

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "filedlg.h"
-#endif
-

 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif


@@ -20,38 +16,61 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_FILEDLG
+
+#include "wx/filedlg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/window.h"
 #endif // WX_PRECOMP
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/window.h"
 #endif // WX_PRECOMP
 

-#include "wx/filedlg.h"
-
-#if wxUSE_FILEDLG
-

 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
 
 //----------------------------------------------------------------------------
 // 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_message(message),
-                  m_dir(defaultDir),
-                  m_fileName(defaultFile),
-                  m_wildCard(wildCard)
+void wxFileDialogBase::Init()

 {
 {

+    m_filterIndex =
+    m_windowStyle = 0;
+}
+
+bool wxFileDialogBase::Create(wxWindow *parent,
+                              const wxString& message,
+                              const wxString& defaultDir,
+                              const wxString& defaultFile,
+                              const wxString& wildCard,
+                              long style,
+                              const wxPoint& WXUNUSED(pos),
+                              const wxSize& WXUNUSED(sz),
+                              const wxString& WXUNUSED(name))
+{
+    m_message = message;
+    m_dir = defaultDir;
+    m_fileName = defaultFile;
+    m_wildCard = wildCard;
+

     m_parent = parent;
     m_parent = parent;

-    m_dialogStyle = style;
+    m_windowStyle = style;

     m_filterIndex = 0;
 
     m_filterIndex = 0;
 

+    if (!HasFlag(wxFD_OPEN) && !HasFlag(wxFD_SAVE))
+        m_windowStyle |= wxFD_OPEN;     // wxFD_OPEN is the default
+
+    // check that the styles are not contradictory
+    wxASSERT_MSG( !(HasFlag(wxFD_SAVE) && HasFlag(wxFD_OPEN)),
+                  _T("can't specify both wxFD_SAVE and wxFD_OPEN at once") );
+
+    wxASSERT_MSG( !HasFlag(wxFD_SAVE) ||
+                    (!HasFlag(wxFD_MULTIPLE) && !HasFlag(wxFD_FILE_MUST_EXIST)),
+                   _T("wxFD_MULTIPLE or wxFD_FILE_MUST_EXIST can't be used with wxFD_SAVE" ) );
+
+    wxASSERT_MSG( !HasFlag(wxFD_OPEN) || !HasFlag(wxFD_OVERWRITE_PROMPT),
+                  _T("wxFD_OVERWRITE_PROMPT can't be used with wxFD_OPEN") );
+

     if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
     {
         m_wildCard = wxString::Format(_("All files (%s)|%s"),
     if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
     {
         m_wildCard = wxString::Format(_("All files (%s)|%s"),


@@ -78,6 +97,8 @@ wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
                          );
         }
     }
                          );
         }
     }

+
+    return true;

 }
 
 #if WXWIN_COMPATIBILITY_2_4
 }
 
 #if WXWIN_COMPATIBILITY_2_4


@@ -88,7 +109,7 @@ int wxFileDialogBase::ParseWildcard(const wxString& filterStr,
                                     wxArrayString& descriptions,
                                     wxArrayString& filters)
 {
                                     wxArrayString& descriptions,
                                     wxArrayString& filters)
 {

-    return ::wxParseWildcard(filterStr, descriptions, filters);
+    return ::wxParseCommonDialogsFilter(filterStr, descriptions, filters);

 }
 #endif // WXWIN_COMPATIBILITY_2_4
 
 }
 #endif // WXWIN_COMPATIBILITY_2_4
 


@@ -99,16 +120,16 @@ 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
     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))
+    int idx_dot = fileName.Find(wxT('.'), true);
+    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.length() - 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
         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))
+    int idx_ext_dot = ext.Find(wxT('.'), true);
+    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.length() - 1))

         return filePath;
     else
         ext = ext.AfterLast(wxT('.'));
         return filePath;
     else
         ext = ext.AfterLast(wxT('.'));


@@ -116,7 +137,7 @@ wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
     // if ext == "*" or "bar*" or "b?r" or " " then its not valid
     if ((ext.Find(wxT('*')) != wxNOT_FOUND) ||
         (ext.Find(wxT('?')) != wxNOT_FOUND) ||
     // 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()))
+        (ext.Strip(wxString::both).empty()))

         return filePath;
 
     // if fileName doesn't have a '.' then add one
         return filePath;
 
     // if fileName doesn't have a '.' then add one


@@ -170,24 +191,24 @@ wxString wxFileSelector(const wxChar *title,
 
    // 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((wxStrlen(defaultExtension) != 0) && (filter2.Find(wxT('|')) != wxNOT_FOUND))

-            {
+    {

         int filterIndex = 0;
 
         wxArrayString descriptions, filters;
         // don't care about errors, handled already by wxFileDialog
         int filterIndex = 0;
 
         wxArrayString descriptions, filters;
         // don't care about errors, handled already by wxFileDialog

-        (void)wxParseWildcard(filter2, descriptions, filters);
+        (void)wxParseCommonDialogsFilter(filter2, descriptions, filters);

         for (size_t n=0; n<filters.GetCount(); n++)
         for (size_t n=0; n<filters.GetCount(); n++)

-                {
+        {

             if (filters[n].Contains(defaultExtension))
             if (filters[n].Contains(defaultExtension))

-                    {
+            {

                 filterIndex = n;
                         break;
                 filterIndex = n;
                         break;

-                    }
-                }
+            }
+        }

 
         if (filterIndex > 0)
             fileDialog.SetFilterIndex(filterIndex);
 
         if (filterIndex > 0)
             fileDialog.SetFilterIndex(filterIndex);

-        }
+    }

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


@@ -214,10 +235,10 @@ wxString wxFileSelectorEx(const wxChar *title,
 
 {
     wxFileDialog fileDialog(parent,
 
 {
     wxFileDialog fileDialog(parent,

-                            title ? title : wxT(""),
-                            defaultDir ? defaultDir : wxT(""),
-                            defaultFileName ? defaultFileName : wxT(""),
-                            filter ? filter : wxT(""),
+                            title ? title : wxEmptyString,
+                            defaultDir ? defaultDir : wxEmptyString,
+                            defaultFileName ? defaultFileName : wxEmptyString,
+                            filter ? filter : wxEmptyString,

                             flags, wxPoint(x, y));
 
     wxString filename;
                             flags, wxPoint(x, y));
 
     wxString filename;


@@ -265,7 +286,7 @@ static wxString wxDefaultFileSelector(bool load,
     }
 
     return wxFileSelector(prompt, NULL, default_name, ext, wild,
     }
 
     return wxFileSelector(prompt, NULL, default_name, ext, wild,

-                          load ? wxOPEN : wxSAVE, parent);
+                          load ? wxFD_OPEN : wxFD_SAVE, parent);

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -277,7 +298,7 @@ WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
                                         const wxChar *default_name,
                                         wxWindow *parent)
 {
                                         const wxChar *default_name,
                                         wxWindow *parent)
 {

-    return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(true, what, extension, default_name, parent);

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -289,8 +310,7 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
                                         const wxChar *default_name,
                                         wxWindow *parent)
 {
                                         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
 }
 
 #endif // wxUSE_FILEDLG

-