X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec376c8fd9ff813392030426acd2317c6fa6527e..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/generic/fontpickerg.h?ds=sidebyside

diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h
index 6127ff049b..369c46677e 100644
--- a/include/wx/generic/fontpickerg.h
+++ b/include/wx/generic/fontpickerg.h
@@ -12,15 +12,13 @@
 #ifndef _WX_FONTPICKER_H_
 #define _WX_FONTPICKER_H_
 
-class WXDLLIMPEXP_CORE wxFontData;
+#include "wx/button.h"
+#include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
-// wxGenericFontButton: a button which brings up a wxColourDialog
+// wxGenericFontButton: a button which brings up a wxFontDialog
 //-----------------------------------------------------------------------------
 
-#define wxFONTBTN_DEFAULT_STYLE \
-    (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL)
-
 class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton,
                                              public wxFontPickerWidgetBase
 {
@@ -28,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,
@@ -46,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:
@@ -68,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)