X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02a525b385836d41f63e3bbebec869c7b8249026..d89b7c194d77ae14dcdb113ac4ffe79f5515b4ca:/src/gtk1/eggtrayicon.c diff --git a/src/gtk1/eggtrayicon.c b/src/gtk1/eggtrayicon.c index 10aed866ae..36e3785c4b 100644 --- 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 @@ -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 -> 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 -> get permission to include eggtrayicon under wxWindows license? +> get permission to include eggtrayicon under wxWindows licence? > > Thanks, > Vaclav @@ -135,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, @@ -148,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;