gtk+ r20351 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Wed Jun 11 03:36:32 2008
New Revision: 20351
URL: http://svn.gnome.org/viewvc/gtk+?rev=20351&view=rev

Log:
        Bug 536765 â GtkComboBox should set COMBO type hint for its menu

        * gtk/gtkoptionmenu.c:
        * gtk/gtkcombobox.c: Set the window type hint on popups.
        Patch by Danny Baumann



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkcombobox.c
   trunk/gtk/gtkoptionmenu.c

Modified: trunk/gtk/gtkcombobox.c
==============================================================================
--- trunk/gtk/gtkcombobox.c	(original)
+++ trunk/gtk/gtkcombobox.c	Wed Jun 11 03:36:32 2008
@@ -1575,6 +1575,9 @@
 
       gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data);
     }
+
+  gtk_window_set_type_hint (GTK_MENU (priv->popup_widget)->toplevel,
+			    GDK_WINDOW_TYPE_HINT_COMBO);
 }
 
 static void

Modified: trunk/gtk/gtkoptionmenu.c
==============================================================================
--- trunk/gtk/gtkoptionmenu.c	(original)
+++ trunk/gtk/gtkoptionmenu.c	Wed Jun 11 03:36:32 2008
@@ -894,6 +894,10 @@
   active = gtk_menu_get_active (GTK_MENU (option_menu->menu));
   gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos);
 
+  /* set combo box type hint for menu popup */
+  gtk_window_set_type_hint (GTK_MENU (option_menu->menu)->toplevel,
+			    GDK_WINDOW_TYPE_HINT_COMBO);
+
   menu_xpos += widget->allocation.x;
   menu_ypos += widget->allocation.y + widget->allocation.height / 2 - 2;