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

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-03-29 13:21:20 +0300 (Thu, 29 Mar 2007)
New Revision: 10824

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c
Log:
Move GtkMenuItem active/passive focus handling to sapwood

2007-03-29  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkmenuitem.c (gtk_menu_item_paint): Remove the patch that
	handles active/passive focus and do it in sapwood instead.


Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-29 09:42:00 UTC (rev 10823)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-29 10:21:20 UTC (rev 10824)
@@ -1,3 +1,8 @@
+2007-03-29  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkmenuitem.c (gtk_menu_item_paint): Remove the patch that
+	handles active/passive focus and do it in sapwood instead.
+
 2007-03-29  Michael Natterer  <mitch at imendio.com>
 
 	Merge small menu cleanup from upstream trunk:

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c	2007-03-29 09:42:00 UTC (rev 10823)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c	2007-03-29 10:21:20 UTC (rev 10824)
@@ -768,35 +768,6 @@
 	  gtk_widget_style_get (widget,
 				"selected-shadow-type", &selected_shadow_type,
 				NULL);
-
-#ifdef MAEMO_CHANGES
-          if (menu_item->submenu)
-            {
-              GtkMenuItem *msi;
-              GtkStateType selected_state;
-
-              /* This draws different focus depending on if it's the
-               * toplevel focused menu item. All items that have
-               * submenus that in turn have an item selected will be
-               * drawn with SELECTED-state focus. If this isn't the
-               * case, PRELIGHT-state focus is used.
-               */
-              msi = GTK_MENU_ITEM (GTK_MENU_SHELL (menu_item->submenu)->active_menu_item);
-
-              if ((msi == NULL) || (GTK_WIDGET_STATE (msi) == GTK_STATE_NORMAL))
-                selected_state = GTK_STATE_PRELIGHT;
-              else
-                selected_state = GTK_STATE_SELECTED;
-
-              gtk_paint_box (widget->style,
-                             widget->window,
-                             selected_state,
-                             selected_shadow_type,
-                             area, widget, "menuitem",
-                             x, y, width, height);
-            }
-          else
-#endif /* MAEMO_CHANGES */
 	  gtk_paint_box (widget->style,
 			 widget->window,
 			 GTK_STATE_PRELIGHT,