X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7f62f39092512cda56bc0bb89cdabf156f05385..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/univ/combobox.h?ds=inline diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index 93b3128633..ac63fd63c3 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -34,7 +34,8 @@ class WXDLLIMPEXP_FWD_CORE wxListBox; // NB: Normally we'd like wxComboBox to inherit from wxComboBoxBase, but here // we can't really do that since both wxComboBoxBase and wxComboCtrl inherit // from wxTextCtrl. -class WXDLLIMPEXP_CORE wxComboBox : public wxComboCtrl, public wxItemContainer +class WXDLLIMPEXP_CORE wxComboBox : + public wxWindowWithItems { public: // ctors and such @@ -128,7 +129,9 @@ public: wxItemContainer::Clear(); } - bool IsEmpty() const { return wxItemContainer::IsEmpty(); } + // See wxComboBoxBase discussion of IsEmpty(). + bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } + bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } // wxControlWithItems methods virtual void DoClear(); @@ -141,8 +144,6 @@ public: virtual int GetSelection() const; virtual wxString GetStringSelection() const; - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - // we have our own input handler and our own actions // (but wxComboCtrl already handled Popup/Dismiss) /*