Mercurial > emacs

diff src/xmenu.c @ 109240:6f0915b37828

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Sat, 10 Jul 2010 10:34:43 +0000
parents 04ae6087d3c0
children 60516122d066
line wrap: on
line diff
--- a/src/xmenu.c	Fri Jul 09 12:11:05 2010 +0000
+++ b/src/xmenu.c	Sat Jul 10 10:34:43 2010 +0000
@@ -1285,6 +1285,9 @@
     }
 
   {
+    if (f->output_data.x->menubar_widget)
+      XtRealizeWidget (f->output_data.x->menubar_widget);
+
     int menubar_size
       = (f->output_data.x->menubar_widget
 	 ? (f->output_data.x->menubar_widget->core.height
@@ -1385,7 +1388,7 @@
 	    XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL);
 	}
 #endif
-
+      x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
       UNBLOCK_INPUT;
     }
 }