Attempted to fix splittree problem by not pushing event handler

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index f2d1dbbdf242076d46f5fe3f449437a768cc5c5b..7d8682927afe0ba1017cb757acf7fcdc0584f1aa 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,23 +1,50 @@
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
+#if wxUSE_DIRDLG
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+
 #if defined(__WXMSW__)
-#if defined(__WIN16__) || defined(__GNUWIN32__) || defined(__SALFORDC__)
-#include "wx/generic/dirdlgg.h"
-#else
-#include "wx/msw/dirdlg.h"
-#endif
+    #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
+        #include "wx/generic/dirdlgg.h"
+    #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(__WXMGL__)
+    #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/dirdlg.h"
+    #include "wx/mac/dirdlg.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/dirdlg.h"
 #elif defined(__WXSTUBS__)
-#include "wx/stubs/dirdlg.h"
+    #include "wx/stubs/dirdlg.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// common ::wxDirSelector() function
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+
+WXDLLEXPORT wxString
+wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
+              const wxString& defaultPath = wxEmptyString,
+              long style = 0,
+              const wxPoint& pos = wxDefaultPosition,
+              wxWindow *parent = NULL);
+
+#endif // wxUSE_DIRDLG
+
 #endif
     // _WX_DIRDLG_H_BASE_