From: Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
Date: Fri, 4 Feb 1994 17:13:26 +0000 (+0000)
Subject: (xmenu_show) [USE_X_TOOLKIT]: Remove the #if 0 directives and reverse one to
X-Git-Tag: emacs-19.34~10076
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/399703f129848b8267728314e2d999f0fa0767b3

(xmenu_show) [USE_X_TOOLKIT]: Remove the #if 0 directives and reverse one to
avoid the flickering of the menubar.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index c4980ff17b..a926ad1ca9 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -906,15 +906,8 @@ xmenu_show (f, val, x, y, menubarp, vw)
 
     if (menubarp)
       {
-#if 0
-	/* we are in the menubar */
-	XtUnmapWidget (f->display.x->menubar_widget); 
-	vw->call_data = (XtPointer) 1;
-	XtMapWidget (f->display.x->menubar_widget);
-#else
 	vw->call_data = (XtPointer) 1;
 	dispatch_dummy_expose (f->display.x->menubar_widget, x, y);
-#endif
       }
 
 
@@ -949,15 +942,8 @@ xmenu_show (f, val, x, y, menubarp, vw)
       
   if (menubarp)
     {
-#if 1
-      XtUnmapWidget (f->display.x->menubar_widget); 
       vw->call_data = (XtPointer) 0;
-      XtMapWidget (f->display.x->menubar_widget);
-#else
-      vw->call_data = (XtPointer) 0;
-      dispatch_dummy_expose (f->display.x->menubar_widget, 0, 0);
-      XFlushQueue ();
-#endif
+      dispatch_dummy_expose (f->display.x->menubar_widget, x, y);
     }
 
   /* Return any foreign events that were queued to the X event queue.  */