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

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/10/08 15:18:18

Modified files:
        src            : ChangeLog gtkutil.c 

Log message:
        gtkutil.c (create_menus): Call gtk_widget_set_size_request for
        menu bar with a small width so it doesn't enlarge the frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7784&r2=1.7785
http://cvs.savannah.gnu.org/viewcvs/emacs/src/gtkutil.c?cvsroot=emacs&r1=1.158&r2=1.159

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7784
retrieving revision 1.7785
diff -u -b -r1.7784 -r1.7785
--- ChangeLog   8 Oct 2009 10:54:58 -0000       1.7784
+++ ChangeLog   8 Oct 2009 15:18:15 -0000       1.7785
@@ -1,3 +1,8 @@
+2009-10-08  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (create_menus): Call gtk_widget_set_size_request for
+       menu bar with a small width so it doesn't enlarge the frame.
+
 2009-10-08  Juanma Barranquero  <address@hidden>
 
        * fontset.c (Fset_fontset_font): Fix typos in error messages.

Index: gtkutil.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- gtkutil.c   16 Jul 2009 01:24:01 -0000      1.158
+++ gtkutil.c   8 Oct 2009 15:18:17 -0000       1.159
@@ -2194,7 +2194,15 @@
                           G_CALLBACK (menuitem_highlight_callback),
                           NULL);
       }
-      else wmenu = gtk_menu_bar_new ();
+      else
+        {
+          wmenu = gtk_menu_bar_new ();
+          // Set width of menu bar to a small value so it doesn't enlarge
+          // a small initial frame size.  The width will be set to the
+          // width of the frame later on when it is added to a container.
+          // height -1: Natural height.
+          gtk_widget_set_size_request (wmenu, 1, -1);
+        }
 
       /* Put cl_data on the top menu for easier access.  */
       cl_data = make_cl_data (cl_data, f, highlight_cb);