fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index f2d1dbbdf242076d46f5fe3f449437a768cc5c5b..00a314639b2a6cbbb23c007f55ef20518f6ca759 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,8 +1,18 @@
 #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__)
+#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
 #include "wx/generic/dirdlgg.h"
 #else
 #include "wx/msw/dirdlg.h"
@@ -11,13 +21,19 @@
 #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/dirdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dirdlg.h"
 #elif defined(__WXMAC__)
+#ifdef __DARWIN__
+#include "wx/generic/dirdlgg.h"
+#else
 #include "wx/mac/dirdlg.h"
+#endif
+#elif defined(__WXPM__)
+#include "wx/os2/dirdlg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dirdlg.h"
 #endif
 
+#endif // wxUSE_DIRDLG
+
 #endif
     // _WX_DIRDLG_H_BASE_