X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a62848fdba49396eba4f52c037d2dc82130274b4..77a1771911ed222ba6861ead327c3735fc16a0b1:/src/common/fldlgcmn.cpp

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 6736072ba1..89de49cea4 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -4,15 +4,11 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "filedlg.h"
-#endif
-
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
@@ -36,18 +32,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;
+}
+
+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 +81,8 @@ wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
                          );
         }
     }
+
+    return true;
 }
 
 #if WXWIN_COMPATIBILITY_2_4
@@ -116,7 +121,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
@@ -170,24 +175,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))
-            {
+    {
         int filterIndex = 0;
 
         wxArrayString descriptions, filters;
         // don't care about errors, handled already by wxFileDialog
         (void)wxParseCommonDialogsFilter(filter2, descriptions, filters);
         for (size_t n=0; n<filters.GetCount(); n++)
-                {
+        {
             if (filters[n].Contains(defaultExtension))
-                    {
+            {
                 filterIndex = n;
                         break;
-                    }
-                }
+            }
+        }
 
         if (filterIndex > 0)
             fileDialog.SetFilterIndex(filterIndex);
-        }
+    }
 
     wxString filename;
     if ( fileDialog.ShowModal() == wxID_OK )
@@ -214,10 +219,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;