X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1be7a35c5ec31b6cfcab9d969c7969586441a945..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/choice.h diff --git a/include/wx/choice.h b/include/wx/choice.h index 63f3267936..164aac07a5 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -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) }; @@ -78,5 +88,4 @@ private: #endif // wxUSE_CHOICE -#endif - // _WX_CHOICE_H_BASE_ +#endif // _WX_CHOICE_H_BASE_