X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..0a7b481fee70afb6736a9a19edcadbc679bdfb2f:/include/wx/choice.h diff --git a/include/wx/choice.h b/include/wx/choice.h index a5fdf70f11..c11aa35550 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,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choicebase.h" #endif @@ -37,9 +37,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; class WXDLLEXPORT wxChoiceBase : public wxControlWithItems { public: - // all generic methods are in wxControlWithItems + wxChoiceBase() { } virtual ~wxChoiceBase(); + // all generic methods are in wxControlWithItems + // single selection logic virtual void SetSelection(int n) = 0; virtual bool SetStringSelection(const wxString& s); @@ -47,13 +49,16 @@ public: // don't override this virtual void Select(int n) { SetSelection(n); } - // 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 ; } // emulate selecting the item event.GetInt() void Command(wxCommandEvent& event); + +private: + DECLARE_NO_COPY_CLASS(wxChoiceBase) }; // ---------------------------------------------------------------------------- @@ -62,6 +67,8 @@ public: #if defined(__WXUNIVERSAL__) #include "wx/univ/choice.h" +#elif defined(__SMARTPHONE__) + #include "wx/msw/wince/choicece.h" #elif defined(__WXMSW__) #include "wx/msw/choice.h" #elif defined(__WXMOTIF__) @@ -70,10 +77,10 @@ public: #include "wx/gtk/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