This commit is contained in:
Matthias Clasen 2010-07-12 18:07:16 +00:00
parent adf47a53bd
commit 850ed7dfba
4 changed files with 22 additions and 35 deletions

View File

@ -1 +1 @@
gtk+-2.90.4.tar.bz2 gtk+-2.90.5.tar.bz2

View File

@ -1,29 +1,17 @@
From d5c9b3a4149fdeb40ac8377ba0867b447eb0f5aa Mon Sep 17 00:00:00 2001 diff -up gtk+-2.90.5/gtk/gtktooltip.c.fresh-tooltips gtk+-2.90.5/gtk/gtktooltip.c
From: Colin Walters <walters@verbum.org> --- gtk+-2.90.5/gtk/gtktooltip.c.fresh-tooltips 2010-07-09 21:00:19.000000000 -0400
Date: Thu, 8 Jul 2010 17:58:40 -0400 +++ gtk+-2.90.5/gtk/gtktooltip.c 2010-07-12 14:03:40.993938699 -0400
Subject: [PATCH] New tooltip style @@ -33,6 +33,9 @@
---
gtk/gtktooltip.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++---
gtk/gtkwidget.c | 8 ++
2 files changed, 258 insertions(+), 11 deletions(-)
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 67c2f6c..75fd6a7 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -33,6 +33,10 @@
#include "gtkhbox.h" #include "gtkhbox.h"
#include "gtkalignment.h" #include "gtkalignment.h"
+#ifdef GDK_WINDOWING_X11 +#ifdef GDK_WINDOWING_X11
+#include "gdk/x11/gdkx.h" +#include "gdk/x11/gdkx.h"
+#endif +#endif
+
#include "gtkalias.h"
#undef DEBUG_TOOLTIP #undef DEBUG_TOOLTIP
@@ -97,6 +101,7 @@ static void gtk_tooltip_display_closed (GdkDisplay *display,
@@ -96,6 +99,7 @@ static void gtk_tooltip_display_cl
GtkTooltip *tooltip); GtkTooltip *tooltip);
static void gtk_tooltip_set_last_window (GtkTooltip *tooltip, static void gtk_tooltip_set_last_window (GtkTooltip *tooltip,
GdkWindow *window); GdkWindow *window);
@ -31,7 +19,7 @@ index 67c2f6c..75fd6a7 100644
G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT); G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
@@ -112,8 +117,43 @@ gtk_tooltip_class_init (GtkTooltipClass *klass) @@ -111,8 +115,43 @@ gtk_tooltip_class_init (GtkTooltipClass
} }
static void static void
@ -75,7 +63,7 @@ index 67c2f6c..75fd6a7 100644
tooltip->timeout_id = 0; tooltip->timeout_id = 0;
tooltip->browse_mode_timeout_id = 0; tooltip->browse_mode_timeout_id = 0;
@@ -129,8 +169,12 @@ gtk_tooltip_init (GtkTooltip *tooltip) @@ -128,8 +167,12 @@ gtk_tooltip_init (GtkTooltip *tooltip)
tooltip->last_window = NULL; tooltip->last_window = NULL;
tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP)); tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
@ -88,7 +76,7 @@ index 67c2f6c..75fd6a7 100644
gtk_widget_set_app_paintable (tooltip->window, TRUE); gtk_widget_set_app_paintable (tooltip->window, TRUE);
gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE); gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
gtk_widget_set_name (tooltip->window, "gtk-tooltip"); gtk_widget_set_name (tooltip->window, "gtk-tooltip");
@@ -147,7 +191,7 @@ gtk_tooltip_init (GtkTooltip *tooltip) @@ -146,7 +189,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
gtk_widget_show (tooltip->alignment); gtk_widget_show (tooltip->alignment);
g_signal_connect_swapped (tooltip->window, "style-set", g_signal_connect_swapped (tooltip->window, "style-set",
@ -97,7 +85,7 @@ index 67c2f6c..75fd6a7 100644
g_signal_connect_swapped (tooltip->window, "expose-event", g_signal_connect_swapped (tooltip->window, "expose-event",
G_CALLBACK (gtk_tooltip_paint_window), tooltip); G_CALLBACK (gtk_tooltip_paint_window), tooltip);
@@ -164,6 +208,13 @@ gtk_tooltip_init (GtkTooltip *tooltip) @@ -163,6 +206,13 @@ gtk_tooltip_init (GtkTooltip *tooltip)
gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label, gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
FALSE, FALSE, 0); FALSE, FALSE, 0);
@ -111,7 +99,7 @@ index 67c2f6c..75fd6a7 100644
tooltip->custom_widget = NULL; tooltip->custom_widget = NULL;
} }
@@ -510,19 +561,207 @@ gtk_tooltip_window_style_set (GtkTooltip *tooltip) @@ -509,19 +559,207 @@ gtk_tooltip_window_style_set (GtkTooltip
gtk_widget_queue_draw (tooltip->window); gtk_widget_queue_draw (tooltip->window);
} }
@ -329,11 +317,10 @@ index 67c2f6c..75fd6a7 100644
return FALSE; return FALSE;
} }
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c diff -up gtk+-2.90.5/gtk/gtkwidget.c.fresh-tooltips gtk+-2.90.5/gtk/gtkwidget.c
index d302589..0f71849 100644 --- gtk+-2.90.5/gtk/gtkwidget.c.fresh-tooltips 2010-07-12 10:05:33.000000000 -0400
--- a/gtk/gtkwidget.c +++ gtk+-2.90.5/gtk/gtkwidget.c 2010-07-12 13:58:53.671956649 -0400
+++ b/gtk/gtkwidget.c @@ -2608,6 +2608,14 @@ gtk_widget_class_init (GtkWidgetClass *k
@@ -2608,6 +2608,14 @@ gtk_widget_class_init (GtkWidgetClass *klass)
P_("The length of vertical scroll arrows"), P_("The length of vertical scroll arrows"),
1, G_MAXINT, 16, 1, G_MAXINT, 16,
GTK_PARAM_READABLE)); GTK_PARAM_READABLE));
@ -348,6 +335,3 @@ index d302589..0f71849 100644
} }
static void static void
--
1.7.1.1

View File

@ -10,8 +10,8 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk3 Name: gtk3
Version: 2.90.4 Version: 2.90.5
Release: 3%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gtk.org URL: http://www.gtk.org
@ -264,6 +264,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache
%doc tmpdocs/examples %doc tmpdocs/examples
%changelog %changelog
* Mon Jul 22 2010 Matthias Clasen <mclasen@redhat.com> 2.90.5-1
- Update to 2.90.5
* Fri Jul 9 2010 Colin Walters <walters@verbum.org> - 2.90.4-3 * Fri Jul 9 2010 Colin Walters <walters@verbum.org> - 2.90.4-3
- Update tooltip style patch to remove unused GdkRegion - Update tooltip style patch to remove unused GdkRegion

View File

@ -1 +1 @@
c70b0c0617b02de3d1ff24a8b1fad5e6 gtk+-2.90.4.tar.bz2 7d569950325c2fb0c68a94fd9265d876 gtk+-2.90.5.tar.bz2