correcting import/export (_adv gave linking errors)

[wxWidgets.git] / include / wx / fontpicker.h

diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h
index 308b20f964e9c352a1453e621d62acc2bd8eab73..51b4a21766e603b5e40f9648a85f92965d134e61 100644 (file)
--- a/include/wx/fontpicker.h
+++ b/include/wx/fontpicker.h
@@ -20,10 +20,10 @@
 #include "wx/pickerbase.h"
 
 
-class WXDLLIMPEXP_CORE wxFontPickerEvent;
+class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
 
-extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxFontPickerWidgetNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxFontPickerCtrlNameStr[];
 
 
 // ----------------------------------------------------------------------------
@@ -66,8 +66,11 @@ protected:
 // uses the currently selected font to draw the label of the button
 #define wxFNTP_USEFONT_FOR_LABEL      0x0010
 
-// since GTK > 2.4, there is GtkFontButton
-#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#define wxFONTBTN_DEFAULT_STYLE \
+    (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL)
+
+// native version currently only exists in wxGTK2
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/fontpicker.h"
     #define wxFontPickerWidget      wxFontButton
 #else