From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 6 Mar 2000 22:50:15 +0000 (+0000)
Subject: (make_menubar): Set XmNresizeHeight and
X-Git-Tag: emacs-pretest-21.0.90~4751
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1d4d17e24a74826e9f41508a9b8704ba5a78c309;p=emacs.git

(make_menubar): Set XmNresizeHeight and
XmNresizeWidth resources only if LESSTIF_VERSION is defined.
---

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 3f6389bcda0..5b1dc3ab25b 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-06  Gerd Moellmann  <gerd@gnu.org>
+
+	* lwlib-Xm.c (make_menubar): Set XmNresizeHeight and
+	XmNresizeWidth resources only if LESSTIF_VERSION is defined.
+
 2000-03-05  Gerd Moellmann  <gerd@gnu.org>
 
 	* lwlib-Xm.c (xm_manage_resizing): Rewritten.
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index ca9898b5130..61906109101 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1492,11 +1492,13 @@ make_menubar (instance)
   ac = 0;
   XtSetArg(al[ac], XmNmenuAccelerator, 0); ++ac;
 
+#ifdef LESSTIF_VERSION
   /* As of 2000-01-17, the LessTif menu bar resizes to height 0 when
      all its children are removed, causing an annoying flickering
      behavior.  Prevent that by not allowing resizing.  */
   XtSetArg(al[ac], XmNresizeHeight, False); ++ac;
   XtSetArg(al[ac], XmNresizeWidth, False); ++ac;
+#endif
   
   return XmCreateMenuBar (instance->parent, instance->info->name, al, ac);
 }