X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c757b5fee093bbc3686f1e474316396b742fb888..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/gtk/fontpicker.h diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h index 06ba2ed99f..80376e5de8 100644 --- a/include/wx/gtk/fontpicker.h +++ b/include/wx/gtk/fontpicker.h @@ -12,22 +12,20 @@ #ifndef _WX_GTK_FONTPICKER_H_ #define _WX_GTK_FONTPICKER_H_ -// since GtkFontButton is available only for GTK+ >= 2.4, -// we need to use generic version if we detect (at runtime) -// that GTK+ < 2.4 -#include "wx/generic/fontpickerg.h" +#include "wx/button.h" //----------------------------------------------------------------------------- // wxFontButton //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxFontButton : public wxGenericFontButton +class WXDLLIMPEXP_CORE wxFontButton : public wxButton, + public wxFontPickerWidgetBase { public: wxFontButton() {} wxFontButton(wxWindow *parent, wxWindowID id, - const wxFont& initial = *wxNORMAL_FONT, + const wxFont& initial = wxNullFont, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxFONTBTN_DEFAULT_STYLE, @@ -37,20 +35,17 @@ public: Create(parent, id, initial, pos, size, style, validator, name); } - virtual ~wxFontButton(); - - -public: // overrides - bool Create(wxWindow *parent, wxWindowID id, - const wxFont& initial = *wxNORMAL_FONT, + const wxFont& initial = wxNullFont, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxFONTBTN_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxFontPickerWidgetNameStr); + virtual ~wxFontButton(); + protected: void UpdateFont(); @@ -60,8 +55,6 @@ public: // used by the GTK callback only void SetNativeFontInfo(const gchar *gtkdescription) { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); } - wxWindow *m_topParent; - private: DECLARE_DYNAMIC_CLASS(wxFontButton) };