X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/choice.h

diff --git a/include/wx/choice.h b/include/wx/choice.h
index b6600e3592..ea08445c75 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,6 +20,8 @@
     #pragma interface "choicebase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_CHOICE
 
 #include "wx/ctrlsub.h"     // the base class
@@ -28,7 +30,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 +44,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,6 +62,8 @@ private:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/choice.h"
+#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    #include "wx/msw/wince/choicece.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)