Remove defined(__WXMAC__) && defined(__APPLE__) case from the OS if/elif block.

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

diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h
index a0ca64d3e583ce53771db71d5f211ba801063c77..a3c27f432183d7ff2f8d843303fc62b4e9189cb7 100644 (file)
--- a/include/wx/generic/fontpickerg.h
+++ b/include/wx/generic/fontpickerg.h
@@ -13,8 +13,7 @@
 #define _WX_FONTPICKER_H_
 
 #include "wx/button.h"
-
-class WXDLLIMPEXP_CORE wxFontData;
+#include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
 // wxGenericFontButton: a button which brings up a wxColourDialog
@@ -30,7 +29,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,