[Emacs-diffs] Changes to emacs/lwlib/lwlib-Xm.c

[Jan Djärv]

Index: emacs/lwlib/lwlib-Xm.c
diff -c emacs/lwlib/lwlib-Xm.c:1.45 emacs/lwlib/lwlib-Xm.c:1.46
*** emacs/lwlib/lwlib-Xm.c:1.45 Mon Apr 22 14:25:55 2002
--- emacs/lwlib/lwlib-Xm.c      Sun Jan 26 08:06:48 2003
***************
*** 268,274 ****
          XtSetArg (al[0], XmNsubMenuId, &submenu); 
          XtGetValues (children[i], al, 1);
          if (submenu)
!           XtDestroyWidget (submenu);
          XtDestroyWidget (children[i]);
        }
  
--- 268,277 ----
          XtSetArg (al[0], XmNsubMenuId, &submenu); 
          XtGetValues (children[i], al, 1);
          if (submenu)
!             {
!               destroy_all_children (submenu, 0);
!               XtDestroyWidget (submenu);
!             }
          XtDestroyWidget (children[i]);
        }
  
***************
*** 734,739 ****
--- 737,745 ----
                             (XtPointer)instance);
              XtManageChild (button);
            }
+ 
+           if (widget_list)
+             XtFree ((char*) widget_list);
        }
      }
    else if (!contents)
***************
*** 813,819 ****
      {
        destroy_all_children (widget, num_children_to_keep);
        make_menu_in_widget (instance, widget, val->contents,
!                          num_children_to_keep);
      }
  
    XtFree ((char *) children);
--- 819,825 ----
      {
        destroy_all_children (widget, num_children_to_keep);
        make_menu_in_widget (instance, widget, val->contents,
!                            num_children_to_keep);
      }
  
    XtFree ((char *) children);