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 4e93c93c65acc0efb45e8ebbd7173b3e95c6335b..bb9a22f36d16cea7141c936d94baccc76274b983 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,6 +1,8 @@
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
+#if wxUSE_DIRDLG
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -10,28 +12,40 @@ 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__)
-#include "wx/generic/dirdlgg.h"
-#else
-#include "wx/msw/dirdlg.h"
-#endif
+    #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
 #elif defined(__WXMOTIF__)
-#include "wx/generic/dirdlgg.h"
+    #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
-#include "wx/generic/dirdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dirdlg.h"
+    #include "wx/generic/dirdlgg.h"
+#elif defined(__WXX11__)
+    #include "wx/generic/dirdlgg.h"
+#elif defined(__WXMGL__)
+    #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)
-#ifdef __WXMAC_X__
-#include "wx/generic/dirdlgg.h"
-#else
-#include "wx/mac/dirdlg.h"
-#endif
+    #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
 
+// ----------------------------------------------------------------------------
+// common ::wxDirSelector() function
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+
+WXDLLEXPORT wxString
+wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
+              const wxString& defaultPath = wxEmptyString,
+              long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,
+              const wxPoint& pos = wxDefaultPosition,
+              wxWindow *parent = NULL);
+
+#endif // wxUSE_DIRDLG
+
 #endif
     // _WX_DIRDLG_H_BASE_