Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HT_PaneFromURL() needs a context passed in from XFE_DisplayBuiltin(), so we now pass the context along.

Browse Source
This commit is contained in:
mcafee%netscape.com 1998-09-09 18:07:10 +00:00
parent e8ae61a40e
commit 4f05895704
5 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/xfe/lay.c
View File

@ -2313,7 +2313,7 @@ XFE_FreeEdgeElement (MWContext *context, LO_EdgeStruct *edge)
XP_FREE (sashinfo);
}
extern Widget fe_showRDFTreeView (Widget w,
extern Widget fe_showRDFTreeView (MWContext *context,
LO_BuiltinStruct *builtin_struct);
void
@ -2343,8 +2343,7 @@ XFE_DisplayBuiltin (MWContext *context, int iLocation,
url = LO_GetBuiltInAttribute(builtin_struct, "data");
target = LO_GetBuiltInAttribute(builtin_struct, "target");
view = fe_showRDFTreeView(CONTEXT_DATA (context)->drawing_area,
builtin_struct);
view = fe_showRDFTreeView(context, builtin_struct);
builtin_struct->FE_Data = (void *) view;

13
cmd/xfe/src/BuiltinTreeView.cpp
View File

@ -50,22 +50,13 @@ XFE_BuiltinTreeView::XFE_BuiltinTreeView(XFE_Component *toplevel_component,
target = LO_GetBuiltInAttribute(builtin_struct, "target");
// New HT pane.
newPaneFromURL(url, builtin_struct->attributes.n,
newPaneFromURL(context, url,
builtin_struct->attributes.n,
builtin_struct->attributes.names,
builtin_struct->attributes.values);
setHTView(HT_GetSelectedView(_ht_pane));
#if 0
// Test, I'm not seeing a tree yet. Please delete this soon :-)
{
Widget testHack = XmCreatePushButton(mainForm, "RDFTreeView", NULL, 0);
XtManageChild(testHack);
}
#endif
// Register the MWContext instance in the XP list.
XP_SetLastActiveContext(context);
}

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

@ -71,14 +71,15 @@ XFE_RDFBase::newPane()
}
//////////////////////////////////////////////////////////////////////////
void
XFE_RDFBase::newPaneFromURL(char *url,
XFE_RDFBase::newPaneFromURL(MWContext *context,
char *url,
int param_count,
char **param_names,
char **param_values)
{
startPaneCreate();
_ht_pane = HT_PaneFromURL(NULL, url, _ht_ns, 0,
_ht_pane = HT_PaneFromURL(context, url, _ht_ns, 0,
param_count, param_names, param_values);
finishPaneCreate();

3
cmd/xfe/src/RDFBase.h
View File

@ -46,7 +46,8 @@ public:
void newBookmarksPane ();
void newHistoryPane ();
void newToolbarPane ();
void newPaneFromURL (char * url,
void newPaneFromURL (MWContext *context,
char * url,
int param_count = 0,
char **param_names = NULL,
char **param_values = NULL);

6
cmd/xfe/src/context_funcs.cpp
View File

@ -2808,7 +2808,7 @@ fe_NeutralizeFocus(MWContext * context)
}
//////////////////////////////////////////////////////////////////////////
extern "C" MWContext *FE_GetRDFContext(void) {
MWContext *context = NULL;
/* MWContext *context = NULL; */
/* if(theApp.m_pRDFCX) {
pRetval = theApp.m_pRDFCX->GetContext();
@ -2822,9 +2822,9 @@ extern "C" MWContext *FE_GetRDFContext(void) {
*/
extern "C" Widget
fe_showRDFTreeView (Widget parent, LO_BuiltinStruct *builtin_struct)
fe_showRDFTreeView (MWContext *context, LO_BuiltinStruct *builtin_struct)
{
MWContext *context = fe_WidgetToMWContext (parent);
Widget parent = CONTEXT_DATA (context)->drawing_area;
XFE_Component *toplevel = fe_frameFromMWContext (context);
// XFE_View *view =