X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d156af3247c862e51a7c62f569a3fd302052a42..465de0be705e52c7f97e9bb6169af9d20a7f72a8:/include/wx/gtk/control.h diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 7e14b84d4b..ec6d0a0626 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -26,6 +26,7 @@ extern "C" { class WXDLLIMPEXP_CORE wxControl : public wxControlBase { + typedef wxControlBase base_type; public: wxControl(); wxControl(wxWindow *parent, wxWindowID id, @@ -43,8 +44,10 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxControlNameStr); - virtual wxVisualAttributes GetDefaultAttributes() const; +#ifdef __WXGTK3__ + virtual bool SetFont(const wxFont& font); +#endif protected: virtual wxSize DoGetBestSize() const; @@ -75,20 +78,20 @@ protected: static wxVisualAttributes GetDefaultAttributesFromGTKWidget(GtkWidget* widget, bool useBase = false, - int state = -1); + int state = 0); static wxVisualAttributes GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t, bool useBase = false, - int state = -1); + int state = 0); static wxVisualAttributes GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t, bool useBase = false, - int state = -1); + int state = 0); static wxVisualAttributes GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t, bool useBase = false, - int state = -1); + int state = 0); // Widgets that use the style->base colour for the BG colour should // override this and return true.