X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62a879dfa0127253c7d095ed725a89465517bede..033bf67c3cd465dce10b7bfb5c24f62ab83e5a13:/include/wx/choice.h?ds=sidebyside diff --git a/include/wx/choice.h b/include/wx/choice.h index a8743fbb27..16017f87ec 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,9 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma interface "choicebase.h" -#endif +#include "wx/defs.h" + +#if wxUSE_CHOICE #include "wx/ctrlsub.h" // the base class @@ -26,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 @@ -35,19 +35,19 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; class WXDLLEXPORT wxChoiceBase : public wxControlWithItems { public: - // all generic methods are in wxControlWithItems -#ifdef __WXMAC_X__ - virtual ~wxChoiceBase() {} -#endif + wxChoiceBase() { } + virtual ~wxChoiceBase(); - // single selection logic - virtual void SetSelection(int n) = 0; - virtual bool SetStringSelection(const wxString& s); + // all generic methods are in wxControlWithItems - // don't override this - virtual void Select(int n) { SetSelection(n); } + // get the current selection: this can only be different from the normal + // selection if the popup items list is currently opened and the user + // selected some item in it but didn't close the list yet; otherwise (and + // currently always on platforms other than MSW) this is the same as + // GetSelection() + virtual int GetCurrentSelection() const { return GetSelection(); } - // 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 ; } @@ -55,27 +55,34 @@ 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__) +#elif defined(__WXGTK20__) #include "wx/gtk/choice.h" -#elif defined(__WXQT__) - #include "wx/qt/choice.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/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 - // _WX_CHOICE_H_BASE_ +#endif // wxUSE_CHOICE + +#endif // _WX_CHOICE_H_BASE_