X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..a57d600f1aa4bae88f4c9b8d89a35332c412939e:/include/wx/choice.h

diff --git a/include/wx/choice.h b/include/wx/choice.h
index a86635b080..63f3267936 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,9 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #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,12 +58,16 @@ 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__)
     #include "wx/motif/choice.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/choice.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXCOCOA__)