rebaked with baefile rev 928

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

diff --git a/src/gtk/eggtrayicon.c b/src/gtk/eggtrayicon.c
index de2777a4fd95e71c89d3e30543f26326c41af2c7..fb6a78067ca56f9c3d11d180335c7b49ced7e0bf 100644 (file)
--- a/src/gtk/eggtrayicon.c
+++ b/src/gtk/eggtrayicon.c
@@ -107,9 +107,10 @@ Anders
 #include "wx/platform.h"
 
 #include <gdk/gdkx.h>
 #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"
 
 #include <string.h>
 #include "eggtrayicon.h"


@@ -147,7 +148,8 @@ egg_tray_icon_get_type (void)
        (GInstanceInitFunc) egg_tray_icon_init
       };
 
        (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;
     }
 
   return our_type;


@@ -437,3 +439,4 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
 }
 
 #endif /* __WXGTK20__ */
 }
 
 #endif /* __WXGTK20__ */

+#endif /* GTK_CHECK_VERSION(2, 1, 0) */