fixed GetMargins() compilation

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 26f944b3f1b663877a9a4df5f22e28074dd221bc..4e93c93c65acc0efb45e8ebbd7173b3e95c6335b 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,8 +1,16 @@
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+

 #if defined(__WXMSW__)
 #if defined(__WXMSW__)

-#ifdef __WIN16__
+#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)

 #include "wx/generic/dirdlgg.h"
 #else
 #include "wx/msw/dirdlg.h"
 #include "wx/generic/dirdlgg.h"
 #else
 #include "wx/msw/dirdlg.h"


@@ -14,7 +22,13 @@
 #elif defined(__WXQT__)
 #include "wx/qt/dirdlg.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXQT__)
 #include "wx/qt/dirdlg.h"
 #elif defined(__WXMAC__)

+#ifdef __WXMAC_X__
+#include "wx/generic/dirdlgg.h"
+#else

 #include "wx/mac/dirdlg.h"
 #include "wx/mac/dirdlg.h"

+#endif
+#elif defined(__WXPM__)
+#include "wx/os2/dirdlg.h"

 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dirdlg.h"
 #endif
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dirdlg.h"
 #endif