(preserve_other_columns, preserve_my_columns): Use new

[gnu-emacs] / lwlib / lwlib-Xm.c

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 72700641d2d7ce1fa15f0fa39debe8104c01de1d..2050c2957550e1ed9ef3d894f34f18798f19f5ea 100644 (file)
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <Xm/BulletinB.h>
 #include <Xm/CascadeB.h>
+#include <Xm/CascadeBG.h>
 #include <Xm/DrawingA.h>
 #include <Xm/FileSB.h>
 #include <Xm/Label.h>
@@ -168,7 +169,20 @@ destroy_all_children (widget, first_child_to_destroy)
       /* Unmanage all children and destroy them.  They will only be 
         really destroyed when we get out of DispatchEvent.  */
       for (i = first_child_to_destroy; i < number; i++)
-       XtDestroyWidget (children[i]);
+       {
+         Arg al[2];
+         Widget submenu = 0;
+         /* Cascade buttons have submenus,and these submenus
+            need to be freed.  But they are not included in
+            XtCompositeChildren.  So get it out of the cascade button
+            and free it.  If this child is not a cascade button,
+            then submenu should remain unchanged.  */
+         XtSetArg (al[0], XmNsubMenuId, &submenu); 
+         XtGetValues (children[i], al, 1);
+         if (submenu)
+           XtDestroyWidget (submenu);
+         XtDestroyWidget (children[i]);
+       }
 
       XtFree ((char *) children);
     }
@@ -426,8 +440,11 @@ make_menu_in_widget (instance, widget, val, keep_first_children)
        {
          menu = XmCreatePulldownMenu (widget, cur->name, NULL, 0);
          make_menu_in_widget (instance, menu, cur->contents, 0);
-         XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
-         button = XmCreateCascadeButton (widget, cur->name, al, ac);
+          XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
+          /* non-zero values don't work reliably in
+             conjunction with Emacs' event loop */
+          XtSetArg (al [ac], XmNmappingDelay, 0); ac++;
+         button = XmCreateCascadeButtonGadget (widget, cur->name, al, ac);
 
          xm_update_label (instance, button, cur);
 
@@ -492,11 +509,50 @@ update_one_menu_entry (instance, widget, val, deep_p)
     {
       if (contents)
        {
-         menu = XmCreatePulldownMenu (XtParent (widget), XtName (widget), NULL, 0);
-         make_menu_in_widget (instance, menu, contents, 0);
-         ac = 0;
-         XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
-         XtSetValues (widget, al, ac);
+         unsigned int old_num_children, i;
+         Widget parent;
+         Widget *widget_list;
+
+         parent = XtParent (widget);
+         widget_list = XtCompositeChildren (parent, &old_num_children);
+
+         /* Find the widget position within the parent's widget list.  */
+         for (i = 0; i < old_num_children; i++)
+           if (strcmp (XtName (widget_list[i]), XtName (widget)) == 0)
+             break;
+         if (i == old_num_children)
+           abort ();
+         if (XmIsCascadeButton (widget_list[i]))
+           {
+             menu = XmCreatePulldownMenu (parent, XtName(widget), NULL, 0);
+             make_menu_in_widget (instance, menu, contents, 0);
+             ac = 0;
+             XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
+             XtSetValues (widget, al, ac);
+           }
+         else
+           {
+             Widget button;
+             
+             /* The current menuitem is a XmPushButtonGadget, it 
+                needs to be replaced by a CascadeButtonGadget */
+             XtDestroyWidget (widget_list[i]);
+             menu = XmCreatePulldownMenu (parent, val->name, NULL, 0);
+             make_menu_in_widget (instance, menu, contents, 0);
+             ac = 0;
+             XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
+             /* Non-zero values don't work reliably in
+                conjunction with Emacs' event loop */
+             XtSetArg (al [ac], XmNmappingDelay, 0); ac++;
+             /* Tell Motif to put it in the right place */
+             XtSetArg (al [ac], XmNpositionIndex, i); ac++;
+             button = XmCreateCascadeButtonGadget (parent, val->name, al, ac);
+             xm_update_label (instance, button, val);
+             
+             XtAddCallback (button, XmNcascadingCallback, xm_pull_down_callback,
+                            (XtPointer)instance);
+             XtManageChild (button);
+           }
        }
     }
   else if (!contents)
@@ -536,7 +592,9 @@ xm_update_menu (instance, widget, val, deep_p)
     {
       if (children)
        {
-         for (i = 0, cur = val->contents; i < num_children;
+         for (i = 0, cur = val->contents; 
+               (i < num_children
+               && cur); /* how else to ditch unwanted children ?? - mgd */
               i++, cur = cur->next)
            {
              if (cur->this_one_change == STRUCTURAL_CHANGE)
@@ -556,7 +614,10 @@ xm_update_menu (instance, widget, val, deep_p)
       for (i = 0, cur = val->contents; i < num_children_to_keep; i++)
        {
          if (!cur)
-           abort ();
+           {
+             num_children_to_keep = i;
+             break;
+           }
          if (children [i]->core.being_destroyed
              || strcmp (XtName (children [i]), cur->name))
            continue;
@@ -1248,11 +1309,19 @@ xm_create_dialog (instance)
   return widget;
 }
 
+/* Create a menu bar.  We turn off the f10 key
+   because we have not yet managed to make it work right in Motif.  */
+
 static Widget
 make_menubar (instance)
      widget_instance* instance;
 {
-  return XmCreateMenuBar (instance->parent, instance->info->name, NULL, 0);
+  Arg al[1];
+  int ac;
+
+  ac = 0;
+  XtSetArg(al[0], XmNmenuAccelerator, 0);
+  return XmCreateMenuBar (instance->parent, instance->info->name, al, 1);
 }
 
 static void