remove ODBC and DBgrid libraries

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

diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h
index 6127ff049bf6b6129ee21c82abf4c362e1095a56..a3c27f432183d7ff2f8d843303fc62b4e9189cb7 100644 (file)
--- a/include/wx/generic/fontpickerg.h
+++ b/include/wx/generic/fontpickerg.h
@@ -12,7 +12,8 @@
 #ifndef _WX_FONTPICKER_H_
 #define _WX_FONTPICKER_H_
 
 #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 wxColourDialog


@@ -28,7 +29,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,