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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-01-29 17:53:30 +0200 (Mon, 29 Jan 2007)
New Revision: 9439

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

	Removed MAEMO_CHANGES stuff from this change, because it has been
	merged to upstream:

	* gtk/gtkmenuitem.c: port over queueing a draw on the parent menu
	item on item select/deselect.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-29 15:13:27 UTC (rev 9438)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-29 15:53:30 UTC (rev 9439)
@@ -1,5 +1,13 @@
-2007-01-29  Michael Natterer  <mitch at gimp.org>
+2007-01-29  Michael Natterer  <mitch at imendio.com>
 
+	Removed MAEMO_CHANGES stuff from this change, because it has been
+	merged to upstream:
+
+	* gtk/gtkmenuitem.c: port over queueing a draw on the parent menu
+	item on item select/deselect.
+
+2007-01-29  Michael Natterer  <mitch at imendio.com>
+
 	* gtk/gtkmenuitem.c: port over: open submenus on activation and
 	don't open them on select.
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c	2007-01-29 15:13:27 UTC (rev 9438)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c	2007-01-29 15:53:30 UTC (rev 9439)
@@ -392,12 +392,11 @@
 gtk_menu_item_select (GtkMenuItem *menu_item)
 {
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-  
+
   gtk_item_select (GTK_ITEM (menu_item));
 
-#ifdef MAEMO_CHANGES
-  /* This is required as changed focus isn't drawn automatically
-   * and drawing it must be requested.
+  /* Enable themeing of the parent menu item depending on whether
+   * something is selected in its submenu
    */
   if (GTK_IS_MENU (GTK_WIDGET (menu_item)->parent))
     {
@@ -406,19 +405,17 @@
       if (menu->parent_menu_item)
         gtk_widget_queue_draw (GTK_WIDGET (menu->parent_menu_item));
     }
-#endif /* MAEMO_CHANGES */
 }
 
 void
 gtk_menu_item_deselect (GtkMenuItem *menu_item)
 {
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
-  
+
   gtk_item_deselect (GTK_ITEM (menu_item));
 
-#ifdef MAEMO_CHANGES
-  /* This is required as changed focus isn't drawn automatically
-   * and drawing it must be requested.
+  /* Enable themeing of the parent menu item depending on whether
+   * something is selected in its submenu
    */
   if (GTK_IS_MENU (GTK_WIDGET (menu_item)->parent))
     {
@@ -427,7 +424,6 @@
       if (menu->parent_menu_item)
         gtk_widget_queue_draw (GTK_WIDGET (menu->parent_menu_item));
     }
-#endif /* MAEMO_CHANGES */
 }
 
 void