Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 6be23181a96c672b44cb13156d63560a2578e728..144e7636b3ae9e3150ad5940674e5e5efa04fb3b 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,8 +1,22 @@
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
 #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(__WXMSW__)

+#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
+#include "wx/generic/dirdlgg.h"
+#else

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

+#endif

 #elif defined(__WXMOTIF__)
 #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
 #elif defined(__WXMOTIF__)
 #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)


@@ -10,10 +24,18 @@
 #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
 

+#endif // wxUSE_DIRDLG
+

 #endif
     // _WX_DIRDLG_H_BASE_
 #endif
     // _WX_DIRDLG_H_BASE_