X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f26ef31422b9d1496d9f19d53a489f6f04a1090..e06b0afba5b1acf36241d33982d5d88cccefa2e8:/include/wx/generic/fontpickerg.h diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h index ece82ba8bd..ce4f6adb3b 100644 --- a/include/wx/generic/fontpickerg.h +++ b/include/wx/generic/fontpickerg.h @@ -19,9 +19,6 @@ // wxGenericFontButton: a button which brings up a wxColourDialog //----------------------------------------------------------------------------- -#define wxFONTBTN_DEFAULT_STYLE \ - (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL) - class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton, public wxFontPickerWidgetBase { @@ -29,7 +26,7 @@ public: wxGenericFontButton() {} wxGenericFontButton(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,