X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff654490b7cb185631a1dc4621094d88643ccf41..c29e714c378d7e3164d71e2c306d990802fe678b:/include/wx/generic/fontpickerg.h diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h index ce4f6adb3b..369c46677e 100644 --- a/include/wx/generic/fontpickerg.h +++ b/include/wx/generic/fontpickerg.h @@ -16,7 +16,7 @@ #include "wx/cmndata.h" //----------------------------------------------------------------------------- -// wxGenericFontButton: a button which brings up a wxColourDialog +// wxGenericFontButton: a button which brings up a wxFontDialog //----------------------------------------------------------------------------- class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton, @@ -44,8 +44,8 @@ public: // API extensions specific for wxGenericFontButton // user can override this to init font data in a different way virtual void InitFontData(); - // returns the font data shown in wxColourDialog - wxFontData *GetFontData() { return &ms_data; } + // returns the font data shown in wxFontDialog + wxFontData *GetFontData() { return &m_data; } public: @@ -66,10 +66,7 @@ protected: void UpdateFont(); - // the colour data shown in wxColourPickerCtrlGeneric - // controls. This member is static so that all colour pickers - // in the program share the same set of custom colours. - static wxFontData ms_data; + wxFontData m_data; private: DECLARE_DYNAMIC_CLASS(wxGenericFontButton)