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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-02-01 22:07:57 +0200 (Thu, 01 Feb 2007)
New Revision: 9548

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
Log:
2007-02-01  Michael Natterer  <mitch at imendio.com>

	Merge from upstream trunk:

	* gtk/gtkmenu.c (gtk_menu_paint): pass &event->area to
	gtk_paint_box() calls.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-01 18:03:56 UTC (rev 9547)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-01 20:07:57 UTC (rev 9548)
@@ -1,5 +1,12 @@
 2007-02-01  Michael Natterer  <mitch at imendio.com>
 
+	Merge from upstream trunk:
+
+	* gtk/gtkmenu.c (gtk_menu_paint): pass &event->area to
+	gtk_paint_box() calls.
+
+2007-02-01  Michael Natterer  <mitch at imendio.com>
+
 	* gtk/gtkmenu.c: port over the remaining context_menu stuff.
 
 2007-02-01  Michael Natterer  <mitch at imendio.com>

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-02-01 18:03:56 UTC (rev 9547)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-02-01 20:07:57 UTC (rev 9548)
@@ -2581,7 +2581,7 @@
 			 widget->window,
 			 priv->upper_arrow_state,
 			 GTK_SHADOW_OUT,
-			 NULL, widget, "menu",
+			 &event->area, widget, "menu",
 			 border_x,
 			 border_y,
 			 width - 2 * border_x,
@@ -2605,7 +2605,7 @@
 			 widget->window,
 			 priv->lower_arrow_state,
 			 GTK_SHADOW_OUT,
-			 NULL, widget, "menu",
+			 &event->area, widget, "menu",
 			 border_x,
 			 height - border_y - scroll_arrow_height,
 			 width - 2*border_x,
@@ -2630,7 +2630,7 @@
 		     menu->bin_window,
 		     GTK_STATE_NORMAL,
 		     GTK_SHADOW_OUT,
-		     NULL, widget, "menu",
+		     &event->area, widget, "menu",
 		     - border_x, menu->scroll_offset - border_y, 
 		     width, height);
     }