don't require multimon.h any more now (patch 1446030); enable wxUSE_DISPLAY by default

[wxWidgets.git] / src / gtk / eggtrayicon.c

diff --git a/src/gtk/eggtrayicon.c b/src/gtk/eggtrayicon.c
index 6c4c3b1cf3c677c2b7c5d9a60d3293e83ab43664..fb6a78067ca56f9c3d11d180335c7b49ced7e0bf 100644 (file)
--- a/src/gtk/eggtrayicon.c
+++ b/src/gtk/eggtrayicon.c
@@ -106,10 +106,13 @@ Anders
 
 #include "wx/platform.h"
 
+#include <gdk/gdkx.h>
+
 #ifdef __WXGTK20__
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 1, 0)
 
 #include <string.h>
-#include <gdk/gdkx.h>
 #include "eggtrayicon.h"
 
 #define SYSTEM_TRAY_REQUEST_DOCK    0
@@ -145,7 +148,8 @@ egg_tray_icon_get_type (void)
        (GInstanceInitFunc) egg_tray_icon_init
       };
 
-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
+      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon",
+                                          &our_info, (GTypeFlags)0);
     }
 
   return our_type;
@@ -435,3 +439,4 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
 }
 
 #endif /* __WXGTK20__ */
+#endif /* GTK_CHECK_VERSION(2, 1, 0) */