X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83beee574e109d433c24ae35b7137141f2a4d56d..1bd2ceb57b0cc9f2b07b8bbb7d38d0e0d2381d3a:/include/wx/combobox.h diff --git a/include/wx/combobox.h b/include/wx/combobox.h index bb83358f10..cd19a9a503 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -14,15 +14,6 @@ #include "wx/defs.h" -/* - * wxComboBox style flags - */ -#define wxCB_SIMPLE 0x0004 -#define wxCB_SORT 0x0008 -#define wxCB_READONLY 0x0010 -#define wxCB_DROPDOWN 0x0020 -#define wxCB_FILENAME 0x0040 - #if wxUSE_COMBOBOX extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[]; @@ -68,6 +59,10 @@ public: virtual bool CanUndo() const = 0; virtual bool CanRedo() const = 0; + // may return value different from GetSelection() when the combobox + // dropdown is shown and the user selected, but not yet accepted, a value + // different from the old one in it + virtual int GetCurrentSelection() const { return GetSelection(); } // redeclare inherited SetSelection() overload here as well to avoid // virtual function hiding