X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/005ac806ead92411ad4810d407df311e4a608302..3a61f5db2c1292d1f6cbfc5bff1edfbdf7b1fc99:/include/wx/osx/combobox.h diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h index cae14068b8..487f9a6c67 100644 --- a/include/wx/osx/combobox.h +++ b/include/wx/osx/combobox.h @@ -100,7 +100,7 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase virtual void SetString(unsigned int n, const wxString& s); virtual unsigned int GetCount() const; - + // these methods are provided by wxTextEntry for the native impl. #if wxOSX_USE_CARBON // Text field functions @@ -132,7 +132,9 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase virtual bool CanRedo() const; virtual wxClientDataType GetClientDataType() const; -#endif + + virtual wxTextWidgetImpl* GetTextPeer() const; +#endif // wxOSX_USE_CARBON @@ -163,9 +165,9 @@ protected: #endif virtual wxWindow *GetEditableWindow() { return this; } -#if wxOSX_USE_CARBON // override the base class virtuals involved in geometry calculations virtual wxSize DoGetBestSize() const; +#if wxOSX_USE_CARBON virtual void DoMoveWindow(int x, int y, int width, int height); #endif