X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af6ad984611ccf8af3e9a470aede2bbe9931e8e5..f36b3a915e4543fbbd9c911724404b016972aabc:/include/wx/filepicker.h

diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index 5aebbe6f6f..b4f12513eb 100644
--- a/include/wx/filepicker.h
+++ b/include/wx/filepicker.h
@@ -78,7 +78,8 @@ protected:
 // NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this
 //       requires that all classes being mapped as wx{File|Dir}PickerWidget have the
 //       same prototype for the contructor...
-#if defined(__WXGTK26__)        // since GTK >= 2.6, there is GtkFileButton
+// since GTK >= 2.6, there is GtkFileButton
+#if defined(__WXGTK26__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/filepicker.h"
     #define wxFilePickerWidget      wxFileButton
     #define wxDirPickerWidget       wxDirButton
@@ -390,13 +391,6 @@ typedef void (wxEvtHandler::*wxFileDirPickerEventFunction)(wxFileDirPickerEvent&
 #define EVT_DIRPICKER_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_DIRPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
 
-#ifdef _WX_DEFINE_DATE_EVENTS_
-    DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
-    DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)
-
-    IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
-#endif
-
 
 #endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL