X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72cb72bf824f8fdc2f0738d23379896f594d3189..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/os2/combobox.h?ds=inline diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h index 144f662a10..233d0f0d02 100644 --- a/include/wx/os2/combobox.h +++ b/include/wx/os2/combobox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.h +// Name: wx/os2/combobox.h // Purpose: wxComboBox class // Author: David Webster // Modified by: @@ -18,7 +18,7 @@ #if wxUSE_COMBOBOX // Combobox item -class WXDLLEXPORT wxComboBox : public wxChoice, +class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, public wxTextEntry { @@ -96,6 +96,10 @@ class WXDLLEXPORT wxComboBox : public wxChoice, ,const wxString& rsName = wxComboBoxNameStr ); + // See wxComboBoxBase discussion of IsEmpty(). + bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } + bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } + // resolve ambiguities among virtual functions inherited from both base // classes virtual void Clear(); @@ -122,8 +126,8 @@ class WXDLLEXPORT wxComboBox : public wxChoice, ); private: - // implement wxTextEntry pure virtual: it implements all the operations for - // the simple EDIT controls + // implement wxTextEntry pure virtual methods + virtual wxWindow *GetEditableWindow() { return this; } virtual WXHWND GetEditHWND() const { return m_hWnd; } DECLARE_DYNAMIC_CLASS(wxComboBox)