X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..895cae46b76569cad6486d2b9e5c409c9b15b68f:/include/wx/gtk1/combobox.h diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h index 56c7709c88..1d4149e3a8 100644 --- a/include/wx/gtk1/combobox.h +++ b/include/wx/gtk1/combobox.h @@ -27,7 +27,7 @@ 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; //----------------------------------------------------------------------------- @@ -92,7 +92,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); @@ -169,6 +169,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; }