[maemo-commits] [maemo-commits] r9940 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-02-16 14:25:51 +0200 (Fri, 16 Feb 2007)
New Revision: 9940

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c
Log:
MB#1060: Handle !NO_WINDOW case correctly

2007-02-16  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkwidget.c (gtk_widget_realize): Call
	gtk_widget_set_extension_events_internal even with !NO_WINDOW - it
	does the right checks to ensure it only touches windows belonging to
	the widget. MB#1060


Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-16 12:18:52 UTC (rev 9939)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-16 12:25:51 UTC (rev 9940)
@@ -1,3 +1,10 @@
+2007-02-16  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkwidget.c (gtk_widget_realize): Call
+	gtk_widget_set_extension_events_internal even with !NO_WINDOW - it
+	does the right checks to ensure it only touches windows belonging to
+	the widget. MB#1060
+
 Thu Feb 15 15:18:37 2007  Tim Janik  <timj at gtk.org>
 
 	* gtk/gtkdialog.c: added style property ::content-area-spacing, to

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c	2007-02-16 12:18:52 UTC (rev 9939)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c	2007-02-16 12:25:51 UTC (rev 9940)
@@ -2722,6 +2722,7 @@
 void
 gtk_widget_realize (GtkWidget *widget)
 {
+  GdkExtensionMode mode;
   GtkWidgetShapeInfo *shape_info;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -2764,15 +2765,9 @@
 					     shape_info->offset_x,
 					     shape_info->offset_y);
 
-      if (!GTK_WIDGET_NO_WINDOW (widget))
-        {
-          GdkExtensionMode mode;
-
-          mode = gtk_widget_get_extension_events (widget);
-
-          if (mode != GDK_EXTENSION_EVENTS_NONE)
-            gtk_widget_set_extension_events_internal (widget, mode, NULL);
-        }
+      mode = gtk_widget_get_extension_events (widget);
+      if (mode != GDK_EXTENSION_EVENTS_NONE)
+	gtk_widget_set_extension_events_internal (widget, mode, NULL);
     }
 }