(free_frame_menubar) [USE_MOTIF]: Preserve the
shell widget's position only if it is non-null.
This commit is contained in:
parent
fc2cdd9a0f
commit
ae5564222b
1 changed files with 8 additions and 4 deletions
12
src/xmenu.c
12
src/xmenu.c
|
@ -1885,16 +1885,20 @@ free_frame_menubar (f)
|
|||
BLOCK_INPUT;
|
||||
|
||||
#ifdef USE_MOTIF
|
||||
XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL);
|
||||
if (f->output_data.x->widget)
|
||||
XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL);
|
||||
#endif
|
||||
|
||||
lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id);
|
||||
f->output_data.x->menubar_widget = NULL;
|
||||
|
||||
#ifdef USE_MOTIF
|
||||
XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL);
|
||||
if (x1 == 0 && y1 == 0)
|
||||
XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL);
|
||||
if (f->output_data.x->widget)
|
||||
{
|
||||
XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL);
|
||||
if (x1 == 0 && y1 == 0)
|
||||
XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
UNBLOCK_INPUT;
|
||||
|
|
Loading…
Add table
Reference in a new issue