mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-30 12:27:29 +09:00
Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.
This also removes some PP abuse and takes file entries out of PP when no longer needed without XP_MACOSX conditionals.
This commit is contained in:
Moonchild
roytam1
parent
02c59100a8
commit
a4b0f333ba
153 changed files with 173 additions and 4556 deletions
|
|
@ -131,8 +131,6 @@ function display(profileData) {
|
|||
let button = document.createElement('button');
|
||||
#ifdef XP_WIN
|
||||
let string = 'winOpenDir2';
|
||||
#elifdef XP_MACOSX
|
||||
let string = 'macOpenDir';
|
||||
#else
|
||||
let string = 'openDir';
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -155,12 +155,8 @@
|
|||
<th class="column">
|
||||
#ifdef XP_WIN
|
||||
&aboutSupport.appBasicsProfileDirWinMac;
|
||||
#else
|
||||
#ifdef XP_MACOSX
|
||||
&aboutSupport.appBasicsProfileDirWinMac;
|
||||
#else
|
||||
&aboutSupport.appBasicsProfileDir;
|
||||
#endif
|
||||
#endif
|
||||
</th>
|
||||
|
||||
|
|
@ -168,12 +164,8 @@
|
|||
<button id="profile-dir-button">
|
||||
#ifdef XP_WIN
|
||||
&aboutSupport.showWin2.label;
|
||||
#else
|
||||
#ifdef XP_MACOSX
|
||||
&aboutSupport.showMac.label;
|
||||
#else
|
||||
&aboutSupport.showDir.label;
|
||||
#endif
|
||||
#endif
|
||||
</button>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -212,10 +212,6 @@ function wrapToolbarItems()
|
|||
{
|
||||
forEachCustomizableToolbar(function (toolbar) {
|
||||
Array.forEach(toolbar.childNodes, function (item) {
|
||||
#ifdef XP_MACOSX
|
||||
if (item.firstChild && item.firstChild.localName == "menubar")
|
||||
return;
|
||||
#endif
|
||||
if (isToolbarItem(item)) {
|
||||
let wrapper = wrapToolbarItem(item);
|
||||
cleanupItemForToolbar(item, wrapper);
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0"?>
|
||||
# -*- Mode: HTML -*-
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# WARNING!!! This file is obsoleted by the dialog.xml widget
|
||||
#
|
||||
<!-- -*- Mode: XML -*-
|
||||
This Source Code Form is subject to the terms of the Mozilla Public
|
||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
WARNING!!! This file is obsoleted by the dialog.xml widget
|
||||
-->
|
||||
|
||||
<!DOCTYPE overlay SYSTEM "chrome://global/locale/dialogOverlay.dtd">
|
||||
|
||||
|
|
@ -14,44 +14,6 @@
|
|||
|
||||
<script type="application/javascript" src="chrome://global/content/dialogOverlay.js"/>
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
#
|
||||
<hbox id="okCancelButtons">
|
||||
<spacer flex="1"/>
|
||||
<button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
|
||||
<button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
|
||||
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
|
||||
<button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
|
||||
</hbox>
|
||||
|
||||
<hbox id="okCancelHelpButtons">
|
||||
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
|
||||
<spacer flex="1"/>
|
||||
<button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
|
||||
<button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
|
||||
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
|
||||
<button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
|
||||
</hbox>
|
||||
|
||||
<hbox id="okCancelButtonsRight">
|
||||
<spacer flex="1"/>
|
||||
<button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
|
||||
<button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
|
||||
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
|
||||
<button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
|
||||
</hbox>
|
||||
|
||||
<hbox id="okCancelHelpButtonsRight">
|
||||
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
|
||||
<spacer flex="1"/>
|
||||
<button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
|
||||
<button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
|
||||
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
|
||||
<button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
|
||||
</hbox>
|
||||
#
|
||||
#else
|
||||
#
|
||||
<hbox id="okCancelButtons">
|
||||
<spacer flex="1"/>
|
||||
<button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
|
||||
|
|
@ -87,15 +49,10 @@
|
|||
<button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
|
||||
<button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
|
||||
</hbox>
|
||||
#endif
|
||||
|
||||
<keyset id="dialogKeys">
|
||||
<key keycode="VK_RETURN" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>
|
||||
<key keycode="VK_ESCAPE" oncommand="doCancelButton();"/>
|
||||
#ifdef XP_MACOSX
|
||||
<key key="." modifiers="meta" oncommand="doCancelButton();"/>
|
||||
#
|
||||
#endif
|
||||
</keyset>
|
||||
|
||||
</overlay>
|
||||
|
|
|
|||
|
|
@ -4,12 +4,6 @@
|
|||
|
||||
function closeWindow(aClose, aPromptFunction)
|
||||
{
|
||||
#ifdef XP_MACOSX
|
||||
// Closing the last window doesn't quit the application on OS X.
|
||||
if (typeof(aPromptFunction) == "function" && !aPromptFunction()) {
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
var windowCount = 0;
|
||||
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
|
||||
.getService(Components.interfaces.nsIWindowMediator);
|
||||
|
|
@ -29,7 +23,6 @@ function closeWindow(aClose, aPromptFunction)
|
|||
return false;
|
||||
if (windowCount != 1 && typeof(aPromptFunction) == "function" && !aPromptFunction())
|
||||
return false;
|
||||
#endif
|
||||
|
||||
if (aClose) {
|
||||
window.close();
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ toolkit.jar:
|
|||
#ifdef MOZ_OFFICIAL_BRANDING
|
||||
* content/global/aboutRights.xhtml
|
||||
#else
|
||||
* content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
|
||||
content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
|
||||
#endif
|
||||
content/global/aboutNetworking.js
|
||||
content/global/aboutNetworking.xhtml
|
||||
|
|
@ -41,7 +41,7 @@ toolkit.jar:
|
|||
* content/global/buildconfig.html
|
||||
* content/global/contentAreaUtils.js
|
||||
content/global/customizeToolbar.css
|
||||
* content/global/customizeToolbar.js
|
||||
content/global/customizeToolbar.js
|
||||
content/global/customizeToolbar.xul
|
||||
content/global/datepicker.xhtml
|
||||
content/global/editMenuOverlay.js
|
||||
|
|
@ -50,7 +50,7 @@ toolkit.jar:
|
|||
* content/global/finddialog.xul
|
||||
content/global/findUtils.js
|
||||
content/global/filepicker.properties
|
||||
* content/global/globalOverlay.js
|
||||
content/global/globalOverlay.js
|
||||
content/global/mozilla.xhtml
|
||||
#ifdef MOZ_PHOENIX
|
||||
content/global/logopage.xhtml
|
||||
|
|
@ -66,7 +66,7 @@ toolkit.jar:
|
|||
content/global/treeUtils.js
|
||||
content/global/viewZoomOverlay.js
|
||||
content/global/globalOverlay.xul
|
||||
* content/global/dialogOverlay.xul
|
||||
content/global/dialogOverlay.xul
|
||||
content/global/dialogOverlay.js
|
||||
content/global/inlineSpellCheckUI.js
|
||||
content/global/nsClipboard.js
|
||||
|
|
@ -88,7 +88,7 @@ toolkit.jar:
|
|||
content/global/bindings/editor.xml (widgets/editor.xml)
|
||||
content/global/bindings/expander.xml (widgets/expander.xml)
|
||||
content/global/bindings/filefield.xml (widgets/filefield.xml)
|
||||
* content/global/bindings/findbar.xml (widgets/findbar.xml)
|
||||
content/global/bindings/findbar.xml (widgets/findbar.xml)
|
||||
content/global/bindings/general.xml (widgets/general.xml)
|
||||
content/global/bindings/groupbox.xml (widgets/groupbox.xml)
|
||||
content/global/bindings/listbox.xml (widgets/listbox.xml)
|
||||
|
|
@ -117,13 +117,10 @@ toolkit.jar:
|
|||
content/global/bindings/timepicker.js (widgets/timepicker.js)
|
||||
content/global/bindings/toolbar.xml (widgets/toolbar.xml)
|
||||
content/global/bindings/toolbarbutton.xml (widgets/toolbarbutton.xml)
|
||||
* content/global/bindings/tree.xml (widgets/tree.xml)
|
||||
content/global/bindings/tree.xml (widgets/tree.xml)
|
||||
content/global/bindings/videocontrols.xml (widgets/videocontrols.xml)
|
||||
content/global/bindings/videocontrols.css (widgets/videocontrols.css)
|
||||
* content/global/bindings/wizard.xml (widgets/wizard.xml)
|
||||
#ifdef XP_MACOSX
|
||||
content/global/macWindowMenu.js
|
||||
#endif
|
||||
content/global/svg/svgBindings.xml (/layout/svg/resources/content/svgBindings.xml)
|
||||
content/global/gmp-sources/eme-adobe.json (gmp-sources/eme-adobe.json)
|
||||
content/global/gmp-sources/openh264.json (gmp-sources/openh264.json)
|
||||
|
|
|
|||
|
|
@ -5374,7 +5374,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
</pre>
|
||||
|
||||
|
||||
#if defined(XP_WIN) || defined(XP_MACOSX) || defined(XP_LINUX)
|
||||
#if defined(XP_WIN) || defined(XP_LINUX)
|
||||
|
||||
<hr>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
<script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
|
||||
<commandset id="baseMenuCommandSet">
|
||||
<command id="minimizeWindow"
|
||||
label="&minimizeWindow.label;"
|
||||
oncommand="window.minimize();" />
|
||||
<command id="zoomWindow"
|
||||
label="&zoomWindow.label;"
|
||||
oncommand="zoomWindow();" />
|
||||
</commandset>
|
||||
<keyset id="baseMenuKeyset">
|
||||
<key id="key_minimizeWindow"
|
||||
command="minimizeWindow"
|
||||
key="&minimizeWindow.key;"
|
||||
modifiers="accel"/>
|
||||
</keyset>
|
||||
<menu id="windowMenu"
|
||||
label="&windowMenu.label;"
|
||||
datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
|
||||
onpopupshowing="macWindowMenuDidShow();"
|
||||
hidden="false">
|
||||
<template>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem uri="rdf:*"
|
||||
label="rdf:http://home.netscape.com/NC-rdf#Name"
|
||||
type="radio"
|
||||
name="windowList"
|
||||
oncommand="ShowWindowFromResource(event.target)"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
<menupopup id="windowPopup">
|
||||
<menuitem command="minimizeWindow" key="key_minimizeWindow"/>
|
||||
<menuitem command="zoomWindow"/>
|
||||
<!-- decomment when "BringAllToFront" is implemented
|
||||
<menuseparator/>
|
||||
<menuitem label="&bringAllToFront.label;" disabled="true"/> -->
|
||||
<menuseparator id="sep-window-list"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
|
||||
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
function macWindowMenuDidShow()
|
||||
{
|
||||
var windowManagerDS =
|
||||
Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator']
|
||||
.getService(Components.interfaces.nsIWindowDataSource);
|
||||
var sep = document.getElementById("sep-window-list");
|
||||
// Using double parens to avoid warning
|
||||
while ((sep = sep.nextSibling)) {
|
||||
var url = sep.getAttribute('id');
|
||||
var win = windowManagerDS.getWindowForResource(url);
|
||||
if (win.document.documentElement.getAttribute("inwindowmenu") == "false")
|
||||
sep.hidden = true;
|
||||
else if (win == window)
|
||||
sep.setAttribute("checked", "true");
|
||||
}
|
||||
}
|
||||
|
||||
function toOpenWindow( aWindow )
|
||||
{
|
||||
// deminiaturize the window, if it's in the Dock
|
||||
if (aWindow.windowState == STATE_MINIMIZED)
|
||||
aWindow.restore();
|
||||
aWindow.document.commandDispatcher.focusedWindow.focus();
|
||||
}
|
||||
|
||||
function ShowWindowFromResource( node )
|
||||
{
|
||||
var windowManagerDS =
|
||||
Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator']
|
||||
.getService(Components.interfaces.nsIWindowDataSource);
|
||||
|
||||
var desiredWindow = null;
|
||||
var url = node.getAttribute('id');
|
||||
desiredWindow = windowManagerDS.getWindowForResource( url );
|
||||
if (desiredWindow)
|
||||
toOpenWindow(desiredWindow);
|
||||
}
|
||||
|
||||
function zoomWindow()
|
||||
{
|
||||
if (window.windowState == STATE_NORMAL)
|
||||
window.maximize();
|
||||
else
|
||||
window.restore();
|
||||
}
|
||||
|
|
@ -422,15 +422,11 @@
|
|||
if (!event.defaultPrevented)
|
||||
this.cancelDialog();
|
||||
</handler>
|
||||
#ifdef XP_MACOSX
|
||||
<handler event="keypress" key="." modifiers="meta" phase="capturing" action="this.cancelDialog();"/>
|
||||
#else
|
||||
<handler event="focus" phase="capturing">
|
||||
var btn = this.getButton(this.defaultButton);
|
||||
if (btn)
|
||||
btn.setAttribute("default", event.originalTarget == btn || !(event.originalTarget instanceof Components.interfaces.nsIDOMXULButtonElement));
|
||||
</handler>
|
||||
#endif
|
||||
</handlers>
|
||||
|
||||
</binding>
|
||||
|
|
|
|||
|
|
@ -1232,39 +1232,6 @@
|
|||
]]></body>
|
||||
</method>
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
<!--
|
||||
- Fetches the currently selected text and sets that as the text to search
|
||||
- next. This is a MacOS specific feature.
|
||||
-->
|
||||
<method name="onFindSelectionCommand">
|
||||
<body><![CDATA[
|
||||
let searchString = this.browser.finder.setSearchStringToSelection();
|
||||
if (searchString)
|
||||
this._findField.value = searchString;
|
||||
]]></body>
|
||||
</method>
|
||||
|
||||
<method name="_onFindFieldFocus">
|
||||
<body><![CDATA[
|
||||
let prefsvc = this._prefsvc;
|
||||
const kPref = "accessibility.typeaheadfind.prefillwithselection";
|
||||
if (this.prefillWithSelection && prefsvc.getBoolPref(kPref))
|
||||
return;
|
||||
|
||||
let clipboardSearchString = this._browser.finder.clipboardSearchString;
|
||||
if (clipboardSearchString && this._findField.value != clipboardSearchString &&
|
||||
!this._findField._willfullyDeleted) {
|
||||
this._findField.value = clipboardSearchString;
|
||||
this._findField._hadValue = true;
|
||||
// Changing the search string makes the previous status invalid, so
|
||||
// we better clear it here.
|
||||
this._updateStatusUI();
|
||||
}
|
||||
]]></body>
|
||||
</method>
|
||||
#endif
|
||||
|
||||
<!--
|
||||
- This handles all the result changes for both
|
||||
- type-ahead-find and highlighting.
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
<binding id="optionsDialog"
|
||||
extends="chrome://global/content/bindings/dialog.xml#dialog">
|
||||
<content>
|
||||
#ifndef XP_MACOSX
|
||||
<xul:hbox flex="1">
|
||||
<xul:categoryBox anonid="prefsCategories">
|
||||
<children/>
|
||||
|
|
@ -21,16 +20,6 @@
|
|||
<xul:iframe anonid="panelFrame" name="panelFrame" style="width: 0px;" flex="1"/>
|
||||
</xul:vbox>
|
||||
</xul:hbox>
|
||||
#else
|
||||
<xul:vbox flex="1">
|
||||
<xul:categoryBox anonid="prefsCategories">
|
||||
<children/>
|
||||
</xul:categoryBox>
|
||||
<xul:vbox flex="1">
|
||||
<xul:iframe anonid="panelFrame" name="panelFrame" style="width: 0px;" flex="1"/>
|
||||
</xul:vbox>
|
||||
</xul:vbox>
|
||||
#endif
|
||||
</content>
|
||||
|
||||
<implementation>
|
||||
|
|
|
|||
|
|
@ -1146,11 +1146,7 @@
|
|||
</handler>
|
||||
|
||||
<handler event="keypress"
|
||||
#ifdef XP_MACOSX
|
||||
key="&openHelpMac.commandkey;" modifiers="accel"
|
||||
#else
|
||||
keycode="&openHelp.commandkey;"
|
||||
#endif
|
||||
phase="capturing">
|
||||
<![CDATA[
|
||||
var helpButton = this.getButton("help");
|
||||
|
|
|
|||
|
|
@ -79,11 +79,11 @@
|
|||
<property name="treeBoxObject"
|
||||
onget="return this.boxObject;"
|
||||
readonly="true"/>
|
||||
# contentView is obsolete (see bug 202391)
|
||||
<!-- contentView is obsolete (see bug 202391) -->
|
||||
<property name="contentView"
|
||||
onget="return this.view; /*.QueryInterface(Components.interfaces.nsITreeContentView)*/"
|
||||
readonly="true"/>
|
||||
# builderView is obsolete (see bug 202393)
|
||||
<!-- builderView is obsolete (see bug 202393) -->
|
||||
<property name="builderView"
|
||||
onget="return this.view; /*.QueryInterface(Components.interfaces.nsIXULTreeBuilder)*/"
|
||||
readonly="true"/>
|
||||
|
|
@ -774,7 +774,6 @@
|
|||
event.preventDefault();
|
||||
}
|
||||
</handler>
|
||||
#ifndef XP_MACOSX
|
||||
<!-- Use F2 key to enter text editing. -->
|
||||
<handler event="keydown" keycode="VK_F2">
|
||||
<![CDATA[
|
||||
|
|
@ -786,7 +785,6 @@
|
|||
event.preventDefault();
|
||||
]]>
|
||||
</handler>
|
||||
#endif // XP_MACOSX
|
||||
|
||||
<handler event="keydown" keycode="VK_ESCAPE">
|
||||
<![CDATA[
|
||||
|
|
|
|||
|
|
@ -465,54 +465,6 @@
|
|||
</implementation>
|
||||
</binding>
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
<binding id="wizard-header" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
|
||||
<content>
|
||||
<xul:stack class="wizard-header-stack" flex="1">
|
||||
<xul:vbox class="wizard-header-box-1">
|
||||
<xul:vbox class="wizard-header-box-text">
|
||||
<xul:label class="wizard-header-label" xbl:inherits="xbl:text=label"/>
|
||||
</xul:vbox>
|
||||
</xul:vbox>
|
||||
<xul:hbox class="wizard-header-box-icon">
|
||||
<xul:spacer flex="1"/>
|
||||
<xul:image class="wizard-header-icon" xbl:inherits="src=iconsrc"/>
|
||||
</xul:hbox>
|
||||
</xul:stack>
|
||||
</content>
|
||||
</binding>
|
||||
|
||||
<binding id="wizard-buttons" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
|
||||
<content>
|
||||
<xul:vbox flex="1">
|
||||
<xul:hbox class="wizard-buttons-btm">
|
||||
<xul:button class="wizard-button" dlgtype="extra1" hidden="true"/>
|
||||
<xul:button class="wizard-button" dlgtype="extra2" hidden="true"/>
|
||||
<xul:button label="&button-cancel-mac.label;" class="wizard-button" dlgtype="cancel"/>
|
||||
<xul:spacer flex="1"/>
|
||||
<xul:button label="&button-back-mac.label;" accesskey="&button-back-mac.accesskey;"
|
||||
class="wizard-button wizard-nav-button" dlgtype="back"/>
|
||||
<xul:button label="&button-next-mac.label;" accesskey="&button-next-mac.accesskey;"
|
||||
class="wizard-button wizard-nav-button" dlgtype="next"
|
||||
default="true" xbl:inherits="hidden=lastpage" />
|
||||
<xul:button label="&button-finish-mac.label;" class="wizard-button"
|
||||
dlgtype="finish" default="true" xbl:inherits="hidden=hidefinishbutton" />
|
||||
</xul:hbox>
|
||||
</xul:vbox>
|
||||
</content>
|
||||
|
||||
<implementation>
|
||||
<method name="onPageChange">
|
||||
<body><![CDATA[
|
||||
this.setAttribute("hidefinishbutton", !(this.getAttribute("lastpage") == "true"));
|
||||
]]></body>
|
||||
</method>
|
||||
</implementation>
|
||||
|
||||
</binding>
|
||||
|
||||
#else
|
||||
|
||||
<binding id="wizard-header" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
|
||||
<content>
|
||||
<xul:hbox class="wizard-header-box-1" flex="1">
|
||||
|
|
@ -602,6 +554,5 @@
|
|||
</property>
|
||||
</implementation>
|
||||
</binding>
|
||||
#endif
|
||||
|
||||
</bindings>
|
||||
|
|
|
|||
|
|
@ -243,11 +243,6 @@ caption {
|
|||
|
||||
/******** draggable elements *********/
|
||||
|
||||
%ifdef XP_MACOSX
|
||||
titlebar,
|
||||
toolbar:not([nowindowdrag="true"]):not([customizing="true"]),
|
||||
statusbar:not([nowindowdrag="true"]),
|
||||
%endif
|
||||
windowdragbox {
|
||||
-moz-window-dragging: drag;
|
||||
}
|
||||
|
|
@ -288,12 +283,6 @@ toolbar[customizing="true"][hidden="true"] {
|
|||
display: -moz-box;
|
||||
}
|
||||
|
||||
%ifdef XP_MACOSX
|
||||
toolbar[type="menubar"] {
|
||||
min-height: 0 !important;
|
||||
border: 0 !important;
|
||||
}
|
||||
%else
|
||||
toolbar[type="menubar"][autohide="true"] {
|
||||
-moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-menubar-autohide");
|
||||
overflow: hidden;
|
||||
|
|
@ -305,7 +294,6 @@ toolbar[type="menubar"][autohide="true"][inactive="true"]:not([customizing="true
|
|||
-moz-appearance: none !important;
|
||||
border-style: none !important;
|
||||
}
|
||||
%endif
|
||||
|
||||
%ifdef MOZ_WIDGET_GTK
|
||||
window[shellshowingmenubar="true"] menubar,
|
||||
|
|
@ -499,15 +487,9 @@ panel[arrowposition="start_after"]:-moz-locale-dir(rtl) {
|
|||
|
||||
%endif
|
||||
|
||||
%ifdef XP_MACOSX
|
||||
.statusbar-resizerpanel {
|
||||
display: none;
|
||||
}
|
||||
%else
|
||||
window[sizemode="maximized"] statusbarpanel.statusbar-resizerpanel {
|
||||
visibility: collapse;
|
||||
}
|
||||
%endif
|
||||
|
||||
/******** grid **********/
|
||||
|
||||
|
|
@ -1018,9 +1000,6 @@ autorepeatbutton {
|
|||
|
||||
statusbar {
|
||||
-moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
|
||||
%ifdef XP_MACOSX
|
||||
padding-right: 14px;
|
||||
%endif
|
||||
}
|
||||
|
||||
statusbarpanel {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue