SetTextColour is gone

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

diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h
index 1137228e00ed86a061701a64eac23aac71c58d05..3a296ad89bb8179631a3b7916d34a942556a7b1c 100644 (file)
--- a/include/wx/fontpicker.h
+++ b/include/wx/fontpicker.h
@@ -66,7 +66,8 @@ protected:
 // uses the currently selected font to draw the label of the button
 #define wxFNTP_USEFONT_FOR_LABEL      0x0010
 
-#if defined(__WXGTK24__)        // since GTK > 2.4, there is GtkFontButton
+// since GTK > 2.4, there is GtkFontButton
+#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/fontpicker.h"
     #define wxFontPickerWidget      wxFontButton
 #else
@@ -215,13 +216,6 @@ typedef void (wxEvtHandler::*wxFontPickerEventFunction)(wxFontPickerEvent&);
 #define EVT_FONTPICKER_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_FONTPICKER_CHANGED, id, wxFontPickerEventHandler(fn))
 
-#ifdef _WX_DEFINE_DATE_EVENTS_
-    DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED)
-
-    IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent)
-#endif
-
-
 
 #endif // wxUSE_FONTPICKERCTRL