removed redundant code

[wxWidgets.git] / include / wx / dirdlg.h

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index cedb296539123b723e8ded90873f309169ec778f..bb9a22f36d16cea7141c936d94baccc76274b983 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -14,6 +14,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 #if defined(__WXMSW__)
     #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
         #include "wx/generic/dirdlgg.h"
 #if defined(__WXMSW__)
     #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
         #include "wx/generic/dirdlgg.h"

+        #define wxDirDialog wxGenericDirDialog

     #else
         #include "wx/msw/dirdlg.h"
     #endif
     #else
         #include "wx/msw/dirdlg.h"
     #endif


@@ -21,6 +22,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"

+#elif defined(__WXX11__)
+    #include "wx/generic/dirdlgg.h"

 #elif defined(__WXMGL__)
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXMGL__)
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)


@@ -38,7 +41,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,

-              long style = 0,
+              long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,

               const wxPoint& pos = wxDefaultPosition,
               wxWindow *parent = NULL);
 
               const wxPoint& pos = wxDefaultPosition,
               wxWindow *parent = NULL);