Allow wxStaticText to have a custom fg without a custom bg

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index b0d2a7077069187a8ad13266628102b4aed3090f..9f396fdd9caab25a1c64c88c8281df752b45e6b5 100644 (file)
--- 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,17 +16,19 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "choicebase.h"
 #endif
 
+#if wxUSE_CHOICE
+
 #include "wx/ctrlsub.h"     // the base class
 
 // ----------------------------------------------------------------------------
 // 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
@@ -35,16 +37,12 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:
-    // all generic methods are in wxControlWithItems
-
-    // single selection logic
-    virtual void SetSelection(int n) = 0;
-    virtual bool SetStringSelection(const wxString& s);
+    wxChoiceBase() { }
+    virtual ~wxChoiceBase();
 
-    // don't override this
-    virtual void Select(int n) { SetSelection(n); }
+    // all generic methods are in wxControlWithItems
 
-    // set/get the number of columns in the control (as they're not supporte on
+    // 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 ) { }
     virtual int GetColumns() const { return 1 ; }
@@ -52,27 +50,33 @@ public:
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 
+private:
+    DECLARE_NO_COPY_CLASS(wxChoiceBase)
 };
 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class definition
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+#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__)
     #include "wx/gtk/choice.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/choice.h"
 #elif defined(__WXPM__)
     #include "wx/os2/choice.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/choice.h"
 #endif
 
+#endif // wxUSE_CHOICE
+
 #endif
     // _WX_CHOICE_H_BASE_