From: Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
Date: Fri, 11 Feb 1994 13:56:38 +0000 (+0000)
Subject: (x_set_menu_bar_lines) [USE_X_TOOLKIT]: Dont Call XtDestroyWidget but
X-Git-Tag: emacs-19.34~9951
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bc2039852dbd2d5b49ecc2638a13ea7c201394b;p=emacs.git

(x_set_menu_bar_lines) [USE_X_TOOLKIT]: Dont Call XtDestroyWidget but
free_frame_menubar.
Undo previous changes.
---

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;
    application.  */
 Widget Xt_app_shell;
 
+extern void free_frame_menubar ();
 #endif /* USE_X_TOOLKIT */
 
 #define min(a,b) ((a) < (b) ? (a) : (b))
@@ -1076,9 +1077,8 @@ x_set_menu_bar_lines (f, value, oldval)
     FRAME_EXTERNAL_MENU_BAR (f) = 1;
   else
     {
-      if (FRAME_EXTERNAL_MENU_BAR (f) == 1 
-	  && f->display.x->menubar_widget)
-	XtDestroyWidget (f->display.x->menubar_widget);
+      if (FRAME_EXTERNAL_MENU_BAR (f) == 1)
+	free_frame_menubar (f);
       FRAME_EXTERNAL_MENU_BAR (f) = 0;
       f->display.x->menubar_widget = 0;
     }