Mercurial > emacs
comparison src/xmenu.c @ 109442:6c14b478b70f
* xmenu.c (free_frame_menubar): Only call x_set_window_size if
widget is non-null (Bug#6645).
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 16 Jul 2010 09:50:37 +0200 |
| parents | f8f118e78387 |
| children | 051595eb9b58 |
comparison
equal
deleted
inserted
replaced
| 109441:0ed7d8444705 | 109442:6c14b478b70f |
|---|---|
| 1353 #endif | 1353 #endif |
| 1354 | 1354 |
| 1355 lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id); | 1355 lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id); |
| 1356 f->output_data.x->menubar_widget = NULL; | 1356 f->output_data.x->menubar_widget = NULL; |
| 1357 | 1357 |
| 1358 #ifdef USE_MOTIF | |
| 1359 if (f->output_data.x->widget) | 1358 if (f->output_data.x->widget) |
| 1360 { | 1359 { |
| 1360 #ifdef USE_MOTIF | |
| 1361 XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL); | 1361 XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL); |
| 1362 if (x1 == 0 && y1 == 0) | 1362 if (x1 == 0 && y1 == 0) |
| 1363 XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL); | 1363 XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL); |
| 1364 #endif | |
| 1365 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); | |
| 1364 } | 1366 } |
| 1365 #endif | |
| 1366 x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); | |
| 1367 UNBLOCK_INPUT; | 1367 UNBLOCK_INPUT; |
| 1368 } | 1368 } |
| 1369 } | 1369 } |
| 1370 #endif /* not USE_GTK */ | 1370 #endif /* not USE_GTK */ |
| 1371 | 1371 |