added XRC handler for wxStdDialogButtonSizer

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

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index df96a83102dc8e46ca73fb3d902e79cabdfc2070..0dbf1be3a9955b35b8cce4a3ee213a1cc8ceb438 100644 (file)
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -36,18 +36,25 @@
 
 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_dialogStyle = 0;
+    m_parent = NULL;
+}
+
+bool wxFileDialogBase::Create(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;
+
     m_parent = parent;
     m_dialogStyle = style;
     m_filterIndex = 0;
@@ -78,6 +85,8 @@ wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
                          );
         }
     }
+
+    return true;
 }
 
 #if WXWIN_COMPATIBILITY_2_4
@@ -88,7 +97,7 @@ int wxFileDialogBase::ParseWildcard(const wxString& filterStr,
                                     wxArrayString& descriptions,
                                     wxArrayString& filters)
 {
-    return ::wxParseWildcard(filterStr, descriptions, filters);
+    return ::wxParseCommonDialogsFilter(filterStr, descriptions, filters);
 }
 #endif // WXWIN_COMPATIBILITY_2_4
 
@@ -99,7 +108,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;
 
@@ -107,7 +116,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
@@ -116,7 +125,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) ||
-        (ext.Strip(wxString::both).IsEmpty()))
+        (ext.Strip(wxString::both).empty()))
         return filePath;
 
     // if fileName doesn't have a '.' then add one
@@ -175,7 +184,7 @@ wxString wxFileSelector(const wxChar *title,
 
         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++)
                 {
             if (filters[n].Contains(defaultExtension))
@@ -214,10 +223,10 @@ wxString wxFileSelectorEx(const wxChar *title,
 
 {
     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;
@@ -277,7 +286,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);
 }
 
 //----------------------------------------------------------------------------
@@ -289,7 +298,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