Trying to commit wxDirDialog patch.

[wxWidgets.git] / src / generic / dirdlgg.cpp

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 5c5ca450872d4585b1ff634fe658135bee3f998f..e52fea9d913527cc81627e9631def6c34314d382 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -79,7 +79,15 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
                                        const wxString& defaultPath, long style,
                                        const wxPoint& pos, const wxSize& sz,
                                        const wxString& name):
-                wxDialog(parent, ID_DIRCTRL, title, pos, sz, style, name)
+                wxDirDialogBase(parent, title, defaultPath, style, pos, sz, name)
+{
+    Create(parent, title, defaultPath, style, pos, sz, name);
+}
+
+bool wxGenericDirDialog::Create(wxWindow* parent, const wxString& title,
+                                       const wxString& defaultPath, long style,
+                                       const wxPoint& pos, const wxSize& sz,
+                                       const wxString& name)
 {
     wxBusyCursor cursor;
 
@@ -197,6 +205,8 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     topsizer->Fit( this );
 
     Centre( wxBOTH );
+
+    return true;
 }
 
 void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))