add support for alpha in color dialog on OSX, see #14127

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

diff --git a/src/gtk1/eggtrayicon.c b/src/gtk1/eggtrayicon.c
index 6c4c3b1cf3c677c2b7c5d9a60d3293e83ab43664..36e3785c4be429a1b851a34078f5ca65e087575e 100644 (file)
--- a/src/gtk1/eggtrayicon.c
+++ b/src/gtk1/eggtrayicon.c
@@ -20,7 +20,7 @@
 
 /* 
 
 
 /* 
 

-Permission to use this file under wxWindows license given by
+Permission to use this file under wxWindows licence given by

 copyright holder:
 --------
 From andersca@gnu.org Tue Dec  9 13:01:56 2003
 copyright holder:
 --------
 From andersca@gnu.org Tue Dec  9 13:01:56 2003


@@ -89,10 +89,10 @@ On tis, 2003-12-09 at 11:42 +0100, Vaclav Slavik wrote:
 > have to be included in our sources and it is under the LGPL license. 
 > The problem is that wxWindows' license is more permissive (see 
 > http://www.opensource.org/licenses/wxwindows.php for details) and so 
 > have to be included in our sources and it is under the LGPL license. 
 > The problem is that wxWindows' license is more permissive (see 
 > http://www.opensource.org/licenses/wxwindows.php for details) and so 

-> I can't take your code and put it under wxWindows License. And I 
+> I can't take your code and put it under wxWindows licence. And I

 > can't put code that can't be used under the terms of wxWindows 
 > License into wxWindows either. Do you think it would be possible to 
 > can't put code that can't be used under the terms of wxWindows 
 > License into wxWindows either. Do you think it would be possible to 

-> get permission to include eggtrayicon under wxWindows license?
+> get permission to include eggtrayicon under wxWindows licence?

 > 
 > Thanks,
 > Vaclav
 > 
 > Thanks,
 > Vaclav


@@ -106,10 +106,13 @@ Anders
 
 #include "wx/platform.h"
 
 
 #include "wx/platform.h"
 

+#include <gdk/gdkx.h>
+

 #ifdef __WXGTK20__
 #ifdef __WXGTK20__

+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 1, 0)

 
 #include <string.h>
 
 #include <string.h>

-#include <gdk/gdkx.h>

 #include "eggtrayicon.h"
 
 #define SYSTEM_TRAY_REQUEST_DOCK    0
 #include "eggtrayicon.h"
 
 #define SYSTEM_TRAY_REQUEST_DOCK    0


@@ -132,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,


@@ -145,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;


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

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