Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

convert chrome://global/content/widgets to chrome://global/content/bindings

Browse Source
This commit is contained in:
chanial%noos.fr 2003-11-20 05:14:08 +00:00
parent 9554db89fa
commit 5dade47a7d
38 changed files with 258 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/search.xml
View File

@ -41,7 +41,7 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl"> xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="searchbar" extends="chrome://global/content/widgets/autocomplete.xml#autocomplete"> <binding id="searchbar" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
<implementation> <implementation>
<constructor><![CDATA[ <constructor><![CDATA[
setTimeout(function(a) { a.initialize(); }, 0, this); setTimeout(function(a) { a.initialize(); }, 0, this);

2
browser/base/skin/browser.xml
View File

@ -9,7 +9,7 @@
<!-- :::/ widgets \ ::::::::::::::::::::::::::::::::::::::::::::::::::::: --> <!-- :::/ widgets \ ::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
<binding id="toolbar-menu-button" display="xul:menu" <binding id="toolbar-menu-button" display="xul:menu"
extends="chrome://global/content/widgets/toolbarbutton.xml#menu-button"> extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
<content> <content>
<children includes="observes|template|menupopup|tooltip"/> <children includes="observes|template|menupopup|tooltip"/>
<xul:stack class="box-inherit toolbarbutton-menubutton-stack" flex="1"> <xul:stack class="box-inherit toolbarbutton-menubutton-stack" flex="1">

4
browser/base/skin/mac/browser.xml
View File

@ -9,7 +9,7 @@
<!-- :::/ widgets \ ::::::::::::::::::::::::::::::::::::::::::::::::::::: --> <!-- :::/ widgets \ ::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
<binding id="toolbar-menu-button" display="xul:menu" <binding id="toolbar-menu-button" display="xul:menu"
extends="chrome://global/content/widgets/toolbarbutton.xml#menu-button"> extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
<content> <content>
<children includes="observes|template|menupopup|tooltip"/> <children includes="observes|template|menupopup|tooltip"/>
<xul:stack class="box-inherit toolbarbutton-menubutton-stack" flex="1"> <xul:stack class="box-inherit toolbarbutton-menubutton-stack" flex="1">
@ -29,7 +29,7 @@
</content> </content>
</binding> </binding>
<binding id="bm-toolbarbutton" display="xul:button" extends="chrome://global/content/widgets/toolbarbutton.xml#toolbarbutton"> <resources> <stylesheet src="chrome://global/skin/toolbarbutton.css"/> </resources> <content> <children includes="observes|template|menupopup|tooltip"/> <xul:spacer class="bookmark-image-left" xbl:inherits="accesskey,crop,toolbarmode,buttonstyle"/> <binding id="bm-toolbarbutton" display="xul:button" extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton"> <resources> <stylesheet src="chrome://global/skin/toolbarbutton.css"/> </resources> <content> <children includes="observes|template|menupopup|tooltip"/> <xul:spacer class="bookmark-image-left" xbl:inherits="accesskey,crop,toolbarmode,buttonstyle"/>
<xul:label class="toolbarbutton-text" crop="right" flex="1" xbl:inherits="value=label,accesskey,crop,toolbarmode,buttonstyle"/> <xul:label class="toolbarbutton-text" crop="right" flex="1" xbl:inherits="value=label,accesskey,crop,toolbarmode,buttonstyle"/>
<xul:spacer class="bookmark-image-right" xbl:inherits="accesskey,crop,toolbarmode,buttonstyle"/> </content> </binding> <xul:spacer class="bookmark-image-right" xbl:inherits="accesskey,crop,toolbarmode,buttonstyle"/> </content> </binding>
</bindings> </bindings>

2
toolkit/components/printing/content/printPreviewBindings.xml
View File

@ -46,7 +46,7 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="printpreviewtoolbar" <binding id="printpreviewtoolbar"
extends="chrome://global/content/widgets/toolbar.xml#toolbar"> extends="chrome://global/content/bindings/toolbar.xml#toolbar">
<resources> <resources>
<stylesheet src="chrome://global/skin/printPreview.css"/> <stylesheet src="chrome://global/skin/printPreview.css"/>
</resources> </resources>

66
toolkit/content/jar.mn
View File

@ -29,36 +29,36 @@ toolkit.jar:
+ content/global/selectDialog.js (selectDialog.js) + content/global/selectDialog.js (selectDialog.js)
+ content/global/selectDialog.xul (selectDialog.xul) + content/global/selectDialog.xul (selectDialog.xul)
*+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
* content/global/widgets/autocomplete.xml (widgets/autocomplete.xml) * content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
* content/global/widgets/browser.xml (widgets/browser.xml) * content/global/bindings/browser.xml (widgets/browser.xml)
* content/global/widgets/button.xml (widgets/button.xml) * content/global/bindings/button.xml (widgets/button.xml)
* content/global/widgets/checkbox.xml (widgets/checkbox.xml) * content/global/bindings/checkbox.xml (widgets/checkbox.xml)
* content/global/widgets/colorpicker.xml (widgets/colorpicker.xml) * content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
* content/global/widgets/dialog.xml (widgets/dialog.xml) * content/global/bindings/dialog.xml (widgets/dialog.xml)
* content/global/widgets/editor.xml (widgets/editor.xml) * content/global/bindings/editor.xml (widgets/editor.xml)
* content/global/widgets/expander.xml (widgets/expander.xml) * content/global/bindings/expander.xml (widgets/expander.xml)
* content/global/widgets/general.xml (widgets/general.xml) * content/global/bindings/general.xml (widgets/general.xml)
* content/global/widgets/groupbox.xml (widgets/groupbox.xml) * content/global/bindings/groupbox.xml (widgets/groupbox.xml)
* content/global/widgets/listbox.xml (widgets/listbox.xml) * content/global/bindings/listbox.xml (widgets/listbox.xml)
* content/global/widgets/menu.xml (widgets/menu.xml) * content/global/bindings/menu.xml (widgets/menu.xml)
* content/global/widgets/menulist.xml (widgets/menulist.xml) * content/global/bindings/menulist.xml (widgets/menulist.xml)
* content/global/widgets/nativescrollbar.xml (widgets/nativescrollbar.xml) * content/global/bindings/nativescrollbar.xml (widgets/nativescrollbar.xml)
* content/global/widgets/popup.xml (widgets/popup.xml) * content/global/bindings/popup.xml (widgets/popup.xml)
* content/global/widgets/progressmeter.xml (widgets/progressmeter.xml) * content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
* content/global/widgets/radio.xml (widgets/radio.xml) * content/global/bindings/radio.xml (widgets/radio.xml)
* content/global/widgets/scrollbar.xml (widgets/scrollbar.xml) * content/global/bindings/scrollbar.xml (widgets/scrollbar.xml)
* content/global/widgets/scrollbox.xml (widgets/scrollbox.xml) * content/global/bindings/scrollbox.xml (widgets/scrollbox.xml)
* content/global/widgets/splitter.xml (widgets/splitter.xml) * content/global/bindings/splitter.xml (widgets/splitter.xml)
* content/global/widgets/spinbuttons.xml (widgets/spinbuttons.xml) * content/global/bindings/spinbuttons.xml (widgets/spinbuttons.xml)
* content/global/widgets/stringbundle.xml (widgets/stringbundle.xml) * content/global/bindings/stringbundle.xml (widgets/stringbundle.xml)
* content/global/widgets/tabbox.xml (widgets/tabbox.xml) * content/global/bindings/tabbox.xml (widgets/tabbox.xml)
* content/global/widgets/tabbrowser.xml (widgets/tabbrowser.xml) * content/global/bindings/tabbrowser.xml (widgets/tabbrowser.xml)
* content/global/widgets/text.xml (widgets/text.xml) * content/global/bindings/text.xml (widgets/text.xml)
* content/global/widgets/textbox.xml (widgets/textbox.xml) * content/global/bindings/textbox.xml (widgets/textbox.xml)
* content/global/widgets/toolbar.xml (widgets/toolbar.xml) * content/global/bindings/toolbar.xml (widgets/toolbar.xml)
* content/global/widgets/toolbarbutton.xml (widgets/toolbarbutton.xml) * content/global/bindings/toolbarbutton.xml (widgets/toolbarbutton.xml)
* content/global/widgets/tree.xml (widgets/tree.xml) * content/global/bindings/tree.xml (widgets/tree.xml)
* content/global/widgets/wizard.xml (widgets/wizard.xml) * content/global/bindings/wizard.xml (widgets/wizard.xml)
content/global/widgets/autoscroll_all.png (widgets/autoscroll_all.png) content/global/bindings/autoscroll_all.png (widgets/autoscroll_all.png)
content/global/widgets/autoscroll_h.png (widgets/autoscroll_h.png) content/global/bindings/autoscroll_h.png (widgets/autoscroll_h.png)
content/global/widgets/autoscroll_v.png (widgets/autoscroll_v.png) content/global/bindings/autoscroll_v.png (widgets/autoscroll_v.png)

6
toolkit/content/widgets/autocomplete.xml
View File

@ -43,7 +43,7 @@
xmlns:xbl="http://www.mozilla.org/xbl"> xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="autocomplete" <binding id="autocomplete"
extends="chrome://global/content/widgets/textbox.xml#textbox"> extends="chrome://global/content/bindings/textbox.xml#textbox">
<resources> <resources>
<stylesheet src="chrome://global/skin/autocomplete.css"/> <stylesheet src="chrome://global/skin/autocomplete.css"/>
</resources> </resources>
@ -421,7 +421,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="autocomplete-result-popup" extends="chrome://global/content/widgets/popup.xml#popup"> <binding id="autocomplete-result-popup" extends="chrome://global/content/bindings/popup.xml#popup">
<resources> <resources>
<stylesheet src="chrome://global/skin/tree.css"/> <stylesheet src="chrome://global/skin/tree.css"/>
<stylesheet src="chrome://global/skin/autocomplete.css"/> <stylesheet src="chrome://global/skin/autocomplete.css"/>
@ -652,7 +652,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="autocomplete-tree" extends="chrome://global/content/widgets/tree.xml#tree"> <binding id="autocomplete-tree" extends="chrome://global/content/bindings/tree.xml#tree">
<content> <content>
<children includes="treecols"/> <children includes="treecols"/>
<xul:treerows class="autocomplete-treerows tree-rows" xbl:inherits="hidescrollbar" flex="1"> <xul:treerows class="autocomplete-treerows tree-rows" xbl:inherits="hidescrollbar" flex="1">

6
toolkit/content/widgets/browser.xml
View File

@ -560,9 +560,9 @@
// marker // marker
var el = this._clientFrameDoc.createElementNS("http://www.w3.org/1999/xhtml", "img"); var el = this._clientFrameDoc.createElementNS("http://www.w3.org/1999/xhtml", "img");
var scrollImages = new Array("chrome://global/content/widgets/autoscroll_all.png", var scrollImages = new Array("chrome://global/content/bindings/autoscroll_all.png",
"chrome://global/content/widgets/autoscroll_v.png", "chrome://global/content/bindings/autoscroll_v.png",
"chrome://global/content/widgets/autoscroll_h.png"); "chrome://global/content/bindings/autoscroll_h.png");
el.src = scrollImages[scrollType]; el.src = scrollImages[scrollType];
el.style.position = "fixed"; el.style.position = "fixed";

12
toolkit/content/widgets/button.xml
View File

@ -5,7 +5,7 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl"> xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="button-base" extends="chrome://global/content/widgets/general.xml#basetext"> <binding id="button-base" extends="chrome://global/content/bindings/general.xml#basetext">
<implementation implements="nsIDOMXULButtonElement, nsIAccessibleProvider"> <implementation implements="nsIDOMXULButtonElement, nsIAccessibleProvider">
<property name="accessible"> <property name="accessible">
<getter> <getter>
@ -163,7 +163,7 @@
</binding> </binding>
<binding id="button" display="xul:button" <binding id="button" display="xul:button"
extends="chrome://global/content/widgets/button.xml#button-base"> extends="chrome://global/content/bindings/button.xml#button-base">
<resources> <resources>
<stylesheet src="chrome://global/skin/button.css"/> <stylesheet src="chrome://global/skin/button.css"/>
</resources> </resources>
@ -181,7 +181,7 @@
</binding> </binding>
<binding id="menu" display="xul:menu" <binding id="menu" display="xul:menu"
extends="chrome://global/content/widgets/button.xml#button"> extends="chrome://global/content/bindings/button.xml#button">
<content> <content>
<children includes="observes|template|menupopup|tooltip"/> <children includes="observes|template|menupopup|tooltip"/>
<xul:hbox class="box-inherit button-box" xbl:inherits="align,dir,pack,orient" <xul:hbox class="box-inherit button-box" xbl:inherits="align,dir,pack,orient"
@ -196,7 +196,7 @@
</binding> </binding>
<binding id="menu-button-base" <binding id="menu-button-base"
extends="chrome://global/content/widgets/button.xml#button-base"> extends="chrome://global/content/bindings/button.xml#button-base">
<implementation> <implementation>
<constructor> <constructor>
this.init(); this.init();
@ -298,7 +298,7 @@
</binding> </binding>
<binding id="menu-button" display="xul:menu" <binding id="menu-button" display="xul:menu"
extends="chrome://global/content/widgets/button.xml#menu-button-base"> extends="chrome://global/content/bindings/button.xml#menu-button-base">
<resources> <resources>
<stylesheet src="chrome://global/skin/button.css"/> <stylesheet src="chrome://global/skin/button.css"/>
</resources> </resources>
@ -316,7 +316,7 @@
</binding> </binding>
<binding id="button-image" display="xul:button" <binding id="button-image" display="xul:button"
extends="chrome://global/content/widgets/button.xml#button"> extends="chrome://global/content/bindings/button.xml#button">
<content> <content>
<xul:image class="button-image-icon" xbl:inherits="src=image"/> <xul:image class="button-image-icon" xbl:inherits="src=image"/>
</content> </content>

4
toolkit/content/widgets/checkbox.xml
View File

@ -5,13 +5,13 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl"> xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="checkbox" extends="chrome://global/content/widgets/checkbox.xml#checkbox-baseline"> <binding id="checkbox" extends="chrome://global/content/bindings/checkbox.xml#checkbox-baseline">
<resources> <resources>
<stylesheet src="chrome://global/skin/checkbox.css"/> <stylesheet src="chrome://global/skin/checkbox.css"/>
</resources> </resources>
</binding> </binding>
<binding id="checkbox-baseline" extends="chrome://global/content/widgets/general.xml#basetext"> <binding id="checkbox-baseline" extends="chrome://global/content/bindings/general.xml#basetext">
<content> <content>
<xul:image class="checkbox-check" xbl:inherits="checked,disabled"/> <xul:image class="checkbox-check" xbl:inherits="checked,disabled"/>
<xul:hbox class="checkbox-label-box" flex="1"> <xul:hbox class="checkbox-label-box" flex="1">

4
toolkit/content/widgets/dialog.xml
View File

@ -11,7 +11,7 @@
</resources> </resources>
</binding> </binding>
<binding id="dialog" extends="chrome://global/content/widgets/dialog.xml#dialog-base"> <binding id="dialog" extends="chrome://global/content/bindings/dialog.xml#dialog-base">
<content> <content>
<xul:vbox class="box-inherit dialog-content-box" flex="1"> <xul:vbox class="box-inherit dialog-content-box" flex="1">
<children/> <children/>
@ -340,7 +340,7 @@
</binding> </binding>
<binding id="dialogheader" extends="chrome://global/content/widgets/dialog.xml#dialog-base"> <binding id="dialogheader" extends="chrome://global/content/bindings/dialog.xml#dialog-base">
<content> <content>
<xul:label class="dialogheader-title" xbl:inherits="value=title,crop" crop="right" flex="1"/> <xul:label class="dialogheader-title" xbl:inherits="value=title,crop" crop="right" flex="1"/>
<xul:label class="dialogheader-description" xbl:inherits="value=description"/> <xul:label class="dialogheader-description" xbl:inherits="value=description"/>

10
toolkit/content/widgets/general.xml
View File

@ -23,7 +23,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="control-item" extends="chrome://global/content/widgets/general.xml#basetext"> <binding id="control-item" extends="chrome://global/content/bindings/general.xml#basetext">
<implementation> <implementation>
<property name="value" onset="return this.setAttribute('value', val);" <property name="value" onset="return this.setAttribute('value', val);"
onget="return this.getAttribute('value');"/> onget="return this.getAttribute('value');"/>
@ -44,7 +44,7 @@
- Note that this widget will be no longer used in the bookmarks window once - Note that this widget will be no longer used in the bookmarks window once
- tree is extended to have this functionality built in. - tree is extended to have this functionality built in.
--> -->
<binding id="inline-edit-base" extends="chrome://global/content/widgets/general.xml#basetext"> <binding id="inline-edit-base" extends="chrome://global/content/bindings/general.xml#basetext">
<implementation> <implementation>
<field name="_mode">0</field> <field name="_mode">0</field>
<method name="setMode"> <method name="setMode">
@ -166,7 +166,7 @@
</binding> </binding>
<!-- inline editable buttons --> <!-- inline editable buttons -->
<binding id="buttonleft-ile" extends="chrome://global/content/widgets/general.xml#inline-edit-base"> <binding id="buttonleft-ile" extends="chrome://global/content/bindings/general.xml#inline-edit-base">
<content> <content>
<xul:hbox class="button-internal-box" align="center" flex="1"> <xul:hbox class="button-internal-box" align="center" flex="1">
<xul:image class="button-icon" xbl:inherits="src"/> <xul:image class="button-icon" xbl:inherits="src"/>
@ -219,7 +219,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="statusbarpanel-menu-iconic" display="xul:menu" extends="chrome://global/content/widgets/general.xml#statusbarpanel"> <binding id="statusbarpanel-menu-iconic" display="xul:menu" extends="chrome://global/content/bindings/general.xml#statusbarpanel">
<content> <content>
<xul:image class="statusbarpanel-icon" xbl:inherits="src"/> <xul:image class="statusbarpanel-icon" xbl:inherits="src"/>
<children/> <children/>
@ -247,7 +247,7 @@
</binding> </binding>
<binding id="statusbarpanel-iconic" display="xul:button" <binding id="statusbarpanel-iconic" display="xul:button"
extends="chrome://global/content/widgets/general.xml#statusbarpanel"> extends="chrome://global/content/bindings/general.xml#statusbarpanel">
<content> <content>
<xul:image class="statusbarpanel-icon" xbl:inherits="src"/> <xul:image class="statusbarpanel-icon" xbl:inherits="src"/>
</content> </content>

4
toolkit/content/widgets/groupbox.xml
View File

@ -11,7 +11,7 @@
</resources> </resources>
</binding> </binding>
<binding id="groupbox" extends="chrome://global/content/widgets/groupbox.xml#groupbox-base"> <binding id="groupbox" extends="chrome://global/content/bindings/groupbox.xml#groupbox-base">
<content> <content>
<xul:hbox class="groupbox-title" align="center" pack="start"> <xul:hbox class="groupbox-title" align="center" pack="start">
<children includes="caption"/> <children includes="caption"/>
@ -33,7 +33,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="caption" extends="chrome://global/content/widgets/general.xml#basetext"> <binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
<resources> <resources>
<stylesheet src="chrome://global/skin/groupbox.css"/> <stylesheet src="chrome://global/skin/groupbox.css"/>
</resources> </resources>

24
toolkit/content/widgets/listbox.xml
View File

@ -12,7 +12,7 @@
</binding> </binding>
<binding id="listbox" <binding id="listbox"
extends="chrome://global/content/widgets/listbox.xml#listbox-base"> extends="chrome://global/content/bindings/listbox.xml#listbox-base">
<content> <content>
<children includes="listcols"> <children includes="listcols">
<xul:listcols> <xul:listcols>
@ -699,7 +699,7 @@
</binding> </binding>
<binding id="listrows" <binding id="listrows"
extends="chrome://global/content/widgets/listbox.xml#listbox-base"> extends="chrome://global/content/bindings/listbox.xml#listbox-base">
<handlers> <handlers>
<handler event="DOMMouseScroll" phase="capturing"> <handler event="DOMMouseScroll" phase="capturing">
<![CDATA[ <![CDATA[
@ -717,7 +717,7 @@
</binding> </binding>
<binding id="listitem" <binding id="listitem"
extends="chrome://global/content/widgets/general.xml#basetext"> extends="chrome://global/content/bindings/general.xml#basetext">
<resources> <resources>
<stylesheet src="chrome://global/skin/listbox.css"/> <stylesheet src="chrome://global/skin/listbox.css"/>
</resources> </resources>
@ -846,7 +846,7 @@
</binding> </binding>
<binding id="listitem-iconic" <binding id="listitem-iconic"
extends="chrome://global/content/widgets/listbox.xml#listitem"> extends="chrome://global/content/bindings/listbox.xml#listitem">
<content> <content>
<children> <children>
<xul:listcell class="listcell-iconic" xbl:inherits="label,image,crop,disabled,flexlabel"/> <xul:listcell class="listcell-iconic" xbl:inherits="label,image,crop,disabled,flexlabel"/>
@ -855,7 +855,7 @@
</binding> </binding>
<binding id="listitem-checkbox" <binding id="listitem-checkbox"
extends="chrome://global/content/widgets/listbox.xml#listitem"> extends="chrome://global/content/bindings/listbox.xml#listitem">
<content> <content>
<children> <children>
<xul:listcell type="checkbox" xbl:inherits="label,crop,checked,disabled,flexlabel"/> <xul:listcell type="checkbox" xbl:inherits="label,crop,checked,disabled,flexlabel"/>
@ -884,7 +884,7 @@
</binding> </binding>
<binding id="listitem-checkbox-iconic" <binding id="listitem-checkbox-iconic"
extends="chrome://global/content/widgets/listbox.xml#listitem-checkbox"> extends="chrome://global/content/bindings/listbox.xml#listitem-checkbox">
<content> <content>
<children> <children>
<xul:listcell type="checkbox" class="listcell-iconic" xbl:inherits="label,image,crop,checked,disabled,flexlabel"/> <xul:listcell type="checkbox" class="listcell-iconic" xbl:inherits="label,image,crop,checked,disabled,flexlabel"/>
@ -893,7 +893,7 @@
</binding> </binding>
<binding id="listcell" <binding id="listcell"
extends="chrome://global/content/widgets/listbox.xml#listbox-base"> extends="chrome://global/content/bindings/listbox.xml#listbox-base">
<content> <content>
<children> <children>
<xul:label class="listcell-label" xbl:inherits="value=label,flex=flexlabel,crop,disabled" flex="1" crop="right"/> <xul:label class="listcell-label" xbl:inherits="value=label,flex=flexlabel,crop,disabled" flex="1" crop="right"/>
@ -902,7 +902,7 @@
</binding> </binding>
<binding id="listcell-iconic" <binding id="listcell-iconic"
extends="chrome://global/content/widgets/listbox.xml#listcell"> extends="chrome://global/content/bindings/listbox.xml#listcell">
<content> <content>
<children> <children>
<xul:image class="listcell-icon" xbl:inherits="src=image"/> <xul:image class="listcell-icon" xbl:inherits="src=image"/>
@ -912,7 +912,7 @@
</binding> </binding>
<binding id="listcell-checkbox" <binding id="listcell-checkbox"
extends="chrome://global/content/widgets/listbox.xml#listcell"> extends="chrome://global/content/bindings/listbox.xml#listcell">
<content> <content>
<children> <children>
<xul:image class="listcell-check" xbl:inherits="checked,disabled"/> <xul:image class="listcell-check" xbl:inherits="checked,disabled"/>
@ -922,7 +922,7 @@
</binding> </binding>
<binding id="listcell-checkbox-iconic" <binding id="listcell-checkbox-iconic"
extends="chrome://global/content/widgets/listbox.xml#listcell-checkbox"> extends="chrome://global/content/bindings/listbox.xml#listcell-checkbox">
<content> <content>
<children> <children>
<xul:image class="listcell-check" xbl:inherits="checked,disabled"/> <xul:image class="listcell-check" xbl:inherits="checked,disabled"/>
@ -933,7 +933,7 @@
</binding> </binding>
<binding id="listhead" <binding id="listhead"
extends="chrome://global/content/widgets/listbox.xml#listbox-base"> extends="chrome://global/content/bindings/listbox.xml#listbox-base">
<content> <content>
<xul:listheaditem> <xul:listheaditem>
<children includes="listheader"/> <children includes="listheader"/>
@ -942,7 +942,7 @@
</binding> </binding>
<binding id="listheader" display="xul:button" <binding id="listheader" display="xul:button"
extends="chrome://global/content/widgets/listbox.xml#listbox-base"> extends="chrome://global/content/bindings/listbox.xml#listbox-base">
<content> <content>
<xul:image class="listheader-icon"/> <xul:image class="listheader-icon"/>
<xul:label class="listheader-label" xbl:inherits="value=label,crop" flex="1" crop="right"/> <xul:label class="listheader-label" xbl:inherits="value=label,crop" flex="1" crop="right"/>

18
toolkit/content/widgets/menu.xml
View File

@ -26,7 +26,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="menu" extends="chrome://global/content/widgets/menu.xml#menuitem-base"> <binding id="menu" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
<content> <content>
<xul:label class="menu-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <xul:label class="menu-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/>
<xul:hbox anonid="accel"> <xul:hbox anonid="accel">
@ -44,7 +44,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="menuitem" extends="chrome://global/content/widgets/menu.xml#menuitem-base"> <binding id="menuitem" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
<content> <content>
<xul:label class="menu-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <xul:label class="menu-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/>
<xul:hbox anonid="accel"> <xul:hbox anonid="accel">
@ -60,14 +60,14 @@
</implementation> </implementation>
</binding> </binding>
<binding id="menu-menubar" extends="chrome://global/content/widgets/menu.xml#menuitem-base"> <binding id="menu-menubar" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
<content> <content>
<xul:label class="menubar-text" xbl:inherits="value=label,accesskey,crop" crop="right"/> <xul:label class="menubar-text" xbl:inherits="value=label,accesskey,crop" crop="right"/>
<children includes="menupopup"/> <children includes="menupopup"/>
</content> </content>
</binding> </binding>
<binding id="menu-menubar-iconic" extends="chrome://global/content/widgets/menu.xml#menuitem-base"> <binding id="menu-menubar-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
<content> <content>
<xul:image class="menubar-left" xbl:inherits="image=src"/> <xul:image class="menubar-left" xbl:inherits="image=src"/>
<xul:label class="menubar-text" xbl:inherits="value=label,accesskey,crop" crop="right"/> <xul:label class="menubar-text" xbl:inherits="value=label,accesskey,crop" crop="right"/>
@ -75,7 +75,7 @@
</content> </content>
</binding> </binding>
<binding id="menuitem-iconic" extends="chrome://global/content/widgets/menu.xml#menuitem"> <binding id="menuitem-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem">
<content> <content>
<xul:hbox class="menu-iconic-left" align="center" pack="center" <xul:hbox class="menu-iconic-left" align="center" pack="center"
xbl:inherits="selected,_moz-menuactive,disabled,checked"> xbl:inherits="selected,_moz-menuactive,disabled,checked">
@ -88,7 +88,7 @@
</content> </content>
</binding> </binding>
<binding id="menuitem-iconic-noaccel" extends="chrome://global/content/widgets/menu.xml#menuitem"> <binding id="menuitem-iconic-noaccel" extends="chrome://global/content/bindings/menu.xml#menuitem">
<content> <content>
<xul:hbox class="menu-iconic-left" align="center" pack="center" <xul:hbox class="menu-iconic-left" align="center" pack="center"
xbl:inherits="selected,disabled,checked"> xbl:inherits="selected,disabled,checked">
@ -98,7 +98,7 @@
</content> </content>
</binding> </binding>
<binding id="menu-iconic" extends="chrome://global/content/widgets/menu.xml#menuitem-base"> <binding id="menu-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
<content> <content>
<xul:hbox class="menu-iconic-left" align="center" pack="center"> <xul:hbox class="menu-iconic-left" align="center" pack="center">
<xul:image xbl:inherits="src=image"/> <xul:image xbl:inherits="src=image"/>
@ -119,13 +119,13 @@
</implementation> </implementation>
</binding> </binding>
<binding id="menubutton-item" extends="chrome://global/content/widgets/menu.xml#menuitem-base"> <binding id="menubutton-item" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
<content> <content>
<xul:label class="menubutton-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <xul:label class="menubutton-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/>
<children includes="menupopup"/> <children includes="menupopup"/>
</content> </content>
</binding> </binding>
<binding id="menuseparator" extends="chrome://global/content/widgets/menu.xml#menuitem-base"/> <binding id="menuseparator" extends="chrome://global/content/bindings/menu.xml#menuitem-base"/>
</bindings> </bindings>

6
toolkit/content/widgets/menulist.xml
View File

@ -13,7 +13,7 @@
</binding> </binding>
<binding id="menulist" display="xul:menu" <binding id="menulist" display="xul:menu"
extends="chrome://global/content/widgets/menulist.xml#menulist-base"> extends="chrome://global/content/bindings/menulist.xml#menulist-base">
<content sizetopopup="pref"> <content sizetopopup="pref">
<xul:hbox class="menulist-label-box" flex="1"> <xul:hbox class="menulist-label-box" flex="1">
<xul:image class="menulist-icon" xbl:inherits="src"/> <xul:image class="menulist-icon" xbl:inherits="src"/>
@ -259,7 +259,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="menulist-editable" extends="chrome://global/content/widgets/menulist.xml#menulist"> <binding id="menulist-editable" extends="chrome://global/content/bindings/menulist.xml#menulist">
<content sizetopopup="pref"> <content sizetopopup="pref">
<xul:hbox class="menulist-editable-box textbox-input-box" xbl:inherits="context" flex="1"> <xul:hbox class="menulist-editable-box textbox-input-box" xbl:inherits="context" flex="1">
<html:input class="menulist-editable-input" flex="1" anonid="input" allowevents="true" <html:input class="menulist-editable-input" flex="1" anonid="input" allowevents="true"
@ -441,7 +441,7 @@
</binding> </binding>
<binding id="menulist-compact" display="xul:menu" <binding id="menulist-compact" display="xul:menu"
extends="chrome://global/content/widgets/menulist.xml#menulist"> extends="chrome://global/content/bindings/menulist.xml#menulist">
<content sizetopopup="false"> <content sizetopopup="false">
<xul:dropmarker class="menulist-dropmarker" type="menu"/> <xul:dropmarker class="menulist-dropmarker" type="menu"/>
<xul:image class="menulist-icon" xbl:inherits="src"/> <xul:image class="menulist-icon" xbl:inherits="src"/>

2
toolkit/content/widgets/optionsDialog.xml
View File

@ -5,7 +5,7 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="optionsDialog" <binding id="optionsDialog"
extends="chrome://global/content/widgets/dialog.xml#dialog"> extends="chrome://global/content/bindings/dialog.xml#dialog">
<content> <content>
#ifndef XP_MACOSX #ifndef XP_MACOSX
<xul:hbox flex="1"> <xul:hbox flex="1">

22
toolkit/content/widgets/popup.xml
View File

@ -11,7 +11,7 @@
</resources> </resources>
</binding> </binding>
<binding id="popup" extends="chrome://global/content/widgets/popup.xml#popup-base"> <binding id="popup" extends="chrome://global/content/bindings/popup.xml#popup-base">
<content> <content>
<xul:arrowscrollbox class="popup-internal-box" flex="1" orient="vertical"> <xul:arrowscrollbox class="popup-internal-box" flex="1" orient="vertical">
<children/> <children/>
@ -160,7 +160,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="tooltip" extends="chrome://global/content/widgets/popup.xml#popup"> <binding id="tooltip" extends="chrome://global/content/bindings/popup.xml#popup">
<content> <content>
<children> <children>
<xul:label class="tooltip-label" xbl:inherits="value=label,crop" crop="right" flex="1"/> <xul:label class="tooltip-label" xbl:inherits="value=label,crop" crop="right" flex="1"/>
@ -323,7 +323,7 @@
</binding> </binding>
<!-- East-West resizer --> <!-- East-West resizer -->
<binding id="ew-resizer" extends="xul:box"> <!-- extends="chrome://global/content/widgets/popup.xml#resizerbase"> --> <binding id="ew-resizer" extends="xul:box"> <!-- extends="chrome://global/content/bindings/popup.xml#resizerbase"> -->
<content> <content>
<xul:hbox class="ew-resizer-box" flex="1"/> <xul:hbox class="ew-resizer-box" flex="1"/>
</content> </content>
@ -356,7 +356,7 @@
</binding> </binding>
<!-- North-South resizer --> <!-- North-South resizer -->
<binding id="ns-resizer" extends="xul:box"> <!-- extends="chrome://global/content/widgets/popup.xml#resizerbase"> --> <binding id="ns-resizer" extends="xul:box"> <!-- extends="chrome://global/content/bindings/popup.xml#resizerbase"> -->
<content> <content>
<xul:hbox class="ns-resizer-box" flex="1"/> <xul:hbox class="ns-resizer-box" flex="1"/>
</content> </content>
@ -390,7 +390,7 @@
</binding> </binding>
<!-- Diagonal resizer --> <!-- Diagonal resizer -->
<binding id="diag-resizer" extends="xul:box"> <!-- extends="chrome://global/content/widgets/popup.xml#resizerbase"> --> <binding id="diag-resizer" extends="xul:box"> <!-- extends="chrome://global/content/bindings/popup.xml#resizerbase"> -->
<content> <content>
<xul:hbox class="diag-resizer-box" align="center" flex="1"> <xul:hbox class="diag-resizer-box" align="center" flex="1">
<xul:image class="diag-resizer-image"/> <xul:image class="diag-resizer-image"/>
@ -430,7 +430,7 @@
--> -->
</binding> </binding>
<binding id="titlebar" extends="xul:box"> <!-- extends="chrome://global/content/widgets/popup.xml#resizerbase"> --> <binding id="titlebar" extends="xul:box"> <!-- extends="chrome://global/content/bindings/popup.xml#resizerbase"> -->
<content> <content>
<xul:hbox class="titlebar-box" flex="1"> <xul:hbox class="titlebar-box" flex="1">
<xul:hbox class="titlebar-title-box" flex="1" tooltiptext="Click and drag to float"> <xul:hbox class="titlebar-title-box" flex="1" tooltiptext="Click and drag to float">
@ -474,7 +474,7 @@
--> -->
</binding> </binding>
<binding id="floater-base" display="xul:popup" extends="chrome://global/content/widgets/popup.xml#popup"> <binding id="floater-base" display="xul:popup" extends="chrome://global/content/bindings/popup.xml#popup">
<implementation> <implementation>
<!-- Popup Manipulation Constants --> <!-- Popup Manipulation Constants -->
@ -615,7 +615,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="popup-scrollbars" extends="chrome://global/content/widgets/popup.xml#popup"> <binding id="popup-scrollbars" extends="chrome://global/content/bindings/popup.xml#popup">
<content> <content>
<xul:hbox class="popup-internal-box" flex="1" orient="vertical" style="overflow: auto;"> <xul:hbox class="popup-internal-box" flex="1" orient="vertical" style="overflow: auto;">
<children/> <children/>
@ -623,7 +623,7 @@
</content> </content>
</binding> </binding>
<binding id="floater-normal" extends="chrome://global/content/widgets/popup.xml#floater-base"> <binding id="floater-normal" extends="chrome://global/content/bindings/popup.xml#floater-base">
<content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" > <content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
<vbox class="floater-box" flex="1"> <vbox class="floater-box" flex="1">
<box class="floater-box-top"> <box class="floater-box-top">
@ -642,7 +642,7 @@
</content> </content>
</binding> </binding>
<binding id="floater-dock-left" extends="chrome://global/content/widgets/popup.xml#floater-base"> <binding id="floater-dock-left" extends="chrome://global/content/bindings/popup.xml#floater-base">
<content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" > <content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
<vbox class="floater-box" flex="1"> <vbox class="floater-box" flex="1">
<box class="floater-box-top"> <box class="floater-box-top">
@ -658,7 +658,7 @@
</content> </content>
</binding> </binding>
<binding id="close-button" extends="chrome://global/content/widgets/button.xml#button-base"> <binding id="close-button" extends="chrome://global/content/bindings/button.xml#button-base">
<content> <content>
<xul:hbox align="center" flex="1"> <xul:hbox align="center" flex="1">
<xul:image class="close-button-x"/> <xul:image class="close-button-x"/>

2
toolkit/content/widgets/radio.xml
View File

@ -327,7 +327,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="radio" extends="chrome://global/content/widgets/general.xml#control-item"> <binding id="radio" extends="chrome://global/content/bindings/general.xml#control-item">
<resources> <resources>
<stylesheet src="chrome://global/skin/radio.css"/> <stylesheet src="chrome://global/skin/radio.css"/>
</resources> </resources>

6
toolkit/content/widgets/scrollbox.xml
View File

@ -11,7 +11,7 @@
</resources> </resources>
</binding> </binding>
<binding id="scrollbox" extends="chrome://global/content/widgets/scrollbox.xml#scrollbox-base"> <binding id="scrollbox" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
<content> <content>
<xul:box class="box-inherit scrollbox-innerbox" xbl:inherits="orient,align,pack,dir"> <xul:box class="box-inherit scrollbox-innerbox" xbl:inherits="orient,align,pack,dir">
<children/> <children/>
@ -19,7 +19,7 @@
</content> </content>
</binding> </binding>
<binding id="arrowscrollbox" extends="chrome://global/content/widgets/scrollbox.xml#scrollbox-base"> <binding id="arrowscrollbox" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
<content> <content>
<xul:autorepeatbutton class="autorepeatbutton-up" collapsed="true" <xul:autorepeatbutton class="autorepeatbutton-up" collapsed="true"
oncommand="this.parentNode.scrollByIndex(-1); event.preventBubble();"/> oncommand="this.parentNode.scrollByIndex(-1); event.preventBubble();"/>
@ -63,7 +63,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="autorepeatbutton" extends="chrome://global/content/widgets/scrollbox.xml#scrollbox-base"> <binding id="autorepeatbutton" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
<content> <content>
<xul:image class="autorepeatbutton-icon"/> <xul:image class="autorepeatbutton-icon"/>
</content> </content>

2
toolkit/content/widgets/spinbuttons.xml
View File

@ -26,7 +26,7 @@
xmlns:xbl="http://www.mozilla.org/xbl"> xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="spinbuttons" <binding id="spinbuttons"
extends="chrome://global/content/widgets/spinbuttons.xml#spinbuttons-baseline"> extends="chrome://global/content/bindings/spinbuttons.xml#spinbuttons-baseline">
<resources> <resources>
<stylesheet src="chrome://global/skin/spinbuttons.css"/> <stylesheet src="chrome://global/skin/spinbuttons.css"/>
</resources> </resources>

10
toolkit/content/widgets/tabbox.xml
View File

@ -12,7 +12,7 @@
</binding> </binding>
<binding id="tabbox" display="xul:box" <binding id="tabbox" display="xul:box"
extends="chrome://global/content/widgets/tabbox.xml#tab-base"> extends="chrome://global/content/bindings/tabbox.xml#tab-base">
<implementation implements="nsIAccessibleProvider"> <implementation implements="nsIAccessibleProvider">
<property name="accessible"> <property name="accessible">
<getter> <getter>
@ -175,7 +175,7 @@
</binding> </binding>
<binding id="tabs" display="xul:box" <binding id="tabs" display="xul:box"
extends="chrome://global/content/widgets/tabbox.xml#tab-base"> extends="chrome://global/content/bindings/tabbox.xml#tab-base">
<content> <content>
<xul:spacer class="tabs-left"/> <xul:spacer class="tabs-left"/>
<children/> <children/>
@ -359,7 +359,7 @@
</binding> </binding>
<binding id="tabs-closebutton" <binding id="tabs-closebutton"
extends="chrome://global/content/widgets/tabbox.xml#tabs"> extends="chrome://global/content/bindings/tabbox.xml#tabs">
<content> <content>
<xul:hbox flex="1" style="min-width: 1px;"> <xul:hbox flex="1" style="min-width: 1px;">
<children/> <children/>
@ -375,7 +375,7 @@
</binding> </binding>
<binding id="tabpanels" <binding id="tabpanels"
extends="chrome://global/content/widgets/tabbox.xml#tab-base"> extends="chrome://global/content/bindings/tabbox.xml#tab-base">
<implementation implements="nsIAccessibleProvider"> <implementation implements="nsIAccessibleProvider">
<property name="accessible"> <property name="accessible">
<getter> <getter>
@ -433,7 +433,7 @@
</binding> </binding>
<binding id="tab" display="xul:button" <binding id="tab" display="xul:button"
extends="chrome://global/content/widgets/tabbox.xml#tab-base"> extends="chrome://global/content/bindings/tabbox.xml#tab-base">
<content> <content>
<xul:image class="tab-icon" xbl:inherits="validate,src=image"/> <xul:image class="tab-icon" xbl:inherits="validate,src=image"/>
<xul:label class="tab-text" xbl:inherits="value=label,accesskey,crop,disabled" flex="1"/> <xul:label class="tab-text" xbl:inherits="value=label,accesskey,crop,disabled" flex="1"/>

6
toolkit/content/widgets/text.xml
View File

@ -26,7 +26,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="text-label" extends="chrome://global/content/widgets/text.xml#text-base"> <binding id="text-label" extends="chrome://global/content/bindings/text.xml#text-base">
<implementation implements="nsIDOMXULLabelElement"> <implementation implements="nsIDOMXULLabelElement">
<property name="accessKey" onget="return this.getAttribute('accesskey');" <property name="accessKey" onget="return this.getAttribute('accesskey');"
onset="this.setAttribute('accesskey', val); return val;"/> onset="this.setAttribute('accesskey', val); return val;"/>
@ -35,7 +35,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="label-control" extends="chrome://global/content/widgets/text.xml#text-label"> <binding id="label-control" extends="chrome://global/content/bindings/text.xml#text-label">
<handlers> <handlers>
<handler event="click" action="if (this.disabled) return; <handler event="click" action="if (this.disabled) return;
var controlElementID = this.getAttribute('control'); var controlElementID = this.getAttribute('control');
@ -48,7 +48,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="text-link" extends="chrome://global/content/widgets/text.xml#text-label"> <binding id="text-link" extends="chrome://global/content/bindings/text.xml#text-label">
<handlers> <handlers>
<handler event="keypress" keycode="VK_ENTER" action="this.click()" /> <handler event="keypress" keycode="VK_ENTER" action="this.click()" />
<handler event="keypress" keycode="VK_RETURN" action="this.click()" /> <handler event="keypress" keycode="VK_RETURN" action="this.click()" />

4
toolkit/content/widgets/textbox.xml
View File

@ -109,7 +109,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="timed-textbox" extends="chrome://global/content/widgets/textbox.xml#textbox"> <binding id="timed-textbox" extends="chrome://global/content/bindings/textbox.xml#textbox">
<implementation> <implementation>
<field name="_timer">null</field> <field name="_timer">null</field>
<property name="timeout" <property name="timeout"
@ -156,7 +156,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="textarea" extends="chrome://global/content/widgets/textbox.xml#textbox"> <binding id="textarea" extends="chrome://global/content/bindings/textbox.xml#textbox">
<content> <content>
<xul:hbox class="textbox-input-box" flex="1" xbl:inherits="context"> <xul:hbox class="textbox-input-box" flex="1" xbl:inherits="context">
<html:textarea class="textbox-textarea" flex="1" anonid="input" <html:textarea class="textbox-textarea" flex="1" anonid="input"

12
toolkit/content/widgets/toolbar.xml
View File

@ -24,7 +24,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="toolbox" extends="chrome://global/content/widgets/toolbar.xml#toolbar-base"> <binding id="toolbox" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base">
<implementation> <implementation>
<field name="palette"> <field name="palette">
null null
@ -82,7 +82,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="toolbar" extends="chrome://global/content/widgets/toolbar.xml#toolbar-base"> <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base">
<implementation> <implementation>
<field name="firstPermanentChild"> <field name="firstPermanentChild">
null null
@ -267,7 +267,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="menubar" extends="chrome://global/content/widgets/toolbar.xml#toolbar-base" display="xul:menubar"> <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" display="xul:menubar">
<implementation implements="nsIAccessibleProvider"> <implementation implements="nsIAccessibleProvider">
<property name="accessible"> <property name="accessible">
<getter> <getter>
@ -317,9 +317,9 @@
</handlers> </handlers>
</binding> </binding>
<binding id="toolbardecoration" extends="chrome://global/content/widgets/toolbar.xml#toolbar-base"/> <binding id="toolbardecoration" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base"/>
<binding id="toolbarpaletteitem" extends="chrome://global/content/widgets/toolbar.xml#toolbar-base" display="xul:button"> <binding id="toolbarpaletteitem" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" display="xul:button">
<content> <content>
<xul:hbox class="toolbarpaletteitem-box" flex="1" xbl:inherits="type,place"> <xul:hbox class="toolbarpaletteitem-box" flex="1" xbl:inherits="type,place">
<children/> <children/>
@ -327,7 +327,7 @@
</content> </content>
</binding> </binding>
<binding id="toolbarpaletteitem-palette" extends="chrome://global/content/widgets/toolbar.xml#toolbarpaletteitem"> <binding id="toolbarpaletteitem-palette" extends="chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem">
<content> <content>
<xul:hbox class="toolbarpaletteitem-box" xbl:inherits="type,place"> <xul:hbox class="toolbarpaletteitem-box" xbl:inherits="type,place">
<children/> <children/>

8
toolkit/content/widgets/toolbarbutton.xml
View File

@ -6,7 +6,7 @@
xmlns:xbl="http://www.mozilla.org/xbl"> xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="toolbarbutton" display="xul:button" <binding id="toolbarbutton" display="xul:button"
extends="chrome://global/content/widgets/button.xml#button-base"> extends="chrome://global/content/bindings/button.xml#button-base">
<resources> <resources>
<stylesheet src="chrome://global/skin/toolbarbutton.css"/> <stylesheet src="chrome://global/skin/toolbarbutton.css"/>
</resources> </resources>
@ -20,7 +20,7 @@
</binding> </binding>
<binding id="menu" display="xul:menu" <binding id="menu" display="xul:menu"
extends="chrome://global/content/widgets/toolbarbutton.xml#toolbarbutton"> extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
<content> <content>
<children includes="observes|template|menupopup|tooltip"/> <children includes="observes|template|menupopup|tooltip"/>
<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle"/> <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle"/>
@ -31,7 +31,7 @@
</binding> </binding>
<binding id="menu-button" display="xul:menu" <binding id="menu-button" display="xul:menu"
extends="chrome://global/content/widgets/button.xml#menu-button-base"> extends="chrome://global/content/bindings/button.xml#menu-button-base">
<resources> <resources>
<stylesheet src="chrome://global/skin/toolbarbutton.css"/> <stylesheet src="chrome://global/skin/toolbarbutton.css"/>
</resources> </resources>
@ -49,7 +49,7 @@
<binding id="toolbarbutton-image" <binding id="toolbarbutton-image"
extends="chrome://global/content/widgets/toolbarbutton.xml#toolbarbutton"> extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
<content> <content>
<xul:image class="toolbarbutton-icon" xbl:inherits="src=image"/> <xul:image class="toolbarbutton-icon" xbl:inherits="src=image"/>
</content> </content>

16
toolkit/content/widgets/tree.xml
View File

@ -11,7 +11,7 @@
</resources> </resources>
</binding> </binding>
<binding id="tree" extends="chrome://global/content/widgets/tree.xml#tree-base"> <binding id="tree" extends="chrome://global/content/bindings/tree.xml#tree-base">
<content> <content>
<children includes="treecols"/> <children includes="treecols"/>
<xul:treerows class="tree-rows" flex="1"> <xul:treerows class="tree-rows" flex="1">
@ -641,7 +641,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="treecols" extends="chrome://global/content/widgets/tree.xml#tree-base"> <binding id="treecols" extends="chrome://global/content/bindings/tree.xml#tree-base">
<content> <content>
<children includes="treecol|splitter"/> <children includes="treecol|splitter"/>
<xul:treecolpicker class="treecol-image" fixed="true" ordinal="2147483647" xbl:inherits="tooltiptext=pickertooltiptext"/> <xul:treecolpicker class="treecol-image" fixed="true" ordinal="2147483647" xbl:inherits="tooltiptext=pickertooltiptext"/>
@ -658,7 +658,7 @@
</implementation> </implementation>
</binding> </binding>
<binding id="treerows" extends="chrome://global/content/widgets/tree.xml#tree-base"> <binding id="treerows" extends="chrome://global/content/bindings/tree.xml#tree-base">
<content> <content>
<xul:hbox flex="1" class="tree-bodybox"> <xul:hbox flex="1" class="tree-bodybox">
<children/> <children/>
@ -681,7 +681,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="treebody" extends="chrome://global/content/widgets/tree.xml#tree-base"> <binding id="treebody" extends="chrome://global/content/bindings/tree.xml#tree-base">
<implementation> <implementation>
<constructor> <constructor>
if ("_ensureColumnOrder" in this.parentNode) if ("_ensureColumnOrder" in this.parentNode)
@ -812,7 +812,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="treecol-base" extends="chrome://global/content/widgets/tree.xml#tree-base"> <binding id="treecol-base" extends="chrome://global/content/bindings/tree.xml#tree-base">
<implementation> <implementation>
<constructor> <constructor>
this.parentNode.parentNode._columnsDirty = true; this.parentNode.parentNode._columnsDirty = true;
@ -978,7 +978,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="treecol" extends="chrome://global/content/widgets/tree.xml#treecol-base"> <binding id="treecol" extends="chrome://global/content/bindings/tree.xml#treecol-base">
<content> <content>
<xul:label class="treecol-text" xbl:inherits="crop,value=label" flex="1" crop="right"/> <xul:label class="treecol-text" xbl:inherits="crop,value=label" flex="1" crop="right"/>
<xul:image class="treecol-sortdirection" xbl:inherits="sortDirection"/> <xul:image class="treecol-sortdirection" xbl:inherits="sortDirection"/>
@ -999,7 +999,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="treecol-image" extends="chrome://global/content/widgets/tree.xml#treecol-base"> <binding id="treecol-image" extends="chrome://global/content/bindings/tree.xml#treecol-base">
<content> <content>
<xul:image class="treecol-icon" xbl:inherits="src"/> <xul:image class="treecol-icon" xbl:inherits="src"/>
</content> </content>
@ -1009,7 +1009,7 @@
</binding> </binding>
<binding id="columnpicker" display="xul:button" <binding id="columnpicker" display="xul:button"
extends="chrome://global/content/widgets/tree.xml#tree-base"> extends="chrome://global/content/bindings/tree.xml#tree-base">
<content> <content>
<xul:image class="tree-columnpicker-icon"/> <xul:image class="tree-columnpicker-icon"/>
<xul:menupopup anonid="popup"/> <xul:menupopup anonid="popup"/>

12
toolkit/content/widgets/wizard.xml
View File

@ -11,7 +11,7 @@
</resources> </resources>
</binding> </binding>
<binding id="wizard" extends="chrome://global/content/widgets/wizard.xml#wizard-base"> <binding id="wizard" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
<content width="500" height="380" persist="x y width height"> <content width="500" height="380" persist="x y width height">
<xul:hbox class="wizard-header" anonid="Header"/> <xul:hbox class="wizard-header" anonid="Header"/>
@ -399,7 +399,7 @@
</handlers> </handlers>
</binding> </binding>
<binding id="wizardpage" extends="chrome://global/content/widgets/wizard.xml#wizard-base"> <binding id="wizardpage" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
<implementation> <implementation>
<field name="pageIndex">null</field> <field name="pageIndex">null</field>
@ -414,7 +414,7 @@
</binding> </binding>
#ifdef XP_MACOSX #ifdef XP_MACOSX
<binding id="wizard-header" extends="chrome://global/content/widgets/wizard.xml#wizard-base"> <binding id="wizard-header" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
<content> <content>
<xul:stack class="wizard-header-stack" flex="1"> <xul:stack class="wizard-header-stack" flex="1">
<xul:vbox class="wizard-header-box-1"> <xul:vbox class="wizard-header-box-1">
@ -432,7 +432,7 @@
</content> </content>
</binding> </binding>
<binding id="wizard-buttons" extends="chrome://global/content/widgets/wizard.xml#wizard-base"> <binding id="wizard-buttons" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
<content> <content>
<xul:vbox flex="1"> <xul:vbox flex="1">
<xul:hbox class="wizard-buttons-top" xbl:inherits="hidden=hidetoprow"> <xul:hbox class="wizard-buttons-top" xbl:inherits="hidden=hidetoprow">
@ -464,7 +464,7 @@
#else #else
<binding id="wizard-header" extends="chrome://global/content/widgets/wizard.xml#wizard-base"> <binding id="wizard-header" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
<content> <content>
<xul:hbox class="wizard-header-box-1" flex="1"> <xul:hbox class="wizard-header-box-1" flex="1">
<xul:vbox class="wizard-header-box-text" flex="1"> <xul:vbox class="wizard-header-box-text" flex="1">
@ -476,7 +476,7 @@
</content> </content>
</binding> </binding>
<binding id="wizard-buttons" extends="chrome://global/content/widgets/wizard.xml#wizard-base"> <binding id="wizard-buttons" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
<content> <content>
<xul:vbox class="wizard-buttons-box-1" flex="1"> <xul:vbox class="wizard-buttons-box-1" flex="1">
<xul:separator class="wizard-buttons-separator groove"/> <xul:separator class="wizard-buttons-separator groove"/>

222
toolkit/content/xul.css
View File

@ -102,33 +102,33 @@ bbox {
/********** button **********/ /********** button **********/
button { button {
-moz-binding: url("chrome://global/content/widgets/button.xml#button"); -moz-binding: url("chrome://global/content/bindings/button.xml#button");
} }
button[type="menu"] { button[type="menu"] {
-moz-binding: url("chrome://global/content/widgets/button.xml#menu"); -moz-binding: url("chrome://global/content/bindings/button.xml#menu");
} }
button[type="menu-button"] { button[type="menu-button"] {
-moz-binding: url("chrome://global/content/widgets/button.xml#menu-button"); -moz-binding: url("chrome://global/content/bindings/button.xml#menu-button");
} }
/********** toolbarbutton **********/ /********** toolbarbutton **********/
toolbarbutton { toolbarbutton {
-moz-binding: url("chrome://global/content/widgets/toolbarbutton.xml#toolbarbutton"); -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton");
} }
toolbarbutton[type="menu"] { toolbarbutton[type="menu"] {
-moz-binding: url("chrome://global/content/widgets/toolbarbutton.xml#menu"); -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu");
} }
toolbarbutton[type="menu-button"] { toolbarbutton[type="menu-button"] {
-moz-binding: url("chrome://global/content/widgets/toolbarbutton.xml#menu-button"); -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-button");
} }
dropmarker[type="menu-button"] { dropmarker[type="menu-button"] {
-moz-binding: url("chrome://global/content/widgets/toolbarbutton.xml#dropmarker"); -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#dropmarker");
} }
/******** browser, editor, iframe ********/ /******** browser, editor, iframe ********/
@ -140,53 +140,53 @@ iframe {
} }
browser { browser {
-moz-binding: url("chrome://global/content/widgets/browser.xml#browser"); -moz-binding: url("chrome://global/content/bindings/browser.xml#browser");
} }
tabbrowser { tabbrowser {
-moz-binding: url("chrome://global/content/widgets/tabbrowser.xml#tabbrowser"); -moz-binding: url("chrome://global/content/bindings/tabbrowser.xml#tabbrowser");
} }
editor { editor {
-moz-binding: url("chrome://global/content/widgets/editor.xml#editor"); -moz-binding: url("chrome://global/content/bindings/editor.xml#editor");
} }
iframe { iframe {
-moz-binding: url("chrome://global/content/widgets/general.xml#iframe"); -moz-binding: url("chrome://global/content/bindings/general.xml#iframe");
} }
/********** image **********/ /********** image **********/
image { image {
-moz-binding: url("chrome://global/content/widgets/general.xml#image"); -moz-binding: url("chrome://global/content/bindings/general.xml#image");
} }
/********** checkbox **********/ /********** checkbox **********/
checkbox { checkbox {
-moz-binding: url("chrome://global/content/widgets/checkbox.xml#checkbox"); -moz-binding: url("chrome://global/content/bindings/checkbox.xml#checkbox");
} }
/********** radio **********/ /********** radio **********/
radiogroup { radiogroup {
-moz-binding: url("chrome://global/content/widgets/radio.xml#radiogroup"); -moz-binding: url("chrome://global/content/bindings/radio.xml#radiogroup");
-moz-box-orient: vertical; -moz-box-orient: vertical;
} }
radio { radio {
-moz-binding: url("chrome://global/content/widgets/radio.xml#radio"); -moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
} }
/******** groupbox *********/ /******** groupbox *********/
groupbox { groupbox {
-moz-binding: url("chrome://global/content/widgets/groupbox.xml#groupbox"); -moz-binding: url("chrome://global/content/bindings/groupbox.xml#groupbox");
display: -moz-groupbox; display: -moz-groupbox;
} }
caption { caption {
-moz-binding: url("chrome://global/content/widgets/groupbox.xml#caption"); -moz-binding: url("chrome://global/content/bindings/groupbox.xml#caption");
} }
.groupbox-body { .groupbox-body {
@ -198,12 +198,12 @@ caption {
/******* toolbar *******/ /******* toolbar *******/
toolbox { toolbox {
-moz-binding: url("chrome://global/content/widgets/toolbar.xml#toolbox"); -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbox");
-moz-box-orient: vertical; -moz-box-orient: vertical;
} }
toolbar { toolbar {
-moz-binding: url("chrome://global/content/widgets/toolbar.xml#toolbar"); -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
} }
#ifdef XP_MACOSX #ifdef XP_MACOSX
@ -214,76 +214,76 @@ toolbar[type="menubar"] {
#endif #endif
toolbarseparator { toolbarseparator {
-moz-binding: url("chrome://global/content/widgets/toolbar.xml#toolbardecoration"); -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
} }
toolbarspacer { toolbarspacer {
-moz-binding: url("chrome://global/content/widgets/toolbar.xml#toolbardecoration"); -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
display: inline; display: inline;
} }
toolbarspring { toolbarspring {
-moz-binding: url("chrome://global/content/widgets/toolbar.xml#toolbardecoration"); -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
-moz-box-flex: 1000; -moz-box-flex: 1000;
display: inline; display: inline;
} }
toolbarpaletteitem { toolbarpaletteitem {
-moz-binding: url("chrome://global/content/widgets/toolbar.xml#toolbarpaletteitem"); -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem");
} }
toolbarpaletteitem[place="palette"] { toolbarpaletteitem[place="palette"] {
-moz-box-orient: vertical; -moz-box-orient: vertical;
-moz-binding: url("chrome://global/content/widgets/toolbar.xml#toolbarpaletteitem-palette"); -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem-palette");
} }
/********* menubar ***********/ /********* menubar ***********/
menubar { menubar {
-moz-binding: url("chrome://global/content/widgets/toolbar.xml#menubar"); -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
} }
/********* menu ***********/ /********* menu ***********/
menubar > menu { menubar > menu {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menu-menubar"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-menubar");
} }
menubar > menu.menu-iconic { menubar > menu.menu-iconic {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menu-menubar-iconic"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-menubar-iconic");
} }
menu { menu {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menu"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menu");
} }
menu.menu-iconic { menu.menu-iconic {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menu-iconic"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
} }
/********* menuitem ***********/ /********* menuitem ***********/
menuitem { menuitem {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menuitem"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem");
} }
menuitem.menuitem-iconic { menuitem.menuitem-iconic {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menuitem-iconic"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
} }
menuitem[type="checkbox"], menuitem[type="checkbox"],
menuitem[type="radio"] { menuitem[type="radio"] {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menuitem-iconic"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
} }
menuitem.menuitem-non-iconic { menuitem.menuitem-non-iconic {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menubutton-item"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menubutton-item");
} }
/********* menuseparator ***********/ /********* menuseparator ***********/
menuseparator { menuseparator {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menuseparator"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menuseparator");
} }
/********* popup & menupopup ***********/ /********* popup & menupopup ***********/
@ -292,7 +292,7 @@ menuseparator {
popup, popup,
menupopup { menupopup {
-moz-binding: url("chrome://global/content/widgets/popup.xml#popup"); -moz-binding: url("chrome://global/content/bindings/popup.xml#popup");
-moz-box-orient: vertical; -moz-box-orient: vertical;
display: none; display: none;
} }
@ -310,7 +310,7 @@ tooltip[menugenerated="true"] {
} }
tooltip { tooltip {
-moz-binding: url("chrome://global/content/widgets/popup.xml#tooltip"); -moz-binding: url("chrome://global/content/bindings/popup.xml#tooltip");
display: -moz-popup; display: -moz-popup;
margin-top: 21px; margin-top: 21px;
} }
@ -329,34 +329,34 @@ window[sizemode="maximized"] statusbarpanel.statusbar-resizerpanel {
/* /*
titlebar { titlebar {
-moz-binding: url("chrome://global/content/widgets/popup.xml#titlebar"); -moz-binding: url("chrome://global/content/bindings/popup.xml#titlebar");
} }
resizer[resizerdirection="right"] { resizer[resizerdirection="right"] {
-moz-binding: url("chrome://global/content/widgets/popup.xml#ew-resizer"); -moz-binding: url("chrome://global/content/bindings/popup.xml#ew-resizer");
} }
resizer[resizerdirection="bottom"] { resizer[resizerdirection="bottom"] {
-moz-binding: url("chrome://global/content/widgets/popup.xml#ns-resizer"); -moz-binding: url("chrome://global/content/bindings/popup.xml#ns-resizer");
} }
resizer[resizerdirection="bottomright"] { resizer[resizerdirection="bottomright"] {
-moz-binding: url("chrome://global/content/widgets/popup.xml#diag-resizer"); -moz-binding: url("chrome://global/content/bindings/popup.xml#diag-resizer");
} }
floatingwindow { floatingwindow {
-moz-binding: url("chrome://global/content/widgets/popup.xml#floater-normal"); -moz-binding: url("chrome://global/content/bindings/popup.xml#floater-normal");
-moz-box-orient: vertical; -moz-box-orient: vertical;
display: none; display: none;
z-index: 2147483647; z-index: 2147483647;
} }
floatingwindow[docked="left"] { floatingwindow[docked="left"] {
-moz-binding: url("chrome://global/content/widgets/popup.xml#floater-dock-left"); -moz-binding: url("chrome://global/content/bindings/popup.xml#floater-dock-left");
} }
button.popupClose { button.popupClose {
-moz-binding: url("chrome://global/content/widgets/popup.xml#close-button") !important; -moz-binding: url("chrome://global/content/bindings/popup.xml#close-button") !important;
} }
*/ */
/******** grid **********/ /******** grid **********/
@ -386,56 +386,56 @@ column {
/******** listbox **********/ /******** listbox **********/
listbox { listbox {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listbox"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listbox");
} }
listcols, listcol { listcols, listcol {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listbox-base"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listbox-base");
} }
listhead { listhead {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listhead"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listhead");
} }
listrows { listrows {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listrows"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listrows");
} }
listitem { listitem {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listitem"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listitem");
} }
listitem[type="checkbox"] { listitem[type="checkbox"] {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listitem-checkbox"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listitem-checkbox");
} }
listheader { listheader {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listheader"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listheader");
-moz-box-ordinal-group: 2147483646; -moz-box-ordinal-group: 2147483646;
} }
listcell { listcell {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listcell"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listcell");
} }
listcell[type="checkbox"] { listcell[type="checkbox"] {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listcell-checkbox"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listcell-checkbox");
} }
.listitem-iconic { .listitem-iconic {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listitem-iconic"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listitem-iconic");
} }
listitem[type="checkbox"].listitem-iconic { listitem[type="checkbox"].listitem-iconic {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listitem-checkbox-iconic"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listitem-checkbox-iconic");
} }
.listcell-iconic { .listcell-iconic {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listcell-iconic"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listcell-iconic");
} }
listcell[type="checkbox"].listcell-iconic { listcell[type="checkbox"].listcell-iconic {
-moz-binding: url("chrome://global/content/widgets/listbox.xml#listcell-checkbox-iconic"); -moz-binding: url("chrome://global/content/bindings/listbox.xml#listcell-checkbox-iconic");
} }
listbox { listbox {
@ -495,36 +495,36 @@ listcell {
/******** tree ******/ /******** tree ******/
tree { tree {
-moz-binding: url("chrome://global/content/widgets/tree.xml#tree"); -moz-binding: url("chrome://global/content/bindings/tree.xml#tree");
} }
treecols { treecols {
-moz-binding: url("chrome://global/content/widgets/tree.xml#treecols"); -moz-binding: url("chrome://global/content/bindings/tree.xml#treecols");
} }
treecol { treecol {
-moz-binding: url("chrome://global/content/widgets/tree.xml#treecol"); -moz-binding: url("chrome://global/content/bindings/tree.xml#treecol");
-moz-box-ordinal-group: 2147483646; -moz-box-ordinal-group: 2147483646;
} }
treecol.treecol-image { treecol.treecol-image {
-moz-binding: url("chrome://global/content/widgets/tree.xml#treecol-image"); -moz-binding: url("chrome://global/content/bindings/tree.xml#treecol-image");
} }
tree > treechildren { tree > treechildren {
display: -moz-box; display: -moz-box;
-moz-binding: url("chrome://global/content/widgets/tree.xml#treebody"); -moz-binding: url("chrome://global/content/bindings/tree.xml#treebody");
-moz-user-focus: none; -moz-user-focus: none;
-moz-user-select: none; -moz-user-select: none;
-moz-box-flex: 1; -moz-box-flex: 1;
} }
treerows { treerows {
-moz-binding: url("chrome://global/content/widgets/tree.xml#treerows"); -moz-binding: url("chrome://global/content/bindings/tree.xml#treerows");
} }
treecolpicker { treecolpicker {
-moz-binding: url("chrome://global/content/widgets/tree.xml#columnpicker"); -moz-binding: url("chrome://global/content/bindings/tree.xml#columnpicker");
} }
tree { tree {
@ -553,7 +553,7 @@ treecol[hidden="true"] {
deck { deck {
display: -moz-deck; display: -moz-deck;
-moz-binding: url("chrome://global/content/widgets/general.xml#deck"); -moz-binding: url("chrome://global/content/bindings/general.xml#deck");
} }
stack, bulletinboard { stack, bulletinboard {
@ -563,34 +563,34 @@ stack, bulletinboard {
/********** tabbox *********/ /********** tabbox *********/
tabbox { tabbox {
-moz-binding: url("chrome://global/content/widgets/tabbox.xml#tabbox"); -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tabbox");
-moz-box-orient: vertical; -moz-box-orient: vertical;
} }
tabs { tabs {
-moz-binding: url("chrome://global/content/widgets/tabbox.xml#tabs"); -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tabs");
-moz-box-orient: horizontal; -moz-box-orient: horizontal;
} }
tabs[closebutton="true"] { tabs[closebutton="true"] {
-moz-binding: url("chrome://global/content/widgets/tabbox.xml#tabs-closebutton"); -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tabs-closebutton");
} }
tab { tab {
-moz-binding: url("chrome://global/content/widgets/tabbox.xml#tab"); -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tab");
-moz-box-align: center; -moz-box-align: center;
-moz-box-pack: center; -moz-box-pack: center;
} }
tabpanels { tabpanels {
-moz-binding: url("chrome://global/content/widgets/tabbox.xml#tabpanels"); -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tabpanels");
display: -moz-deck; display: -moz-deck;
} }
/********** progressmeter **********/ /********** progressmeter **********/
progressmeter { progressmeter {
-moz-binding: url("chrome://global/content/widgets/progressmeter.xml#progressmeter"); -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter");
} }
/********** basic rule for anonymous content that needs to pass box properties through /********** basic rule for anonymous content that needs to pass box properties through
@ -610,31 +610,31 @@ spacer {
} }
description { description {
-moz-binding: url("chrome://global/content/widgets/text.xml#text-base"); -moz-binding: url("chrome://global/content/bindings/text.xml#text-base");
} }
label { label {
-moz-binding: url("chrome://global/content/widgets/text.xml#text-label"); -moz-binding: url("chrome://global/content/bindings/text.xml#text-label");
} }
label.text-link { label.text-link {
-moz-binding: url("chrome://global/content/widgets/text.xml#text-link"); -moz-binding: url("chrome://global/content/bindings/text.xml#text-link");
-moz-user-focus: normal; -moz-user-focus: normal;
} }
label[control] { label[control] {
-moz-binding: url("chrome://global/content/widgets/text.xml#label-control"); -moz-binding: url("chrome://global/content/bindings/text.xml#label-control");
} }
/********** textbox **********/ /********** textbox **********/
textbox { textbox {
-moz-binding: url("chrome://global/content/widgets/textbox.xml#textbox"); -moz-binding: url("chrome://global/content/bindings/textbox.xml#textbox");
-moz-user-select: text; -moz-user-select: text;
} }
textbox[multiline="true"] { textbox[multiline="true"] {
-moz-binding: url("chrome://global/content/widgets/textbox.xml#textarea"); -moz-binding: url("chrome://global/content/bindings/textbox.xml#textarea");
} }
html|*.textbox-input { html|*.textbox-input {
@ -647,11 +647,11 @@ html|*.textbox-textarea {
} }
.textbox-input-box { .textbox-input-box {
-moz-binding: url("chrome://global/content/widgets/textbox.xml#input-box"); -moz-binding: url("chrome://global/content/bindings/textbox.xml#input-box");
} }
textbox[type="timed"] { textbox[type="timed"] {
-moz-binding: url("chrome://global/content/widgets/textbox.xml#timed-textbox"); -moz-binding: url("chrome://global/content/bindings/textbox.xml#timed-textbox");
} }
/********** autocomplete textbox **********/ /********** autocomplete textbox **********/
@ -690,24 +690,24 @@ textbox[type="autocomplete"] {
#else #else
textbox[type="autocomplete"] { textbox[type="autocomplete"] {
-moz-binding: url("chrome://global/content/widgets/autocomplete.xml#autocomplete"); -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete");
} }
popup[type="autocomplete"] { popup[type="autocomplete"] {
-moz-binding: url("chrome://global/content/widgets/autocomplete.xml#autocomplete-result-popup"); -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete-result-popup");
display: -moz-popup !important; display: -moz-popup !important;
} }
.autocomplete-tree { .autocomplete-tree {
-moz-binding: url("chrome://global/content/widgets/autocomplete.xml#autocomplete-tree"); -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete-tree");
} }
.autocomplete-treebody { .autocomplete-treebody {
-moz-binding: url("chrome://global/content/widgets/autocomplete.xml#autocomplete-treebody"); -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete-treebody");
} }
.autocomplete-treerows { .autocomplete-treerows {
-moz-binding: url("chrome://global/content/widgets/autocomplete.xml#autocomplete-treerows"); -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#autocomplete-treerows");
} }
.autocomplete-history-dropmarker { .autocomplete-history-dropmarker {
@ -716,7 +716,7 @@ popup[type="autocomplete"] {
.autocomplete-history-dropmarker[enablehistory="true"] { .autocomplete-history-dropmarker[enablehistory="true"] {
display: -moz-box; display: -moz-box;
-moz-binding: url("chrome://global/content/widgets/autocomplete.xml#history-dropmarker"); -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#history-dropmarker");
} }
#endif #endif
@ -742,25 +742,25 @@ popup[type="autocomplete"][hidden="true"] {
/********** colorpicker **********/ /********** colorpicker **********/
colorpicker { colorpicker {
-moz-binding: url("chrome://global/content/widgets/colorpicker.xml#colorpicker"); -moz-binding: url("chrome://global/content/bindings/colorpicker.xml#colorpicker");
} }
colorpicker[type="button"] { colorpicker[type="button"] {
-moz-binding: url("chrome://global/content/widgets/colorpicker.xml#colorpicker-button"); -moz-binding: url("chrome://global/content/bindings/colorpicker.xml#colorpicker-button");
} }
.colorpickertile { .colorpickertile {
-moz-binding: url("chrome://global/content/widgets/colorpicker.xml#colorpickertile"); -moz-binding: url("chrome://global/content/bindings/colorpicker.xml#colorpickertile");
} }
/********** menulist **********/ /********** menulist **********/
menulist { menulist {
-moz-binding: url("chrome://global/content/widgets/menulist.xml#menulist"); -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist");
} }
menulist[editable] { menulist[editable] {
-moz-binding: url("chrome://global/content/widgets/menulist.xml#menulist-editable"); -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-editable");
} }
html|*.menulist-editable-input { html|*.menulist-editable-input {
@ -768,21 +768,21 @@ html|*.menulist-editable-input {
} }
menulist > menupopup > menuitem { menulist > menupopup > menuitem {
-moz-binding: url("chrome://global/content/widgets/menu.xml#menuitem-iconic-noaccel"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel");
} }
dropmarker[type="menu"] { dropmarker[type="menu"] {
-moz-binding: url("chrome://global/content/widgets/general.xml#dropmarker"); -moz-binding: url("chrome://global/content/bindings/general.xml#dropmarker");
} }
/********** splitter **********/ /********** splitter **********/
splitter { splitter {
-moz-binding: url("chrome://global/content/widgets/splitter.xml#splitter"); -moz-binding: url("chrome://global/content/bindings/splitter.xml#splitter");
} }
grippy { grippy {
-moz-binding: url("chrome://global/content/widgets/splitter.xml#grippy"); -moz-binding: url("chrome://global/content/bindings/splitter.xml#grippy");
} }
.tree-splitter { .tree-splitter {
@ -800,7 +800,7 @@ scrollbar {
thumb thumb
{ {
-moz-binding: url(chrome://global/content/widgets/scrollbar.xml#thumb); -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#thumb);
} }
scrollbar, scrollbarbutton, slider, thumb { scrollbar, scrollbarbutton, slider, thumb {
@ -814,66 +814,66 @@ scrollbar[value="hidden"] {
/******** scrollbox ********/ /******** scrollbox ********/
scrollbox { scrollbox {
-moz-binding: url("chrome://global/content/widgets/scrollbox.xml#scrollbox"); -moz-binding: url("chrome://global/content/bindings/scrollbox.xml#scrollbox");
} }
arrowscrollbox { arrowscrollbox {
-moz-binding: url("chrome://global/content/widgets/scrollbox.xml#arrowscrollbox"); -moz-binding: url("chrome://global/content/bindings/scrollbox.xml#arrowscrollbox");
} }
autorepeatbutton { autorepeatbutton {
-moz-binding: url("chrome://global/content/widgets/scrollbox.xml#autorepeatbutton"); -moz-binding: url("chrome://global/content/bindings/scrollbox.xml#autorepeatbutton");
} }
/********** statusbar **********/ /********** statusbar **********/
statusbar statusbar
{ {
-moz-binding: url("chrome://global/content/widgets/general.xml#statusbar"); -moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
#ifdef XP_MACOSX #ifdef XP_MACOSX
padding-right: 14px; padding-right: 14px;
#endif #endif
} }
statusbarpanel { statusbarpanel {
-moz-binding: url("chrome://global/content/widgets/general.xml#statusbarpanel"); -moz-binding: url("chrome://global/content/bindings/general.xml#statusbarpanel");
} }
.statusbarpanel-iconic { .statusbarpanel-iconic {
-moz-binding: url("chrome://global/content/widgets/general.xml#statusbarpanel-iconic"); -moz-binding: url("chrome://global/content/bindings/general.xml#statusbarpanel-iconic");
} }
.statusbarpanel-menu-iconic { .statusbarpanel-menu-iconic {
-moz-binding: url("chrome://global/content/widgets/general.xml#statusbarpanel-menu-iconic"); -moz-binding: url("chrome://global/content/bindings/general.xml#statusbarpanel-menu-iconic");
} }
/********** spinbuttons ***********/ /********** spinbuttons ***********/
spinbuttons { spinbuttons {
-moz-binding: url("chrome://global/content/widgets/spinbuttons.xml#spinbuttons"); -moz-binding: url("chrome://global/content/bindings/spinbuttons.xml#spinbuttons");
} }
/********** stringbundle **********/ /********** stringbundle **********/
stringbundleset { stringbundleset {
-moz-binding: url("chrome://global/content/widgets/stringbundle.xml#stringbundleset"); -moz-binding: url("chrome://global/content/bindings/stringbundle.xml#stringbundleset");
visibility: collapse; visibility: collapse;
} }
stringbundle { stringbundle {
-moz-binding: url("chrome://global/content/widgets/stringbundle.xml#stringbundle"); -moz-binding: url("chrome://global/content/bindings/stringbundle.xml#stringbundle");
visibility: collapse; visibility: collapse;
} }
/********** dialog **********/ /********** dialog **********/
dialog { dialog {
-moz-binding: url("chrome://global/content/widgets/dialog.xml#dialog"); -moz-binding: url("chrome://global/content/bindings/dialog.xml#dialog");
-moz-box-orient: vertical; -moz-box-orient: vertical;
} }
dialogheader { dialogheader {
-moz-binding: url("chrome://global/content/widgets/dialog.xml#dialogheader"); -moz-binding: url("chrome://global/content/bindings/dialog.xml#dialogheader");
} }
/********* page ************/ /********* page ************/
@ -885,27 +885,27 @@ page {
/********** wizard **********/ /********** wizard **********/
wizard { wizard {
-moz-binding: url("chrome://global/content/widgets/wizard.xml#wizard"); -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizard");
-moz-box-orient: vertical; -moz-box-orient: vertical;
} }
wizardpage { wizardpage {
-moz-binding: url("chrome://global/content/widgets/wizard.xml#wizardpage"); -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizardpage");
-moz-box-orient: vertical; -moz-box-orient: vertical;
overflow: auto; overflow: auto;
} }
.wizard-header { .wizard-header {
-moz-binding: url("chrome://global/content/widgets/wizard.xml#wizard-header"); -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizard-header");
} }
.wizard-buttons { .wizard-buttons {
-moz-binding: url("chrome://global/content/widgets/wizard.xml#wizard-buttons"); -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizard-buttons");
} }
/********** expander ********/ /********** expander ********/
expander { expander {
-moz-binding: url("chrome://global/content/widgets/expander.xml#expander"); -moz-binding: url("chrome://global/content/bindings/expander.xml#expander");
-moz-box-orient: vertical; -moz-box-orient: vertical;
} }

12
toolkit/mozapps/compat/content/splitter.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0"?>
<bindings id="compatSplitterBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:xbl="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="splitter" extends="chrome://global/content/widgets/splitter.xml#splitter"/>
</bindings>

14
toolkit/mozapps/compat/content/tree.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0"?>
<bindings id="compatTreeBindings"
xmlns="http://www.mozilla.org/xbl"
xmlns:xbl="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="tree" extends="chrome://global/content/widgets/tree.xml#tree"/>
<binding id="treecell" extends="chrome://global/content/widgets/tree.xml#treecell"/>
</bindings>

2
toolkit/mozapps/jar.mn
View File

@ -7,8 +7,6 @@ toolkit.jar:
* content/mozapps/downloads/editAction.xul (downloads/content/editAction.xul) * content/mozapps/downloads/editAction.xul (downloads/content/editAction.xul)
* content/mozapps/downloads/editAction.js (downloads/content/editAction.js) * content/mozapps/downloads/editAction.js (downloads/content/editAction.js)
content/mozapps/contents.rdf (contents-content.rdf) content/mozapps/contents.rdf (contents-content.rdf)
content/global/bindings/splitter.xml (compat/content/splitter.xml)
content/global/bindings/tree.xml (compat/content/tree.xml)
en-US.jar: en-US.jar:
* locale/en-US/mozapps/downloads/unknownContentType.properties (downloads/locale/unknownContentType.properties) * locale/en-US/mozapps/downloads/unknownContentType.properties (downloads/locale/unknownContentType.properties)

4
toolkit/skin/mac/global.css
View File

@ -51,11 +51,11 @@ button[dlgtype="help"] > .button-box > .button-text {
menulist > menupopup, menulist > menupopup,
.menulist-menupopup { .menulist-menupopup {
-moz-binding: url("chrome://global/content/widgets/popup.xml#popup-scrollbars"); -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
} }
.menulist-compact { .menulist-compact {
-moz-binding: url("chrome://global/content/widgets/menulist.xml#menulist-compact"); -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
} }
.tabbrowser-tabs { .tabbrowser-tabs {

35
toolkit/skin/mac/globalBindings.xml
View File

@ -1,34 +1 @@
<?xml version="1.0"?> <bindings id="globalBindings" xmlns="http://www.mozilla.org/xbl" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl"> <binding id="tab" extends="chrome://global/content/widgets/tabbox.xml#tab"> <content> <xul:hbox class="tab-image-left" xbl:inherits="selected"/> <xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected"> <xul:stack class="tab-icon"> <?xml version="1.0"?> <bindings id="globalBindings" xmlns="http://www.mozilla.org/xbl" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl"> <binding id="tab" extends="chrome://global/content/bindings/tabbox.xml#tab"> <content> <xul:hbox class="tab-image-left" xbl:inherits="selected"/> <xul:hbox flex="1" class="tab-image-middle" align="center" xbl:inherits="selected"> <xul:stack class="tab-icon"> <xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/> <xul:image class="tab-extra-status"/> </xul:stack> <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/> </xul:hbox> <xul:hbox class="tab-image-right" xbl:inherits="selected"/> </content> </binding> <binding id="tabs" extends="chrome://global/content/bindings/tabbox.xml#tabs"> <content> <xul:spacer class="tab-border-top-left-cap"/> <xul:spacer class="tab-border-top-left"/> <children/> <xul:stack flex="1"> <xul:spacer class="tab-border-top-right"/> <xul:hbox class="tabs-misc-dec" align="center"> <xul:spacer flex="1"/> </xul:hbox> </xul:stack> <xul:spacer class="tab-border-top-right-cap"/> </content> </binding> <binding id="tabs-closebutton" extends="chrome://global/content/bindings/tabbox.xml#tabs"> <content> <xul:stack flex="1" class="tabs-stack"> <xul:vbox> <xul:spacer flex="1"/> <xul:hbox class="tabs-bottom" align="center"/> </xul:vbox> <xul:vbox> <xul:hbox> <xul:stack> <xul:spacer class="tabs-left"/> </xul:stack> <xul:hbox flex="1" style="min-width: 1px;"> <children/> <xul:spacer class="tabs-right" flex="1"/> </xul:hbox> <xul:stack> <xul:spacer class="tabs-right"/> <xul:hbox class="tabs-closebutton-box" align="center" pack="end"> <xul:toolbarbutton class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/> </xul:hbox> </xul:stack> </xul:hbox> <xul:spacer class="tabs-bottom-spacer"/> </xul:vbox> </xul:stack> </content> </binding> </bindings>
<xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
<xul:image class="tab-extra-status"/>
</xul:stack> <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/> </xul:hbox> <xul:hbox class="tab-image-right" xbl:inherits="selected"/> </content> </binding>
<binding id="tabs" extends="chrome://global/content/widgets/tabbox.xml#tabs"> <content> <xul:spacer class="tab-border-top-left-cap"/> <xul:spacer class="tab-border-top-left"/> <children/> <xul:stack flex="1"> <xul:spacer class="tab-border-top-right"/> <xul:hbox class="tabs-misc-dec" align="center"> <xul:spacer flex="1"/> </xul:hbox> </xul:stack> <xul:spacer class="tab-border-top-right-cap"/> </content> </binding> <binding id="tabs-closebutton"
extends="chrome://global/content/widgets/tabbox.xml#tabs">
<content>
<xul:stack flex="1" class="tabs-stack">
<xul:vbox>
<xul:spacer flex="1"/>
<xul:hbox class="tabs-bottom" align="center"/>
</xul:vbox>
<xul:vbox>
<xul:hbox>
<xul:stack>
<xul:spacer class="tabs-left"/>
</xul:stack>
<xul:hbox flex="1" style="min-width: 1px;">
<children/>
<xul:spacer class="tabs-right" flex="1"/>
</xul:hbox>
<xul:stack>
<xul:spacer class="tabs-right"/>
<xul:hbox class="tabs-closebutton-box" align="center" pack="end">
<xul:toolbarbutton class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
</xul:hbox>
</xul:stack>
</xul:hbox>
<xul:spacer class="tabs-bottom-spacer"/>
</xul:vbox>
</xul:stack>
</content>
</binding>
</bindings>

2
toolkit/skin/mac/obsolete/scrollbars.css
View File

@ -32,7 +32,7 @@
scrollbar { scrollbar {
-moz-appearance: scrollbar; -moz-appearance: scrollbar;
-moz-binding: url(chrome://global/content/widgets/nativescrollbar.xml#scrollbar); -moz-binding: url(chrome://global/content/bindings/nativescrollbar.xml#scrollbar);
min-width: 16px; min-width: 16px;
cursor: default; cursor: default;
background-color: white; background-color: white;

2
toolkit/skin/mac/scrollbars.css
View File

@ -32,7 +32,7 @@
scrollbar { scrollbar {
-moz-appearance: scrollbar; -moz-appearance: scrollbar;
-moz-binding: url(chrome://global/content/widgets/nativescrollbar.xml#scrollbar); -moz-binding: url(chrome://global/content/bindings/nativescrollbar.xml#scrollbar);
min-width: 16px; min-width: 16px;
cursor: default; cursor: default;
background-color: white; background-color: white;

4
toolkit/skin/win/global.css
View File

@ -40,11 +40,11 @@ radio {
menulist > menupopup, menulist > menupopup,
.menulist-menupopup { .menulist-menupopup {
-moz-binding: url("chrome://global/content/widgets/popup.xml#popup-scrollbars"); -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
} }
.menulist-compact { .menulist-compact {
-moz-binding: url("chrome://global/content/widgets/menulist.xml#menulist-compact"); -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
} }
/* ::::: root elements ::::: */ /* ::::: root elements ::::: */

4
toolkit/skin/win/globalBindings.xml
View File

@ -6,7 +6,7 @@
xmlns:xbl="http://www.mozilla.org/xbl"> xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="radio" <binding id="radio"
extends="chrome://global/content/widgets/radio.xml#radio"> extends="chrome://global/content/bindings/radio.xml#radio">
<content> <content>
<xul:hbox class="radio-check-box1" xbl:inherits="selected,checked,disabled"> <xul:hbox class="radio-check-box1" xbl:inherits="selected,checked,disabled">
<xul:hbox class="radio-check-box2" flex="1"> <xul:hbox class="radio-check-box2" flex="1">
@ -20,7 +20,7 @@
</content> </content>
</binding> </binding>
<binding id="toolbarpaletteitem-spacer" extends="chrome://global/content/widgets/toolbar.xml#toolbarpaletteitem"> <binding id="toolbarpaletteitem-spacer" extends="chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem">
<content> <content>
<xul:spacer class="spacer-left"/> <xul:spacer class="spacer-left"/>
<children/> <children/>

4
toolkit/skin/win/scrollbars.css
View File

@ -32,7 +32,7 @@
scrollbar { scrollbar {
-moz-appearance: scrollbartrack-horizontal; -moz-appearance: scrollbartrack-horizontal;
-moz-binding: url("chrome://global/content/widgets/scrollbar.xml#scrollbar"); -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
cursor: default; cursor: default;
background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar; background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar;
} }
@ -122,7 +122,7 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
html|div scrollbar { html|div scrollbar {
-moz-appearance: scrollbartrack-horizontal; -moz-appearance: scrollbartrack-horizontal;
-moz-binding: url("chrome://global/content/widgets/scrollbar.xml#scrollbar"); -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
cursor: default; cursor: default;
background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar; background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar;
} }