Initialize m_action_window to NULL in wxAuiManager ctor (fixes #10383).

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

diff --git a/src/gtk1/eggtrayicon.c b/src/gtk1/eggtrayicon.c
index 4d244e04164439f7bd3c2ec3418d9cc8de1fb37d..cd36bde116886606462a849448eef3966f5186bc 100644 (file)
--- a/src/gtk1/eggtrayicon.c
+++ b/src/gtk1/eggtrayicon.c
@@ -135,7 +135,7 @@ egg_tray_icon_get_type (void)
 
   if (our_type == 0)
     {
 
   if (our_type == 0)
     {

-      static const GTypeInfo our_info =
+      const GTypeInfo our_info =

       {
        sizeof (EggTrayIconClass),
        (GBaseInitFunc) NULL,
       {
        sizeof (EggTrayIconClass),
        (GBaseInitFunc) NULL,


@@ -148,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,5 +438,5 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
                                      id, 0, 0);
 }
 
                                      id, 0, 0);
 }
 

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