Renamed DrawCheckButton due to conflict with existing and public api of wxUniversal...

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

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 1b9cc357640b12fe989ce33c6468cf7c646f6067..2c50f0ec39d926f3f25430774390bc122c1d4cd2 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -13,11 +13,9 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_DIRDLG
 
 #ifndef WX_PRECOMP
 #if wxUSE_DIRDLG
 
 #ifndef WX_PRECOMP


@@ -81,7 +79,17 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
                                        const wxString& defaultPath, long style,
                                        const wxPoint& pos, const wxSize& sz,
                                        const wxString& name):
                                        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* WXUNUSED(parent),
+                                const wxString& WXUNUSED(title),
+                                const wxString& defaultPath, long style,
+                                const wxPoint& WXUNUSED(pos),
+                                const wxSize& WXUNUSED(sz),
+                                const wxString& WXUNUSED(name))

 {
     wxBusyCursor cursor;
 
 {
     wxBusyCursor cursor;
 


@@ -195,12 +203,12 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     SetAutoLayout( true );
     SetSizer( topsizer );
 
     SetAutoLayout( true );
     SetSizer( topsizer );
 

-#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );

-#endif
+
+    return true;

 }
 
 void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 }
 
 void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))