diff options
| author | Fred Pierresteguy | 1994-02-11 13:56:38 +0000 |
|---|---|---|
| committer | Fred Pierresteguy | 1994-02-11 13:56:38 +0000 |
| commit | 6bc2039852dbd2d5b49ecc2638a13ea7c201394b (patch) | |
| tree | 550d877f8c3980c253259dd29e06ce9b4d9b0338 /src | |
| parent | 363f7e15eeafcbae48b194ccd9dc92deedf93568 (diff) | |
| download | emacs-6bc2039852dbd2d5b49ecc2638a13ea7c201394b.tar.gz emacs-6bc2039852dbd2d5b49ecc2638a13ea7c201394b.zip | |
(x_set_menu_bar_lines) [USE_X_TOOLKIT]: Dont Call XtDestroyWidget but
free_frame_menubar.
Undo previous changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfns.c b/src/xfns.c index 54787673692..940826f3136 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -74,6 +74,7 @@ XtAppContext Xt_app_con; | |||
| 74 | application. */ | 74 | application. */ |
| 75 | Widget Xt_app_shell; | 75 | Widget Xt_app_shell; |
| 76 | 76 | ||
| 77 | extern void free_frame_menubar (); | ||
| 77 | #endif /* USE_X_TOOLKIT */ | 78 | #endif /* USE_X_TOOLKIT */ |
| 78 | 79 | ||
| 79 | #define min(a,b) ((a) < (b) ? (a) : (b)) | 80 | #define min(a,b) ((a) < (b) ? (a) : (b)) |
| @@ -1076,9 +1077,8 @@ x_set_menu_bar_lines (f, value, oldval) | |||
| 1076 | FRAME_EXTERNAL_MENU_BAR (f) = 1; | 1077 | FRAME_EXTERNAL_MENU_BAR (f) = 1; |
| 1077 | else | 1078 | else |
| 1078 | { | 1079 | { |
| 1079 | if (FRAME_EXTERNAL_MENU_BAR (f) == 1 | 1080 | if (FRAME_EXTERNAL_MENU_BAR (f) == 1) |
| 1080 | && f->display.x->menubar_widget) | 1081 | free_frame_menubar (f); |
| 1081 | XtDestroyWidget (f->display.x->menubar_widget); | ||
| 1082 | FRAME_EXTERNAL_MENU_BAR (f) = 0; | 1082 | FRAME_EXTERNAL_MENU_BAR (f) = 0; |
| 1083 | f->display.x->menubar_widget = 0; | 1083 | f->display.x->menubar_widget = 0; |
| 1084 | } | 1084 | } |