X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/gtk1/combobox.h?ds=inline diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index 56c7709c88..77d2502cac 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -27,14 +27,15 @@ class WXDLLIMPEXP_FWD_CORE wxComboBox; // global data //----------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; //----------------------------------------------------------------------------- // wxComboBox //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase +class WXDLLIMPEXP_CORE wxComboBox : + public wxWindowWithItems { public: inline wxComboBox() {} @@ -92,7 +93,7 @@ public: virtual void SetSelection(int n); virtual void SetString(unsigned int n, const wxString &text); - wxString GetValue() const; + wxString GetValue() const { return DoGetValue(); } void SetValue(const wxString& value); void WriteText(const wxString& value); @@ -154,8 +155,6 @@ public: bool IsOwnGtkWindow( GdkWindow *window ); void DoApplyWidgetStyle(GtkRcStyle *style); - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -169,6 +168,10 @@ protected: virtual wxSize DoGetBestSize() const; + // implement wxTextEntry pure virtual methods + virtual wxString DoGetValue() const; + virtual wxWindow *GetEditableWindow() { return this; } + // Widgets that use the style->base colour for the BG colour should // override this and return true. virtual bool UseGTKStyleBase() const { return true; }