(make_menubar): Set XmNresizeHeight and

XmNresizeWidth resources only if LESSTIF_VERSION is defined.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 3f6389bcda051f6a800924d293ef1d39941905dc..5b1dc3ab25babe2be22da5a62dfe77fd9351c779 100644 (file)
--- 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 ca9898b5130835209fd7d400ca65160dbd2d7880..619061091010a63c133926e8eba9eaef24c9f001 100644 (file)
--- 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);
 }