fixed library order (important for static linking under Unix

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index d2d38c0bdde9ed57485f5d72681f99916cc050f7..c1d0a50fd4d5e2f7fb8605eae728f02f6d21d5e9 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -9,9 +9,9 @@
 // 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)
@@ -51,8 +51,8 @@ public:
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 
-// MS Smartphone
-#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
+// MS PocketPC or MS Smartphone
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
 
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog