зеркало из https://github.com/mozilla/gecko-dev.git
Tweak XP_MACOSX ifdefs to fix keyboard shortcuts (partly), context menus, and hidden window behavior and build the mac classic skin in the Mach-O build. b=109165 r=pinkerton sr=beard
This commit is contained in:
Родитель
cd8dc8ee2c
Коммит
0c93d110f3
|
@ -715,7 +715,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
|
||||||
{
|
{
|
||||||
|
|
||||||
nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
|
nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
// (pinkerton, joki, saari) IE5 for mac uses Control for access keys. The HTML4 spec
|
// (pinkerton, joki, saari) IE5 for mac uses Control for access keys. The HTML4 spec
|
||||||
// suggests to use command on mac, but this really sucks (imagine someone having a "q"
|
// suggests to use command on mac, but this really sucks (imagine someone having a "q"
|
||||||
// as an access key and not letting you quit the app!). As a result, we've made a
|
// as an access key and not letting you quit the app!). As a result, we've made a
|
||||||
|
|
|
@ -58,7 +58,7 @@ class nsIDocShellTreeNode;
|
||||||
class nsIDocShellTreeItem;
|
class nsIDocShellTreeItem;
|
||||||
|
|
||||||
// mac uses click-hold context menus, a holdover from 4.x
|
// mac uses click-hold context menus, a holdover from 4.x
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
#define CLICK_HOLD_CONTEXT_MENUS 1
|
#define CLICK_HOLD_CONTEXT_MENUS 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -180,7 +180,7 @@ nsXBLPrototypeHandler::InitAccessKeys()
|
||||||
|
|
||||||
// Compiled-in defaults, in case we can't get the pref --
|
// Compiled-in defaults, in case we can't get the pref --
|
||||||
// mac doesn't have menu shortcuts, other platforms use alt.
|
// mac doesn't have menu shortcuts, other platforms use alt.
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
kMenuAccessKey = 0;
|
kMenuAccessKey = 0;
|
||||||
kAccelKey = nsIDOMKeyEvent::DOM_VK_META;
|
kAccelKey = nsIDOMKeyEvent::DOM_VK_META;
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -1509,7 +1509,7 @@ GlobalWindowImpl::CheckSecurityLeftAndTop(PRInt32* aLeft, PRInt32* aTop)
|
||||||
screen->GetAvailLeft(&screenLeft);
|
screen->GetAvailLeft(&screenLeft);
|
||||||
screen->GetAvailWidth(&screenWidth);
|
screen->GetAvailWidth(&screenWidth);
|
||||||
screen->GetAvailHeight(&screenHeight);
|
screen->GetAvailHeight(&screenHeight);
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
/* The mac's coordinate system is different from the assumed Windows'
|
/* The mac's coordinate system is different from the assumed Windows'
|
||||||
system. It offsets by the height of the menubar so that a window
|
system. It offsets by the height of the menubar so that a window
|
||||||
placed at (0,0) will be entirely visible. Unfortunately that
|
placed at (0,0) will be entirely visible. Unfortunately that
|
||||||
|
|
|
@ -54,6 +54,8 @@ CPPSRCS = \
|
||||||
|
|
||||||
LOCAL_INCLUDES += -I$(srcdir)/../../base/src
|
LOCAL_INCLUDES += -I$(srcdir)/../../base/src
|
||||||
|
|
||||||
|
# Linking against a part of another library is evil. It also currently
|
||||||
|
# prevents building on Mac OS X (DARWIN).
|
||||||
EXTRA_DSO_LIBS = rdfutil_s gkgfx gkconshared_s
|
EXTRA_DSO_LIBS = rdfutil_s gkgfx gkconshared_s
|
||||||
|
|
||||||
SHARED_LIBRARY_LIBS = \
|
SHARED_LIBRARY_LIBS = \
|
||||||
|
|
|
@ -323,7 +323,7 @@ NS_IMETHODIMP nsCaret::GetCaretCoordinates(EViewCoordinates aRelativeToType, nsI
|
||||||
|
|
||||||
//#59405, on windows and unix, the coordinate for IME need to be view (nearest native window) related.
|
//#59405, on windows and unix, the coordinate for IME need to be view (nearest native window) related.
|
||||||
if (aRelativeToType == eIMECoordinates)
|
if (aRelativeToType == eIMECoordinates)
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
aRelativeToType = eTopLevelWindowCoordinates;
|
aRelativeToType = eTopLevelWindowCoordinates;
|
||||||
#else
|
#else
|
||||||
aRelativeToType = eRenderingViewCoordinates;
|
aRelativeToType = eRenderingViewCoordinates;
|
||||||
|
|
|
@ -323,7 +323,7 @@ NS_IMETHODIMP nsCaret::GetCaretCoordinates(EViewCoordinates aRelativeToType, nsI
|
||||||
|
|
||||||
//#59405, on windows and unix, the coordinate for IME need to be view (nearest native window) related.
|
//#59405, on windows and unix, the coordinate for IME need to be view (nearest native window) related.
|
||||||
if (aRelativeToType == eIMECoordinates)
|
if (aRelativeToType == eIMECoordinates)
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
aRelativeToType = eTopLevelWindowCoordinates;
|
aRelativeToType = eTopLevelWindowCoordinates;
|
||||||
#else
|
#else
|
||||||
aRelativeToType = eRenderingViewCoordinates;
|
aRelativeToType = eRenderingViewCoordinates;
|
||||||
|
|
|
@ -1318,7 +1318,7 @@ nsListControlFrame::HandleListSelection(nsIDOMEvent* aEvent,
|
||||||
nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aEvent);
|
nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aEvent);
|
||||||
PRBool isShift;
|
PRBool isShift;
|
||||||
PRBool isControl;
|
PRBool isControl;
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
mouseEvent->GetMetaKey(&isControl);
|
mouseEvent->GetMetaKey(&isControl);
|
||||||
#else
|
#else
|
||||||
mouseEvent->GetCtrlKey(&isControl);
|
mouseEvent->GetCtrlKey(&isControl);
|
||||||
|
@ -2229,12 +2229,12 @@ nsListControlFrame::CreateScrollingViewWidget(nsIView* aView, const nsStyleDispl
|
||||||
widgetData.mWindowType = eWindowType_popup;
|
widgetData.mWindowType = eWindowType_popup;
|
||||||
widgetData.mBorderStyle = eBorderStyle_default;
|
widgetData.mBorderStyle = eBorderStyle_default;
|
||||||
|
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
|
static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
|
||||||
aView->CreateWidget(kCPopUpCID, &widgetData, nsnull);
|
aView->CreateWidget(kCPopUpCID, &widgetData, nsnull);
|
||||||
#else
|
#else
|
||||||
static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID);
|
static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID);
|
||||||
aView->CreateWidget(kCChildCID, &widgetData, nsnull);
|
aView->CreateWidget(kCChildCID, &widgetData, nsnull);
|
||||||
#endif
|
#endif
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1318,7 +1318,7 @@ nsListControlFrame::HandleListSelection(nsIDOMEvent* aEvent,
|
||||||
nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aEvent);
|
nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aEvent);
|
||||||
PRBool isShift;
|
PRBool isShift;
|
||||||
PRBool isControl;
|
PRBool isControl;
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
mouseEvent->GetMetaKey(&isControl);
|
mouseEvent->GetMetaKey(&isControl);
|
||||||
#else
|
#else
|
||||||
mouseEvent->GetCtrlKey(&isControl);
|
mouseEvent->GetCtrlKey(&isControl);
|
||||||
|
@ -2229,12 +2229,12 @@ nsListControlFrame::CreateScrollingViewWidget(nsIView* aView, const nsStyleDispl
|
||||||
widgetData.mWindowType = eWindowType_popup;
|
widgetData.mWindowType = eWindowType_popup;
|
||||||
widgetData.mBorderStyle = eBorderStyle_default;
|
widgetData.mBorderStyle = eBorderStyle_default;
|
||||||
|
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
|
static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID);
|
||||||
aView->CreateWidget(kCPopUpCID, &widgetData, nsnull);
|
aView->CreateWidget(kCPopUpCID, &widgetData, nsnull);
|
||||||
#else
|
#else
|
||||||
static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID);
|
static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID);
|
||||||
aView->CreateWidget(kCChildCID, &widgetData, nsnull);
|
aView->CreateWidget(kCChildCID, &widgetData, nsnull);
|
||||||
#endif
|
#endif
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -108,7 +108,7 @@ void nsMenuBarListener::InitAccessKey()
|
||||||
|
|
||||||
// Compiled-in defaults, in case we can't get LookAndFeel --
|
// Compiled-in defaults, in case we can't get LookAndFeel --
|
||||||
// mac doesn't have menu shortcuts, other platforms use alt.
|
// mac doesn't have menu shortcuts, other platforms use alt.
|
||||||
#ifndef XP_MAC
|
#if !(defined(XP_MAC) || defined(XP_MACOSX))
|
||||||
mAccessKey = nsIDOMKeyEvent::DOM_VK_ALT;
|
mAccessKey = nsIDOMKeyEvent::DOM_VK_ALT;
|
||||||
#else
|
#else
|
||||||
mAccessKey = 0;
|
mAccessKey = 0;
|
||||||
|
|
|
@ -1450,7 +1450,7 @@ nsMenuFrame::BuildAcceleratorText()
|
||||||
{
|
{
|
||||||
// Compiled-in defaults, in case we can't get LookAndFeel --
|
// Compiled-in defaults, in case we can't get LookAndFeel --
|
||||||
// command for mac, control for all other platforms.
|
// command for mac, control for all other platforms.
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
accelKey = nsIDOMKeyEvent::DOM_VK_META;
|
accelKey = nsIDOMKeyEvent::DOM_VK_META;
|
||||||
#else
|
#else
|
||||||
accelKey = nsIDOMKeyEvent::DOM_VK_CONTROL;
|
accelKey = nsIDOMKeyEvent::DOM_VK_CONTROL;
|
||||||
|
|
|
@ -221,7 +221,7 @@ nsMenuPopupFrame::Init(nsIPresContext* aPresContext,
|
||||||
|
|
||||||
// XXX make sure we are hidden (shouldn't this be done automatically?)
|
// XXX make sure we are hidden (shouldn't this be done automatically?)
|
||||||
ourView->SetVisibility(nsViewVisibility_kHide);
|
ourView->SetVisibility(nsViewVisibility_kHide);
|
||||||
#ifdef XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
printf("XP Popups: This is a nag to indicate that an inconsistent hack is being done on the Mac for popups.\n");
|
printf("XP Popups: This is a nag to indicate that an inconsistent hack is being done on the Mac for popups.\n");
|
||||||
static NS_DEFINE_IID(kCPopupCID, NS_POPUP_CID);
|
static NS_DEFINE_IID(kCPopupCID, NS_POPUP_CID);
|
||||||
ourView->CreateWidget(kCPopupCID, &widgetData, nsnull);
|
ourView->CreateWidget(kCPopupCID, &widgetData, nsnull);
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
#include "nsRepeatService.h"
|
#include "nsRepeatService.h"
|
||||||
|
|
||||||
#if XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
#define INITAL_REPEAT_DELAY 250
|
#define INITAL_REPEAT_DELAY 250
|
||||||
#define REPEAT_DELAY 10
|
#define REPEAT_DELAY 10
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -26,18 +26,28 @@ VPATH = @srcdir@
|
||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
DIRS = communicator/bookmarks/win \
|
ifeq (mac,$(MOZ_WIDGET_TOOLKIT))
|
||||||
communicator/search/win \
|
THEME_PLATFORM = mac
|
||||||
communicator/sidebar/win \
|
else
|
||||||
communicator/win \
|
THEME_PLATFORM = win
|
||||||
global/win \
|
endif
|
||||||
messenger/win \
|
|
||||||
messenger/addressbook/win \
|
DIRS = communicator/bookmarks/$(THEME_PLATFORM) \
|
||||||
preview/win \
|
communicator/search/$(THEME_PLATFORM) \
|
||||||
editor/win \
|
communicator/sidebar/$(THEME_PLATFORM) \
|
||||||
navigator/win \
|
communicator/$(THEME_PLATFORM) \
|
||||||
|
global/$(THEME_PLATFORM) \
|
||||||
|
messenger/$(THEME_PLATFORM) \
|
||||||
|
messenger/addressbook/$(THEME_PLATFORM) \
|
||||||
|
preview/$(THEME_PLATFORM) \
|
||||||
|
editor/$(THEME_PLATFORM) \
|
||||||
|
navigator/$(THEME_PLATFORM) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
ifeq ($(THEME_PLATFORM),mac)
|
||||||
|
DIRS += communicator/profile/$(THEME_PLATFORM)
|
||||||
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
install::
|
install::
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,28 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,28 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,28 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 2000 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,29 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 2000 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,29 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 2000 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 2000 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,28 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,28 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 2000 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,28 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 2000 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
|
@ -0,0 +1,30 @@
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Netscape Public
|
||||||
|
# License Version 1.1 (the "License"); you may not use this file
|
||||||
|
# except in compliance with the License. You may obtain a copy of
|
||||||
|
# the License at http://www.mozilla.org/NPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS
|
||||||
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||||
|
# implied. See the License for the specific language governing
|
||||||
|
# rights and limitations under the License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Netscape
|
||||||
|
# Communications Corporation. Portions created by Netscape are
|
||||||
|
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||||
|
# Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
|
||||||
|
DEPTH = ../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
|
@ -251,7 +251,7 @@ nsAppShellService::CreateHiddenWindow()
|
||||||
{
|
{
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
PRInt32 initialHeight = 100, initialWidth = 100;
|
PRInt32 initialHeight = 100, initialWidth = 100;
|
||||||
#if XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
const char* hiddenWindowURL = "chrome://global/content/hiddenWindow.xul";
|
const char* hiddenWindowURL = "chrome://global/content/hiddenWindow.xul";
|
||||||
PRUint32 chromeMask = 0;
|
PRUint32 chromeMask = 0;
|
||||||
#else
|
#else
|
||||||
|
@ -270,7 +270,7 @@ nsAppShellService::CreateHiddenWindow()
|
||||||
if (NS_SUCCEEDED(rv)) {
|
if (NS_SUCCEEDED(rv)) {
|
||||||
mHiddenWindow = newWindow;
|
mHiddenWindow = newWindow;
|
||||||
|
|
||||||
#if XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
// hide the hidden window by launching it into outer space. This
|
// hide the hidden window by launching it into outer space. This
|
||||||
// way, we can keep it visible and let the OS send it activates
|
// way, we can keep it visible and let the OS send it activates
|
||||||
// to keep menus happy. This will cause it to show up in window
|
// to keep menus happy. This will cause it to show up in window
|
||||||
|
@ -514,7 +514,7 @@ nsAppShellService::JustCreateTopWindow(nsIXULWindow *aParent,
|
||||||
zlevel = nsIXULWindow::raisedZ;
|
zlevel = nsIXULWindow::raisedZ;
|
||||||
else if (aChromeMask & nsIWebBrowserChrome::CHROME_WINDOW_LOWERED)
|
else if (aChromeMask & nsIWebBrowserChrome::CHROME_WINDOW_LOWERED)
|
||||||
zlevel = nsIXULWindow::loweredZ;
|
zlevel = nsIXULWindow::loweredZ;
|
||||||
#ifdef XP_MAC
|
#ifdef defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
/* Platforms on which modal windows are always application-modal, not
|
/* Platforms on which modal windows are always application-modal, not
|
||||||
window-modal (that's just the Mac, right?) want modal windows to
|
window-modal (that's just the Mac, right?) want modal windows to
|
||||||
be stacked on top of everyone else. */
|
be stacked on top of everyone else. */
|
||||||
|
@ -712,7 +712,7 @@ nsAppShellService::UnregisterTopLevelWindow(nsIXULWindow* aWindow)
|
||||||
|
|
||||||
if (!windowsRemain) {
|
if (!windowsRemain) {
|
||||||
|
|
||||||
#if XP_MAC
|
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||||
// if no hidden window is available (perhaps due to initial
|
// if no hidden window is available (perhaps due to initial
|
||||||
// Profile Manager window being cancelled), then just quit. We don't have
|
// Profile Manager window being cancelled), then just quit. We don't have
|
||||||
// to worry about focussing the hidden window, because it will get activated
|
// to worry about focussing the hidden window, because it will get activated
|
||||||
|
|
Загрузка…
Ссылка в новой задаче