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

More popup work.

Browse Source
This commit is contained in:
hyatt%netscape.com 2000-01-26 23:30:10 +00:00
parent e5d4c38a9a
commit 757fc8d376
6 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
content/xul/content/src/nsXULElement.cpp
View File

@ -90,6 +90,7 @@
#include "nsXULControllers.h"
#include "nsXULEditorElement.h"
#include "nsXULTreeElement.h"
#include "nsXULPopupElement.h"
#include "prlog.h"
#include "rdf.h"
#include "rdfutil.h"
@ -265,6 +266,7 @@ nsIAtom* nsXULElement::kContextAtom;
nsIAtom* nsXULElement::kIdAtom;
nsIAtom* nsXULElement::kObservesAtom;
nsIAtom* nsXULElement::kPopupAtom;
nsIAtom* nsXULElement::kMenuPopupAtom;
nsIAtom* nsXULElement::kRefAtom;
nsIAtom* nsXULElement::kSelectedAtom;
nsIAtom* nsXULElement::kStyleAtom;
@ -326,6 +328,7 @@ nsXULElement::Init()
kIdAtom = NS_NewAtom("id");
kObservesAtom = NS_NewAtom("observes");
kPopupAtom = NS_NewAtom("popup");
kMenuPopupAtom = NS_NewAtom("menupopup");
kRefAtom = NS_NewAtom("ref");
kSelectedAtom = NS_NewAtom("selected");
kStyleAtom = NS_NewAtom("style");
@ -397,6 +400,7 @@ nsXULElement::~nsXULElement()
NS_IF_RELEASE(kIdAtom);
NS_IF_RELEASE(kObservesAtom);
NS_IF_RELEASE(kPopupAtom);
NS_IF_RELEASE(kMenuPopupAtom);
NS_IF_RELEASE(kRefAtom);
NS_IF_RELEASE(kSelectedAtom);
NS_IF_RELEASE(kStyleAtom);
@ -582,6 +586,20 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result)
else if (iid.Equals(NS_GET_IID(nsIChromeEventHandler))) {
*result = NS_STATIC_CAST(nsIChromeEventHandler*, this);
}
else if ((iid.Equals(NS_GET_IID(nsIDOMXULPopupElement))) &&
(NameSpaceID() == kNameSpaceID_XUL) &&
((Tag() == kPopupAtom) || (Tag() == kMenuPopupAtom))) {
// We delegate XULPopupElement APIs to an aggregate object
if (! InnerXULElement()) {
rv = EnsureSlots();
if (NS_FAILED(rv)) return rv;
if ((mSlots->mInnerXULElement = new nsXULPopupElement(this)) == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
}
return InnerXULElement()->QueryInterface(iid, result);
}
else if ((iid.Equals(NS_GET_IID(nsIDOMXULTreeElement)) ||
iid.Equals(NS_GET_IID(nsIXULTreeContent))) &&
(NameSpaceID() == kNameSpaceID_XUL) &&
@ -1603,6 +1621,10 @@ nsXULElement::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
fn = NS_NewScriptXULEditorElement;
rootname = "nsXULEditorElement::mScriptObject";
}
else if ((Tag() == kMenuPopupAtom) || (Tag() == kPopupAtom)) {
fn = NS_NewScriptXULPopupElement;
rootname = "nsXULPopupElement::mScriptObject";
}
else {
fn = NS_NewScriptXULElement;
rootname = "nsXULElement::mScriptObject";

4
content/xul/content/src/nsXULElement.h
View File

@ -335,6 +335,7 @@ protected:
static nsIAtom* kIdAtom;
static nsIAtom* kObservesAtom;
static nsIAtom* kPopupAtom;
static nsIAtom* kMenuPopupAtom;
static nsIAtom* kRefAtom;
static nsIAtom* kSelectedAtom;
static nsIAtom* kStyleAtom;
@ -348,7 +349,8 @@ protected:
static nsIAtom* kTreeRowAtom;
static nsIAtom* kEditorAtom;
static nsIAtom* kWindowAtom;
static nsIAtom* kNullAtom;
static nsIAtom* kNullAtom;
public:
static nsresult

1
rdf/content/src/Makefile.in
View File

@ -51,6 +51,7 @@ CPPSRCS = \
nsXULCommandDispatcher.cpp \
nsXULControllers.cpp \
nsXULKeyListener.cpp \
nsXULPopupElement.cpp \
nsXULTreeElement.cpp \
nsXULEditorElement.cpp \
nsXULPrototypeDocument.cpp \

1
rdf/content/src/makefile.win
View File

@ -54,6 +54,7 @@ CPP_OBJS=\
.\$(OBJDIR)\nsXULSortService.obj \
.\$(OBJDIR)\nsXULTreeElement.obj \
.\$(OBJDIR)\nsXULEditorElement.obj \
.\$(OBJDIR)\nsXULPopupElement.obj \
$(NULL)
# XXX we are including layout\html\base\src to get HTML elements

22
rdf/content/src/nsXULElement.cpp
View File

@ -90,6 +90,7 @@
#include "nsXULControllers.h"
#include "nsXULEditorElement.h"
#include "nsXULTreeElement.h"
#include "nsXULPopupElement.h"
#include "prlog.h"
#include "rdf.h"
#include "rdfutil.h"
@ -265,6 +266,7 @@ nsIAtom* nsXULElement::kContextAtom;
nsIAtom* nsXULElement::kIdAtom;
nsIAtom* nsXULElement::kObservesAtom;
nsIAtom* nsXULElement::kPopupAtom;
nsIAtom* nsXULElement::kMenuPopupAtom;
nsIAtom* nsXULElement::kRefAtom;
nsIAtom* nsXULElement::kSelectedAtom;
nsIAtom* nsXULElement::kStyleAtom;
@ -326,6 +328,7 @@ nsXULElement::Init()
kIdAtom = NS_NewAtom("id");
kObservesAtom = NS_NewAtom("observes");
kPopupAtom = NS_NewAtom("popup");
kMenuPopupAtom = NS_NewAtom("menupopup");
kRefAtom = NS_NewAtom("ref");
kSelectedAtom = NS_NewAtom("selected");
kStyleAtom = NS_NewAtom("style");
@ -397,6 +400,7 @@ nsXULElement::~nsXULElement()
NS_IF_RELEASE(kIdAtom);
NS_IF_RELEASE(kObservesAtom);
NS_IF_RELEASE(kPopupAtom);
NS_IF_RELEASE(kMenuPopupAtom);
NS_IF_RELEASE(kRefAtom);
NS_IF_RELEASE(kSelectedAtom);
NS_IF_RELEASE(kStyleAtom);
@ -582,6 +586,20 @@ nsXULElement::QueryInterface(REFNSIID iid, void** result)
else if (iid.Equals(NS_GET_IID(nsIChromeEventHandler))) {
*result = NS_STATIC_CAST(nsIChromeEventHandler*, this);
}
else if ((iid.Equals(NS_GET_IID(nsIDOMXULPopupElement))) &&
(NameSpaceID() == kNameSpaceID_XUL) &&
((Tag() == kPopupAtom) || (Tag() == kMenuPopupAtom))) {
// We delegate XULPopupElement APIs to an aggregate object
if (! InnerXULElement()) {
rv = EnsureSlots();
if (NS_FAILED(rv)) return rv;
if ((mSlots->mInnerXULElement = new nsXULPopupElement(this)) == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
}
return InnerXULElement()->QueryInterface(iid, result);
}
else if ((iid.Equals(NS_GET_IID(nsIDOMXULTreeElement)) ||
iid.Equals(NS_GET_IID(nsIXULTreeContent))) &&
(NameSpaceID() == kNameSpaceID_XUL) &&
@ -1603,6 +1621,10 @@ nsXULElement::GetScriptObject(nsIScriptContext* aContext, void** aScriptObject)
fn = NS_NewScriptXULEditorElement;
rootname = "nsXULEditorElement::mScriptObject";
}
else if ((Tag() == kMenuPopupAtom) || (Tag() == kPopupAtom)) {
fn = NS_NewScriptXULPopupElement;
rootname = "nsXULPopupElement::mScriptObject";
}
else {
fn = NS_NewScriptXULElement;
rootname = "nsXULElement::mScriptObject";

4
rdf/content/src/nsXULElement.h
View File

@ -335,6 +335,7 @@ protected:
static nsIAtom* kIdAtom;
static nsIAtom* kObservesAtom;
static nsIAtom* kPopupAtom;
static nsIAtom* kMenuPopupAtom;
static nsIAtom* kRefAtom;
static nsIAtom* kSelectedAtom;
static nsIAtom* kStyleAtom;
@ -348,7 +349,8 @@ protected:
static nsIAtom* kTreeRowAtom;
static nsIAtom* kEditorAtom;
static nsIAtom* kWindowAtom;
static nsIAtom* kNullAtom;
static nsIAtom* kNullAtom;
public:
static nsresult