Updated version to 2.5.4

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index c11aa3555030e04456db752875597fa8ecf164bd..47f742605189e407c79859b42c13882a4ee48db2 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -28,7 +28,7 @@
 // global data
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxChoiceNameStr;
 
 // ----------------------------------------------------------------------------
 // wxChoice allows to select one of a non-modifiable list of strings
@@ -67,7 +67,7 @@ private:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/choice.h"
-#elif defined(__SMARTPHONE__)
+#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/choicece.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/choice.h"