Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove GTK_CHECK_VERSION checks for GTK versions < 2.4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-15 15:16:18 +00:00
parent a8519f6507
commit 0955be65ca
3 changed files with 325 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generic/splash.cpp
View File

@@ -52,12 +52,9 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
const wxSize& size, long style)
: wxFrame(parent, id, wxEmptyString, wxPoint(0,0), wxSize(100, 100), style)
{
// At least for GTK+ 2.0, this hint is not available.
#if defined(__WXGTK20__)
#if GTK_CHECK_VERSION(2,2,0)
gtk_window_set_type_hint(GTK_WINDOW(m_widget),
GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
#endif
#endif
m_window = NULL;

31
src/gtk/assertdlg_gtk.c
View File

@@ -23,10 +23,7 @@ extern "C" {
/* For FILE */
#include <stdio.h>
#if GTK_CHECK_VERSION(2,4,0)
#include <gtk/gtkexpander.h>
#endif
/* ----------------------------------------------------------------------------
@@ -147,9 +144,6 @@ void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg)
GtkAssertDialog signal handlers
---------------------------------------------------------------------------- */
/* GtkFileChooserDialog and GtkExpander are only available in GTK+ >= 2.4 */
#if GTK_CHECK_VERSION(2,4,0)
void gtk_assert_dialog_expander_callback (GtkWidget *widget, GtkAssertDialog *dlg)
{
/* status is not yet updated so we need to invert it to get the new one */
@@ -202,7 +196,6 @@ void gtk_assert_dialog_save_backtrace_callback (GtkWidget *widget, GtkAssertDial
gtk_widget_destroy (dialog);
}
#endif /* GTK+ 2.4+ */
void gtk_assert_dialog_copy_callback (GtkWidget *widget, GtkAssertDialog *dlg)
{
@@ -320,22 +313,11 @@ void gtk_assert_dialog_init(GtkAssertDialog *dlg)
}
/* add the expander */
#if GTK_CHECK_VERSION(2,4,0)
if (!gtk_check_version (2, 4, 0))
{
dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:");
gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0);
g_signal_connect (GTK_EXPANDER(dlg->expander), "activate",
G_CALLBACK(gtk_assert_dialog_expander_callback), dlg);
}
else
#endif
{
/* if GtkExpander is unavailable, then use a static frame instead */
dlg->expander = gtk_frame_new ("Back_trace:");
gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0);
}
}
{
GtkWidget *hbox, *vbox, *button, *sw;
@@ -362,16 +344,10 @@ void gtk_assert_dialog_init(GtkAssertDialog *dlg)
gtk_button_box_set_layout (GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
/* add the buttons */
#if GTK_CHECK_VERSION(2,4,0)
if (!gtk_check_version (2, 4, 0))
{
/* add this button only if GTK supports GtkFileChooserDialog */
button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Save to _file",
GTK_STOCK_SAVE, GTK_RESPONSE_NONE);
g_signal_connect (button, "clicked",
G_CALLBACK(gtk_assert_dialog_save_backtrace_callback), dlg);
}
#endif
button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Copy to clip_board",
GTK_STOCK_COPY, GTK_RESPONSE_NONE);
@@ -485,13 +461,6 @@ void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg,
{
assertdlg->callback = callback;
assertdlg->userdata = userdata;
if (gtk_check_version (2, 4, 0))
{
/* we need to immediately process the stack trace as we're not using
an expander since GTK does not support it */
gtk_assert_dialog_process_backtrace (assertdlg);
}
}
void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,

131
src/gtk/eggtrayicon.c
View File

@@ -1,107 +1,21 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* eggtrayicon.c
* Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
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: <andersca@gnu.org>
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 <vasek@localhost>;
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 <vaclav.slavik@matfyz.cz>; 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 <vaclav.slavik@matfyz.cz>; Tue, 9 Dec 2003 13:01:56 +0100 (CET)
Subject: Re: eggtrayicon.{c,h} licensing
From: Anders Carlsson <andersca@gnu.org>
To: Vaclav Slavik <vaclav.slavik@matfyz.cz>
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
--------
* Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "wx/platform.h"
@@ -109,8 +23,6 @@ Anders
#if wxUSE_TASKBARICON
#include <gtk/gtkversion.h>
#if GTK_CHECK_VERSION(2, 1, 0)
#include <string.h>
#include "eggtrayicon.h"
@@ -122,7 +34,6 @@ Anders
#include <gdk/gdkwin32.h>
#endif
#define SYSTEM_TRAY_REQUEST_DOCK 0
#define SYSTEM_TRAY_BEGIN_MESSAGE 1
#define SYSTEM_TRAY_CANCEL_MESSAGE 2
@@ -231,6 +142,7 @@ egg_tray_icon_get_property (GObject *object,
case PROP_ORIENTATION:
g_value_set_enum (value, icon->orientation);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -315,6 +227,7 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_
egg_tray_icon_manager_window_destroyed (icon);
}
}
return GDK_FILTER_CONTINUE;
}
@@ -604,10 +517,11 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
XSync (xdisplay, False);
}
gdk_error_trap_pop ();
#endif
return stamp;
return stamp;
}
void
@@ -631,9 +545,4 @@ egg_tray_icon_get_orientation (EggTrayIcon *icon)
return icon->orientation;
}
#endif /* GTK_CHECK_VERSION(2, 1, 0) */
#endif /* wxUSE_TASKBARICON */