changing to wxDC, so that wxGCDC can be used as well

[wxWidgets.git] / include / wx / generic / fontpickerg.h

diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h
index ece82ba8bd8c2d67c64e0f64b01baa17fb33eadc..ce4f6adb3b746f82327f00748c62e6c5517f42c4 100644 (file)
--- 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,