зеркало из https://github.com/mozilla/pjs.git
Adding support for new XUL widgets.
This commit is contained in:
hyatt%netscape.com
Родитель
7ecc5d1450
Коммит
f03f7253a1
|
|
@ -300,6 +300,8 @@ nsIAtom* nsXULElement::kRadioAtom;
|
|||
nsIAtom* nsXULElement::kRadioGroupAtom;
|
||||
nsIAtom* nsXULElement::kMenuListAtom;
|
||||
nsIAtom* nsXULElement::kMenuButtonAtom;
|
||||
nsIAtom* nsXULElement::kTextAreaAtom;
|
||||
nsIAtom* nsXULElement::kTextFieldAtom;
|
||||
|
||||
#ifdef XUL_PROTOTYPE_ATTRIBUTE_METERING
|
||||
PRUint32 nsXULPrototypeAttribute::gNumElements;
|
||||
|
|
@ -370,8 +372,10 @@ nsXULElement::Init()
|
|||
kCheckboxAtom = NS_NewAtom("checkbox");
|
||||
kRadioAtom = NS_NewAtom("radio");
|
||||
kRadioGroupAtom = NS_NewAtom("radiogroup");
|
||||
kMenuListAtom = NS_NewAtom("menulist");
|
||||
kMenuListAtom = NS_NewAtom("menulist");
|
||||
kMenuButtonAtom = NS_NewAtom("menubutton");
|
||||
kTextAreaAtom = NS_NewAtom("textarea");
|
||||
kTextFieldAtom = NS_NewAtom("textfield");
|
||||
|
||||
rv = nsComponentManager::CreateInstance(kNameSpaceManagerCID,
|
||||
nsnull,
|
||||
|
|
@ -454,6 +458,8 @@ nsXULElement::~nsXULElement()
|
|||
NS_IF_RELEASE(kRadioGroupAtom);
|
||||
NS_IF_RELEASE(kMenuListAtom);
|
||||
NS_IF_RELEASE(kMenuButtonAtom);
|
||||
NS_IF_RELEASE(kTextFieldAtom);
|
||||
NS_IF_RELEASE(kTextAreaAtom);
|
||||
|
||||
NS_IF_RELEASE(gNameSpaceManager);
|
||||
|
||||
|
|
@ -4052,12 +4058,14 @@ nsXULElement::RemoveFocus(nsIPresContext* aPresContext)
|
|||
PRBool
|
||||
nsXULElement::IsFocusableContent()
|
||||
{
|
||||
// XXX This method sucks. I mean it. It really really sucks.
|
||||
nsCOMPtr<nsIAtom> tag;
|
||||
GetBaseTag(getter_AddRefs(tag));
|
||||
if (!tag)
|
||||
tag = Tag();
|
||||
return (tag.get() == kTitledButtonAtom) || (tag.get() == kTreeAtom) || (tag.get() == kCheckboxAtom) || (tag.get() == kRadioAtom) ||
|
||||
(tag.get() == kMenuListAtom) || (tag.get() == kMenuButtonAtom);
|
||||
(tag.get() == kMenuListAtom) || (tag.get() == kMenuButtonAtom) || (tag.get() == kTextFieldAtom) ||
|
||||
(tag.get() == kTextAreaAtom);
|
||||
}
|
||||
|
||||
// nsIBindableContent Interface
|
||||
|
|
|
|||
|
|
@ -359,6 +359,8 @@ protected:
|
|||
static nsIAtom* kWindowAtom;
|
||||
static nsIAtom* kMenuButtonAtom;
|
||||
static nsIAtom* kMenuListAtom;
|
||||
static nsIAtom* kTextAreaAtom;
|
||||
static nsIAtom* kTextFieldAtom;
|
||||
|
||||
public:
|
||||
static nsresult
|
||||
|
|
|
|||
|
|
@ -300,6 +300,8 @@ nsIAtom* nsXULElement::kRadioAtom;
|
|||
nsIAtom* nsXULElement::kRadioGroupAtom;
|
||||
nsIAtom* nsXULElement::kMenuListAtom;
|
||||
nsIAtom* nsXULElement::kMenuButtonAtom;
|
||||
nsIAtom* nsXULElement::kTextAreaAtom;
|
||||
nsIAtom* nsXULElement::kTextFieldAtom;
|
||||
|
||||
#ifdef XUL_PROTOTYPE_ATTRIBUTE_METERING
|
||||
PRUint32 nsXULPrototypeAttribute::gNumElements;
|
||||
|
|
@ -370,8 +372,10 @@ nsXULElement::Init()
|
|||
kCheckboxAtom = NS_NewAtom("checkbox");
|
||||
kRadioAtom = NS_NewAtom("radio");
|
||||
kRadioGroupAtom = NS_NewAtom("radiogroup");
|
||||
kMenuListAtom = NS_NewAtom("menulist");
|
||||
kMenuListAtom = NS_NewAtom("menulist");
|
||||
kMenuButtonAtom = NS_NewAtom("menubutton");
|
||||
kTextAreaAtom = NS_NewAtom("textarea");
|
||||
kTextFieldAtom = NS_NewAtom("textfield");
|
||||
|
||||
rv = nsComponentManager::CreateInstance(kNameSpaceManagerCID,
|
||||
nsnull,
|
||||
|
|
@ -454,6 +458,8 @@ nsXULElement::~nsXULElement()
|
|||
NS_IF_RELEASE(kRadioGroupAtom);
|
||||
NS_IF_RELEASE(kMenuListAtom);
|
||||
NS_IF_RELEASE(kMenuButtonAtom);
|
||||
NS_IF_RELEASE(kTextFieldAtom);
|
||||
NS_IF_RELEASE(kTextAreaAtom);
|
||||
|
||||
NS_IF_RELEASE(gNameSpaceManager);
|
||||
|
||||
|
|
@ -4052,12 +4058,14 @@ nsXULElement::RemoveFocus(nsIPresContext* aPresContext)
|
|||
PRBool
|
||||
nsXULElement::IsFocusableContent()
|
||||
{
|
||||
// XXX This method sucks. I mean it. It really really sucks.
|
||||
nsCOMPtr<nsIAtom> tag;
|
||||
GetBaseTag(getter_AddRefs(tag));
|
||||
if (!tag)
|
||||
tag = Tag();
|
||||
return (tag.get() == kTitledButtonAtom) || (tag.get() == kTreeAtom) || (tag.get() == kCheckboxAtom) || (tag.get() == kRadioAtom) ||
|
||||
(tag.get() == kMenuListAtom) || (tag.get() == kMenuButtonAtom);
|
||||
(tag.get() == kMenuListAtom) || (tag.get() == kMenuButtonAtom) || (tag.get() == kTextFieldAtom) ||
|
||||
(tag.get() == kTextAreaAtom);
|
||||
}
|
||||
|
||||
// nsIBindableContent Interface
|
||||
|
|
|
|||
|
|
@ -359,6 +359,8 @@ protected:
|
|||
static nsIAtom* kWindowAtom;
|
||||
static nsIAtom* kMenuButtonAtom;
|
||||
static nsIAtom* kMenuListAtom;
|
||||
static nsIAtom* kTextAreaAtom;
|
||||
static nsIAtom* kTextFieldAtom;
|
||||
|
||||
public:
|
||||
static nsresult
|
||||
|
|
|
|||
|
|
@ -261,4 +261,12 @@ separator {
|
|||
/* appending to end so we don't make hyatt cry */
|
||||
progressmeter {
|
||||
behavior: url(resource:/chrome/xulBindings.xml#progressmeter);
|
||||
}
|
||||
|
||||
textfield {
|
||||
behavior: url(resource:/chrome/xulBindings.xml#textfield);
|
||||
}
|
||||
|
||||
textarea {
|
||||
behavior: url(resource:/chrome/xulBindings.xml#textarea);
|
||||
}
|
||||
|
|
@ -222,4 +222,19 @@
|
|||
</content>
|
||||
</binding>
|
||||
|
||||
<binding name="textfield" extends="xul:box">
|
||||
<content excludes="observes,template">
|
||||
<xul:html flex="1">
|
||||
<html:input inherits="value,disabled,size"/>
|
||||
</xul:html>
|
||||
</content>
|
||||
</binding>
|
||||
|
||||
<binding name="textarea" extends="xul:box">
|
||||
<content excludes="observes,template">
|
||||
<xul:html flex="1">
|
||||
<html:textarea inherits="value,disabled,rows,cols"/>
|
||||
</xul:html>
|
||||
</content>
|
||||
</binding>
|
||||
</bindings>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче