gtk+ r19511 - in branches/gtk-2-12: . gtk tests

[ebassi svn gnome org]

Author: ebassi
Date: Mon Feb 11 09:58:29 2008
New Revision: 19511
URL: http://svn.gnome.org/viewvc/gtk+?rev=19511&view=rev

Log:
2008-02-11  Emmanuele Bassi  <ebassi gnome org>

	Merge from trunk:

	* gtk/gtkrecentchoosermenu.c:
	(gtk_recent_chooser_menu_constructor): Set no-show-all flag
	on the placeholder menu item.

	* tests/testrecentchoosermenu.c: 
	(create_recent_chooser_menu): Use gtk_widget_show_all() to test
	whether the placeholder menu item gets shown.

Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkrecentchoosermenu.c
   branches/gtk-2-12/tests/testrecentchoosermenu.c

Modified: branches/gtk-2-12/gtk/gtkrecentchoosermenu.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkrecentchoosermenu.c	(original)
+++ branches/gtk-2-12/gtk/gtkrecentchoosermenu.c	Mon Feb 11 09:58:29 2008
@@ -324,6 +324,7 @@
                      GINT_TO_POINTER (TRUE));
 
   gtk_menu_shell_insert (GTK_MENU_SHELL (menu), priv->placeholder, 0);
+  gtk_widget_set_no_show_all (priv->placeholder, TRUE);
   gtk_widget_show (priv->placeholder);
 
   /* (re)populate the menu */

Modified: branches/gtk-2-12/tests/testrecentchoosermenu.c
==============================================================================
--- branches/gtk-2-12/tests/testrecentchoosermenu.c	(original)
+++ branches/gtk-2-12/tests/testrecentchoosermenu.c	Mon Feb 11 09:58:29 2008
@@ -81,8 +81,6 @@
                     G_CALLBACK (item_activated_cb),
                     NULL);
 
-  gtk_widget_show (menu);
-
   menuitem = gtk_separator_menu_item_new ();
   gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
@@ -103,6 +101,8 @@
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
   gtk_widget_show (menuitem);
 
+  gtk_widget_show_all (menu);
+
   return menu;
 }