Mercurial > emacs
comparison src/xfns.c @ 109184:04ae6087d3c0
Fix frame sizing for Lucid/Motif/Lesstif.
* xfns.c (x_window): Set borderWidth to 0 for pane and
EmacsFrame. Frame size calculation is wrong otherwise.
* xmenu.c (set_frame_menubar): Must realize menubar_widget to get the
correct size for Motif.
(free_frame_menubar): Call x_set_window_size to update frame size.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Fri, 09 Jul 2010 18:39:51 +0200 |
parents | 8cfee7d2955f |
children | 60516122d066 |
comparison
equal
deleted
inserted
replaced
109183:a0cffb71f267 | 109184:04ae6087d3c0 |
---|---|
2448 | 2448 |
2449 ac = 0; | 2449 ac = 0; |
2450 XtSetArg (al[ac], XtNvisual, FRAME_X_VISUAL (f)); ac++; | 2450 XtSetArg (al[ac], XtNvisual, FRAME_X_VISUAL (f)); ac++; |
2451 XtSetArg (al[ac], XtNdepth, FRAME_X_DISPLAY_INFO (f)->n_planes); ac++; | 2451 XtSetArg (al[ac], XtNdepth, FRAME_X_DISPLAY_INFO (f)->n_planes); ac++; |
2452 XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++; | 2452 XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++; |
2453 XtSetArg (al[ac], XtNborderWidth, 0); ac++; | |
2453 XtSetValues (pane_widget, al, ac); | 2454 XtSetValues (pane_widget, al, ac); |
2454 f->output_data.x->column_widget = pane_widget; | 2455 f->output_data.x->column_widget = pane_widget; |
2455 | 2456 |
2456 /* mappedWhenManaged to false tells to the paned window to not map/unmap | 2457 /* mappedWhenManaged to false tells to the paned window to not map/unmap |
2457 the emacs screen when changing menubar. This reduces flickering. */ | 2458 the emacs screen when changing menubar. This reduces flickering. */ |
2463 XtSetArg (al[ac], XtNresizeToPreferred, 1); ac++; | 2464 XtSetArg (al[ac], XtNresizeToPreferred, 1); ac++; |
2464 XtSetArg (al[ac], XtNemacsFrame, f); ac++; | 2465 XtSetArg (al[ac], XtNemacsFrame, f); ac++; |
2465 XtSetArg (al[ac], XtNvisual, FRAME_X_VISUAL (f)); ac++; | 2466 XtSetArg (al[ac], XtNvisual, FRAME_X_VISUAL (f)); ac++; |
2466 XtSetArg (al[ac], XtNdepth, FRAME_X_DISPLAY_INFO (f)->n_planes); ac++; | 2467 XtSetArg (al[ac], XtNdepth, FRAME_X_DISPLAY_INFO (f)->n_planes); ac++; |
2467 XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++; | 2468 XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++; |
2469 XtSetArg (al[ac], XtNborderWidth, 0); ac++; | |
2468 frame_widget = XtCreateWidget (f->namebuf, emacsFrameClass, pane_widget, | 2470 frame_widget = XtCreateWidget (f->namebuf, emacsFrameClass, pane_widget, |
2469 al, ac); | 2471 al, ac); |
2470 | 2472 |
2471 f->output_data.x->edit_widget = frame_widget; | 2473 f->output_data.x->edit_widget = frame_widget; |
2472 | 2474 |