Use the OOR typemap for wxTreeCtrls too.

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 63a01f17144a5b2a8f86e600c8042c864ed5358a..bb9a22f36d16cea7141c936d94baccc76274b983 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -12,8 +12,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 #if defined(__WXMSW__)
-    #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
+    #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
@@ -21,12 +22,14 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #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__)
     #include "wx/mac/dirdlg.h"
 #elif defined(__WXPM__)
-    #include "wx/os2/dirdlg.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/dirdlg.h"
+    #include "wx/generic/dirdlgg.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -38,7 +41,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
 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);