X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1550d5f80d130fea1c05302e890095b7ad27e085..42d0df0030abbac4ca11a78b2f529133e3c9d986:/include/wx/choice.h

diff --git a/include/wx/choice.h b/include/wx/choice.h
index c11aa35550..a594dba58e 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -16,9 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "choicebase.h"
-#endif
+#include "wx/defs.h"
 
 #if wxUSE_CHOICE
 
@@ -28,7 +26,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
@@ -42,13 +40,6 @@ public:
 
     // all generic methods are in wxControlWithItems
 
-    // single selection logic
-    virtual void SetSelection(int n) = 0;
-    virtual bool SetStringSelection(const wxString& s);
-
-    // don't override this
-    virtual void Select(int n) { SetSelection(n); }
-
     // set/get the number of columns in the control (as they're not supported on
     // most platforms, they do nothing by default)
     virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
@@ -67,7 +58,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"