aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2009-11-20 08:54:18 +0000
committerJan Djärv2009-11-20 08:54:18 +0000
commit4a8e097d4ee5a28bcf551ee4fbeec3126c07be79 (patch)
treea0f666263a51fd8d8b2a46fb2570863312225353
parent653d15547ab8a8bb1093e6643f62b334ebefaca4 (diff)
downloademacs-4a8e097d4ee5a28bcf551ee4fbeec3126c07be79.tar.gz
emacs-4a8e097d4ee5a28bcf551ee4fbeec3126c07be79.zip
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
add a blank entry so it doesn't collapse into nothing.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gtkutil.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index eeceb7b767d..e1cce91b646 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-11-20 Jan Djärv <jan.h.d@swipnet.se>
2
3 * gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
4 add a blank entry so it doesn't collapse into nothing.
5
12009-11-19 Stefan Monnier <monnier@iro.umontreal.ca> 62009-11-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * lread.c (Funintern): Comment out last change. 8 * lread.c (Funintern): Comment out last change.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index b182b52e6a7..4a55e51b8b2 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2477,6 +2477,10 @@ xg_update_menubar (menubar, f, list, iter, pos, val,
2477 /* Item(s) have been removed. Remove all remaining items. */ 2477 /* Item(s) have been removed. Remove all remaining items. */
2478 xg_destroy_widgets (iter); 2478 xg_destroy_widgets (iter);
2479 2479
2480 /* Add a blank entry so the menubar doesn't collapse to nothing. */
2481 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar),
2482 gtk_menu_item_new_with_label (""),
2483 0);
2480 /* All updated. */ 2484 /* All updated. */
2481 val = 0; 2485 val = 0;
2482 iter = 0; 2486 iter = 0;