[Emacs-diffs] emacs/src ChangeLog gtkutil.c

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/11/20 08:54:20

Modified files:
        src            : ChangeLog gtkutil.c 

Log message:
        gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
        add a blank entry so it doesn't collapse into nothing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7883&r2=1.7884
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.165&r2=1.166

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7883
retrieving revision 1.7884
diff -u -b -r1.7883 -r1.7884
--- ChangeLog   19 Nov 2009 22:10:40 -0000      1.7883
+++ ChangeLog   20 Nov 2009 08:54:18 -0000      1.7884
@@ -1,3 +1,8 @@
+2009-11-20  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
+       add a blank entry so it doesn't collapse into nothing.
+
 2009-11-19  Stefan Monnier  <address@hidden>
 
        * lread.c (Funintern): Comment out last change.

Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- gtkutil.c   14 Nov 2009 18:22:36 -0000      1.165
+++ gtkutil.c   20 Nov 2009 08:54:20 -0000      1.166
@@ -2477,6 +2477,10 @@
       /* Item(s) have been removed.  Remove all remaining items.  */
       xg_destroy_widgets (iter);
 
+      /* Add a blank entry so the menubar doesn't collapse to nothing. */
+      gtk_menu_shell_insert (GTK_MENU_SHELL (menubar),
+                             gtk_menu_item_new_with_label (""),
+                             0);
       /* All updated.  */
       val = 0;
       iter = 0;