X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/motif/combobox.h diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h index 63eb9018e4..fdcb802d31 100644 --- a/include/wx/motif/combobox.h +++ b/include/wx/motif/combobox.h @@ -69,6 +69,10 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = 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(); @@ -101,12 +105,18 @@ public: WXWidget GetTopWidget() const { return m_mainWidget; } WXWidget GetMainWidget() const { return m_mainWidget; } + //Copied from wxComboBoxBase because for wxMOTIF wxComboBox does not inherit from it. + virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); } + virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); } + protected: virtual wxSize DoGetBestSize() const; virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + // implement wxTextEntry pure virtual methods + virtual wxWindow *GetEditableWindow() { return this; } virtual WXWidget GetTextWidget() const; private: