Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move fe_DestroyWidgetTree() to XfeWidgets/MenuUtils.c as

Browse Source 
XfeDestroyMenuWidgetTree().  Make it safe for killing private components.
This commit is contained in:
ramiro 1998-04-21 15:52:01 +00:00
parent c0f7f90f73
commit 5b4bc81397
7 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/xfe/hot.c
View File

@ -73,26 +73,3 @@ fe_AddBookmarkCallback (Widget widget, XtPointer closure, XtPointer call_data)
bmcontext = fe_getBookmarkContext();
BM_AppendToHeader (bmcontext, BM_GetAddHeader(bmcontext), bm);
}
void
fe_DestroyWidgetTree(Widget *widgets, int n)
{
int i;
Widget *morekids = NULL;
int nmorekids = 0;
Widget submenu = 0;
if (n <= 0) return;
for (i = n-1; i >= 0; i--) {
XtVaGetValues (widgets[i], XmNsubMenuId, &submenu, 0);
if (submenu) {
XtVaGetValues (widgets[i], XmNchildren, &morekids,
XmNnumChildren, &nmorekids, 0);
if(nmorekids > 0) {
fe_DestroyWidgetTree (morekids, nmorekids);
}
}
XtDestroyWidget (widgets[i]);
}
}

4
cmd/xfe/src/AttachmentMenu.cpp
View File

@ -26,6 +26,8 @@
#include "MsgView.h"
#include "felocale.h"
#include <Xfe/MenuUtil.h> // for XfeDestroyMenuWidgetTree()
XFE_AttachmentMenu::XFE_AttachmentMenu(Widget w, XFE_Frame *frame)
{
m_cascade = w;
@ -140,7 +142,7 @@ XFE_AttachmentMenu::update()
nkids -= m_firstslot;
XtUnmanageChildren (kids, nkids);
fe_DestroyWidgetTree(kids, nkids);
XfeDestroyMenuWidgetTree(kids,nkids,False);
}
add_attachment_menu_items(m_submenu);

2
cmd/xfe/src/BookmarkMenu.cpp
View File

@ -178,7 +178,7 @@ XFE_BookmarkMenu::reallyUpdateRoot()
{
XtUnmanageChildren(children,numChildren);
fe_DestroyWidgetTree(children,numChildren);
XfeDestroyMenuWidgetTree(children,numChildren,False);
}
}

2
cmd/xfe/src/EditRecentMenu.cpp
View File

@ -149,7 +149,7 @@ XFE_EditRecentMenu::destroyItems()
if (nkids) {
XtUnmanageChildren (kids, nkids);
fe_DestroyWidgetTree(kids, nkids);
XfeDestroyMenuWidgetTree(kids,nkids,False);
#ifdef DEBUG_rhess2
fprintf(stderr, "destroyItems::[ %d ]\n", nkids);
#endif

2
cmd/xfe/src/FolderMenu.cpp
View File

@ -275,7 +275,7 @@ XFE_FolderMenu::update()
nkids -= m_firstslot;
XtUnmanageChildren (kids, nkids);
fe_DestroyWidgetTree(kids, nkids);
XfeDestroyMenuWidgetTree(kids, nkids,False);
}
{

5
cmd/xfe/src/HistoryMenu.cpp
View File

@ -27,9 +27,12 @@
#include "felocale.h"
#include "intl_csi.h"
#include <Xfe/MenuUtil.h> // for XfeDestroyMenuWidgetTree()
#include "xpgetstr.h" // for XP_GetString()
extern int XFE_UNTITLED;
#define MAX_ITEM_WIDTH 40
typedef struct HistoryCons {
@ -186,7 +189,7 @@ XFE_HistoryMenu::update()
{
XtUnmanageChildren (kids, nkids);
fe_DestroyWidgetTree(kids, nkids);
XfeDestroyMenuWidgetTree(kids, nkids,False);
}
}

1
cmd/xfe/xfe.h
View File

@ -574,7 +574,6 @@ extern int fe_RemoteCommands (Display *dpy, Window window, char **commands);
extern XtActionsRec fe_CommandActions [], fe_MailNewsActions [];
extern int fe_CommandActionsSize, fe_MailNewsActionsSize;
extern void fe_UnmanageChild_safe (Widget w);
extern void fe_DestroyWidgetTree(Widget *kids, int nkids);
/*
* Context protection/destruction releated routines