X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45f9b662d60d32113d3bdc3ce7a4dcb46b7899c4..33ba5a05623023af942a6b34b0758a98b12d4c82:/include/wx/generic/fontpickerg.h

diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h
index a0ca64d3e5..ce4f6adb3b 100644
--- a/include/wx/generic/fontpickerg.h
+++ b/include/wx/generic/fontpickerg.h
@@ -13,16 +13,12 @@
 #define _WX_FONTPICKER_H_
 
 #include "wx/button.h"
-
-class WXDLLIMPEXP_CORE wxFontData;
+#include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
 // 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
 {
@@ -30,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,