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 a0ca64d3e583ce53771db71d5f211ba801063c77..ce4f6adb3b746f82327f00748c62e6c5517f42c4 100644 (file)
--- a/include/wx/generic/fontpickerg.h
+++ b/include/wx/generic/fontpickerg.h
@@ -13,16 +13,12 @@
 #define _WX_FONTPICKER_H_
 
 #include "wx/button.h"
 #define _WX_FONTPICKER_H_
 
 #include "wx/button.h"

-
-class WXDLLIMPEXP_CORE wxFontData;
+#include "wx/cmndata.h"

 
 //-----------------------------------------------------------------------------
 // wxGenericFontButton: a button which brings up a wxColourDialog
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // 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
 {
 class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton,
                                              public wxFontPickerWidgetBase
 {


@@ -30,7 +26,7 @@ public:
     wxGenericFontButton() {}
     wxGenericFontButton(wxWindow *parent,
                         wxWindowID id,
     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,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxFONTBTN_DEFAULT_STYLE,