X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63f7d5022e786be61c0226314dac98739f49a426..220bfe1596238999c60b810fcf0b86b74ed37e0b:/include/wx/osx/combobox.h diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h index e115a4c847..9f9602903c 100644 --- a/include/wx/osx/combobox.h +++ b/include/wx/osx/combobox.h @@ -126,7 +126,7 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase virtual wxClientDataType GetClientDataType() const; // osx specific event handling common for all osx-ports - + virtual bool OSXHandleClicked( double timestampsec ); wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST @@ -141,6 +141,10 @@ protected: virtual void DoDeleteOneItem(unsigned int n); virtual void DoClear(); + // wxTextEntry functions + virtual wxString DoGetValue() const; + virtual wxWindow *GetEditableWindow() { return this; } + // override the base class virtuals involved in geometry calculations virtual wxSize DoGetBestSize() const; virtual void DoMoveWindow(int x, int y, int width, int height); @@ -154,9 +158,6 @@ protected: virtual void SetClientDataType(wxClientDataType clientDataItemsType); - // implement wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() { return this; } - // the subcontrols wxComboBoxText* m_text; wxComboBoxChoice* m_choice;