X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5dc224630b21a1b95e0f59b611fbb81311d4709e..564c7fc4127c39472b32f80b32733eb6e3ade59c:/src/gtk1/eggtrayicon.c

diff --git a/src/gtk1/eggtrayicon.c b/src/gtk1/eggtrayicon.c
index de2777a4fd..cd36bde116 100644
--- a/src/gtk1/eggtrayicon.c
+++ b/src/gtk1/eggtrayicon.c
@@ -107,9 +107,10 @@ Anders
 #include "wx/platform.h"
 
 #include <gdk/gdkx.h>
-#include <gtk/gtkversion.h>
 
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
+#ifdef __WXGTK20__
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 1, 0)
 
 #include <string.h>
 #include "eggtrayicon.h"
@@ -134,7 +135,7 @@ egg_tray_icon_get_type (void)
 
   if (our_type == 0)
     {
-      static const GTypeInfo our_info =
+      const GTypeInfo our_info =
       {
 	sizeof (EggTrayIconClass),
 	(GBaseInitFunc) NULL,
@@ -147,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;
@@ -437,3 +439,4 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
 }
 
 #endif /* __WXGTK20__ */
+#endif /* GTK_CHECK_VERSION(2, 1, 0) */