X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/choice.h?ds=sidebyside diff --git a/include/wx/choice.h b/include/wx/choice.h index 78a678d7f4..164aac07a5 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -6,7 +6,7 @@ // Created: 26.07.99 // RCS-ID: $Id$ // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CHOICE_H_BASE_ @@ -16,9 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #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,12 +40,12 @@ 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); } + // 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 supported on // most platforms, they do nothing by default) @@ -57,6 +55,9 @@ public: // emulate selecting the item event.GetInt() void Command(wxCommandEvent& event); + // override wxItemContainer::IsSorted + virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } + private: DECLARE_NO_COPY_CLASS(wxChoiceBase) }; @@ -67,12 +68,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__) @@ -83,5 +88,4 @@ private: #endif // wxUSE_CHOICE -#endif - // _WX_CHOICE_H_BASE_ +#endif // _WX_CHOICE_H_BASE_