X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/choice.h?ds=sidebyside diff --git a/include/wx/choice.h b/include/wx/choice.h index a594dba58e..164aac07a5 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -26,7 +26,7 @@ // global data // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar*) wxChoiceNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[]; // ---------------------------------------------------------------------------- // wxChoice allows to select one of a non-modifiable list of strings @@ -40,6 +40,13 @@ public: // all generic methods are in wxControlWithItems + // 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) virtual void SetColumns(int WXUNUSED(n) = 1 ) { } @@ -48,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) }; @@ -64,8 +74,10 @@ private: #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__) @@ -76,5 +88,4 @@ private: #endif // wxUSE_CHOICE -#endif - // _WX_CHOICE_H_BASE_ +#endif // _WX_CHOICE_H_BASE_