X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33d4eef0b9f61adad1f42ace436225ff508c6ea3..a16a233822dd1ae4f862e40b077f9407f58c32ed:/src/gtk1/eggtrayicon.c diff --git a/src/gtk1/eggtrayicon.c b/src/gtk1/eggtrayicon.c index 416a6481ea..cd36bde116 100644 --- a/src/gtk1/eggtrayicon.c +++ b/src/gtk1/eggtrayicon.c @@ -18,8 +18,101 @@ * Boston, MA 02111-1307, USA. */ -#include +/* + +Permission to use this file under wxWindows license given by +copyright holder: +-------- +From andersca@gnu.org Tue Dec 9 13:01:56 2003 +Return-path: +Envelope-to: vasek@localhost +Delivery-date: Tue, 09 Dec 2003 13:04:35 +0100 +Received: from localhost + ([127.0.0.1] helo=amavis ident=amavis) + by armitage with esmtp (Exim 3.35 #1) + id 1ATgbS-0001Gs-00 + for vasek@localhost; Tue, 09 Dec 2003 13:04:35 +0100 +Received: from armitage ([127.0.0.1]) + by amavis (armitage [127.0.0.1]) (amavisd-new, port 10024) with ESMTP + id 04227-09 for ; + Tue, 9 Dec 2003 13:04:11 +0100 (CET) +Received: from localhost ([127.0.0.1] ident=fetchmail) + by armitage with esmtp (Exim 3.35 #1) + id 1ATgb5-0001GY-00 + for vasek@localhost; Tue, 09 Dec 2003 13:04:11 +0100 +Delivered-To: alias-email-slavikvaclav@seznam.cz +Received: from pop3.seznam.cz [212.80.76.45] + by localhost with POP3 (fetchmail-5.9.11) + for vasek@localhost (single-drop); Tue, 09 Dec 2003 13:04:11 +0100 (CET) +Received: (qmail 9861 invoked from network); 9 Dec 2003 12:02:17 -0000 +Received: from unknown (HELO maxipes.logix.cz) (81.0.234.97) + by buster.go.seznam.cz with SMTP; 9 Dec 2003 12:02:17 -0000 +Received: by maxipes.logix.cz (Postfix, from userid 604) + id 37E6D29A51; Tue, 9 Dec 2003 13:02:16 +0100 (CET) +X-Original-To: vaclav.slavik@matfyz.cz +Received: from mail.csbnet.se (glutus.csbnet.se [193.11.248.2]) + by maxipes.logix.cz (Postfix) with ESMTP id 90D6A29A51 + for ; Tue, 9 Dec 2003 13:02:15 +0100 (CET) +Received: by mail.csbnet.se (Postfix, from userid 8) + id 7AA7F10A6D7; Tue, 9 Dec 2003 13:02:14 +0100 (CET) +Received: from carbon.csbnet.se (carbon.csbnet.se [193.11.248.180]) + by mail.csbnet.se (Postfix) with ESMTP id A190F10A71D + for ; Tue, 9 Dec 2003 13:01:56 +0100 (CET) +Subject: Re: eggtrayicon.{c,h} licensing +From: Anders Carlsson +To: Vaclav Slavik +In-Reply-To: <200312091142.54542.vaclav.slavik@matfyz.cz> +References: <200312091142.54542.vaclav.slavik@matfyz.cz> +Content-Type: text/plain +Message-Id: <1070971316.30989.0.camel@carbon.csbnet.se> +Mime-Version: 1.0 +X-Mailer: Ximian Evolution 1.5 +Date: Tue, 09 Dec 2003 13:01:56 +0100 +Content-Transfer-Encoding: 7bit +X-Scanned-By: CLAM (openantivirus DB) antivirus scanner at mail.csbnet.se +X-Virus-Scanned: by amavisd-new-20030616-p5 (Debian) at armitage +X-Spam-Status: No, hits=-4.9 tagged_above=-999.0 required=6.3 tests=BAYES_00 +X-Spam-Level: +Status: R +X-Status: N +X-KMail-EncryptionState: +X-KMail-SignatureState: + +On tis, 2003-12-09 at 11:42 +0100, Vaclav Slavik wrote: +> Hi, +> +> I'm working on the wxWindows cross-platform GUI toolkit +> (http://www.wxwindows.org) which uses GTK+ and it would save me a lot +> of time if I could use your eggtrayicon code to implement tray icons +> on X11. Unfortunately I can't use it right now because it is not part +> of any library we could depend on (as we do depend on GTK+) and would +> 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 +> 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? +> +> Thanks, +> Vaclav +> + +Sure, that's fine by me. + +Anders +-------- +*/ + +#include "wx/platform.h" + #include + +#ifdef __WXGTK20__ +#include +#if GTK_CHECK_VERSION(2, 1, 0) + +#include #include "eggtrayicon.h" #define SYSTEM_TRAY_REQUEST_DOCK 0 @@ -42,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, @@ -55,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; @@ -343,3 +437,6 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon, (Window)gtk_plug_get_id (GTK_PLUG (icon)), id, 0, 0); } + +#endif /* __WXGTK20__ */ +#endif /* GTK_CHECK_VERSION(2, 1, 0) */