Get rid of wxFontMapper in wxBase library.

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index b9e6edd3a6183afb6901821e28c0960ba5c9d463..c1d0a50fd4d5e2f7fb8605eae728f02f6d21d5e9 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -9,9 +9,9 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;

 
 #define wxDD_DEFAULT_STYLE \
     (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
 
 #define wxDD_DEFAULT_STYLE \
     (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)


@@ -43,11 +43,16 @@ public:
 */
 
 // Universal and non-port related switches with need for generic implementation
 */
 
 // Universal and non-port related switches with need for generic implementation

-#if defined(__WXUNIVERSAL__) || \
-    defined(__WXWINCE__)     || \
-    defined(__SALFORDC__)    || \
-    !wxUSE_OLE               || \
-    (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
+#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
+                           defined(__SALFORDC__)    || \
+                           !wxUSE_OLE               || \
+                           (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+
+    #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+
+// MS PocketPC or MS Smartphone
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)

 
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog