From 0c93d110f32d3b3a22ac82e6eac623a4011bf165 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Sat, 10 Nov 2001 23:30:13 +0000 Subject: [PATCH] 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 --- content/events/src/nsEventStateManager.cpp | 2 +- content/events/src/nsEventStateManager.h | 2 +- content/xbl/src/nsXBLPrototypeHandler.cpp | 2 +- dom/src/base/nsGlobalWindow.cpp | 2 +- extensions/inspector/build/src/Makefile.in | 2 ++ layout/base/nsCaret.cpp | 2 +- layout/base/src/nsCaret.cpp | 2 +- layout/forms/nsListControlFrame.cpp | 8 ++--- layout/html/forms/src/nsListControlFrame.cpp | 8 ++--- layout/xul/base/src/nsMenuBarListener.cpp | 2 +- layout/xul/base/src/nsMenuFrame.cpp | 2 +- layout/xul/base/src/nsMenuPopupFrame.cpp | 2 +- layout/xul/base/src/nsRepeatService.cpp | 2 +- themes/classic/Makefile.in | 30 ++++++++++++------- .../communicator/bookmarks/mac/Makefile.in | 28 +++++++++++++++++ themes/classic/communicator/mac/Makefile.in | 28 +++++++++++++++++ .../communicator/profile/mac/Makefile.in | 28 +++++++++++++++++ .../communicator/search/mac/Makefile.in | 28 +++++++++++++++++ .../communicator/sidebar/mac/Makefile.in | 29 ++++++++++++++++++ themes/classic/editor/mac/Makefile.in | 29 ++++++++++++++++++ themes/classic/global/mac/Makefile.in | 28 +++++++++++++++++ .../messenger/addressbook/mac/Makefile.in | 28 +++++++++++++++++ themes/classic/messenger/mac/Makefile.in | 28 +++++++++++++++++ themes/classic/navigator/mac/Makefile.in | 28 +++++++++++++++++ themes/classic/preview/mac/Makefile.in | 30 +++++++++++++++++++ xpfe/appshell/src/nsAppShellService.cpp | 8 ++--- 26 files changed, 356 insertions(+), 32 deletions(-) create mode 100644 themes/classic/communicator/bookmarks/mac/Makefile.in create mode 100644 themes/classic/communicator/mac/Makefile.in create mode 100644 themes/classic/communicator/profile/mac/Makefile.in create mode 100644 themes/classic/communicator/search/mac/Makefile.in create mode 100644 themes/classic/communicator/sidebar/mac/Makefile.in create mode 100644 themes/classic/editor/mac/Makefile.in create mode 100644 themes/classic/global/mac/Makefile.in create mode 100644 themes/classic/messenger/addressbook/mac/Makefile.in create mode 100644 themes/classic/messenger/mac/Makefile.in create mode 100644 themes/classic/navigator/mac/Makefile.in create mode 100644 themes/classic/preview/mac/Makefile.in diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 770c49b12f22..80d4a7d7c8de 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -715,7 +715,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext, { 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 // 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 diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h index cc60722961eb..9d765c5a4ace 100644 --- a/content/events/src/nsEventStateManager.h +++ b/content/events/src/nsEventStateManager.h @@ -58,7 +58,7 @@ class nsIDocShellTreeNode; class nsIDocShellTreeItem; // 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 #endif diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp index ec2b7202e4f0..fdc94fdc488b 100644 --- a/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -180,7 +180,7 @@ nsXBLPrototypeHandler::InitAccessKeys() // Compiled-in defaults, in case we can't get the pref -- // mac doesn't have menu shortcuts, other platforms use alt. -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) kMenuAccessKey = 0; kAccelKey = nsIDOMKeyEvent::DOM_VK_META; #else diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp index d3232046159e..b2a31bf6cbb8 100644 --- a/dom/src/base/nsGlobalWindow.cpp +++ b/dom/src/base/nsGlobalWindow.cpp @@ -1509,7 +1509,7 @@ GlobalWindowImpl::CheckSecurityLeftAndTop(PRInt32* aLeft, PRInt32* aTop) screen->GetAvailLeft(&screenLeft); screen->GetAvailWidth(&screenWidth); screen->GetAvailHeight(&screenHeight); -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) /* The mac's coordinate system is different from the assumed Windows' system. It offsets by the height of the menubar so that a window placed at (0,0) will be entirely visible. Unfortunately that diff --git a/extensions/inspector/build/src/Makefile.in b/extensions/inspector/build/src/Makefile.in index 97f23611ca79..e500e8dadc09 100644 --- a/extensions/inspector/build/src/Makefile.in +++ b/extensions/inspector/build/src/Makefile.in @@ -54,6 +54,8 @@ CPPSRCS = \ 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 SHARED_LIBRARY_LIBS = \ diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index 488311963db6..d26715b4a383 100644 --- a/layout/base/nsCaret.cpp +++ b/layout/base/nsCaret.cpp @@ -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. if (aRelativeToType == eIMECoordinates) -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) aRelativeToType = eTopLevelWindowCoordinates; #else aRelativeToType = eRenderingViewCoordinates; diff --git a/layout/base/src/nsCaret.cpp b/layout/base/src/nsCaret.cpp index 488311963db6..d26715b4a383 100644 --- a/layout/base/src/nsCaret.cpp +++ b/layout/base/src/nsCaret.cpp @@ -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. if (aRelativeToType == eIMECoordinates) -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) aRelativeToType = eTopLevelWindowCoordinates; #else aRelativeToType = eRenderingViewCoordinates; diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 25e9d7d1bba7..02b1c910ce97 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -1318,7 +1318,7 @@ nsListControlFrame::HandleListSelection(nsIDOMEvent* aEvent, nsCOMPtr mouseEvent = do_QueryInterface(aEvent); PRBool isShift; PRBool isControl; -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) mouseEvent->GetMetaKey(&isControl); #else mouseEvent->GetCtrlKey(&isControl); @@ -2229,12 +2229,12 @@ nsListControlFrame::CreateScrollingViewWidget(nsIView* aView, const nsStyleDispl widgetData.mWindowType = eWindowType_popup; widgetData.mBorderStyle = eBorderStyle_default; -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID); aView->CreateWidget(kCPopUpCID, &widgetData, nsnull); #else - static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); - aView->CreateWidget(kCChildCID, &widgetData, nsnull); + static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); + aView->CreateWidget(kCChildCID, &widgetData, nsnull); #endif return NS_OK; } else { diff --git a/layout/html/forms/src/nsListControlFrame.cpp b/layout/html/forms/src/nsListControlFrame.cpp index 25e9d7d1bba7..02b1c910ce97 100644 --- a/layout/html/forms/src/nsListControlFrame.cpp +++ b/layout/html/forms/src/nsListControlFrame.cpp @@ -1318,7 +1318,7 @@ nsListControlFrame::HandleListSelection(nsIDOMEvent* aEvent, nsCOMPtr mouseEvent = do_QueryInterface(aEvent); PRBool isShift; PRBool isControl; -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) mouseEvent->GetMetaKey(&isControl); #else mouseEvent->GetCtrlKey(&isControl); @@ -2229,12 +2229,12 @@ nsListControlFrame::CreateScrollingViewWidget(nsIView* aView, const nsStyleDispl widgetData.mWindowType = eWindowType_popup; widgetData.mBorderStyle = eBorderStyle_default; -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) static NS_DEFINE_IID(kCPopUpCID, NS_POPUP_CID); aView->CreateWidget(kCPopUpCID, &widgetData, nsnull); #else - static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); - aView->CreateWidget(kCChildCID, &widgetData, nsnull); + static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); + aView->CreateWidget(kCChildCID, &widgetData, nsnull); #endif return NS_OK; } else { diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp index b0443b1ad9b6..f53905ce5659 100644 --- a/layout/xul/base/src/nsMenuBarListener.cpp +++ b/layout/xul/base/src/nsMenuBarListener.cpp @@ -108,7 +108,7 @@ void nsMenuBarListener::InitAccessKey() // Compiled-in defaults, in case we can't get LookAndFeel -- // 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; #else mAccessKey = 0; diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp index 7989739bab47..548e0ee1e28e 100644 --- a/layout/xul/base/src/nsMenuFrame.cpp +++ b/layout/xul/base/src/nsMenuFrame.cpp @@ -1450,7 +1450,7 @@ nsMenuFrame::BuildAcceleratorText() { // Compiled-in defaults, in case we can't get LookAndFeel -- // command for mac, control for all other platforms. -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) accelKey = nsIDOMKeyEvent::DOM_VK_META; #else accelKey = nsIDOMKeyEvent::DOM_VK_CONTROL; diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp index 4133dc1fc55b..c48cc5f4df2e 100644 --- a/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -221,7 +221,7 @@ nsMenuPopupFrame::Init(nsIPresContext* aPresContext, // XXX make sure we are hidden (shouldn't this be done automatically?) 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"); static NS_DEFINE_IID(kCPopupCID, NS_POPUP_CID); ourView->CreateWidget(kCPopupCID, &widgetData, nsnull); diff --git a/layout/xul/base/src/nsRepeatService.cpp b/layout/xul/base/src/nsRepeatService.cpp index dd59de2d4316..32347dca3c38 100644 --- a/layout/xul/base/src/nsRepeatService.cpp +++ b/layout/xul/base/src/nsRepeatService.cpp @@ -44,7 +44,7 @@ #include "nsRepeatService.h" -#if XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) #define INITAL_REPEAT_DELAY 250 #define REPEAT_DELAY 10 #else diff --git a/themes/classic/Makefile.in b/themes/classic/Makefile.in index 202409917df8..814396e8b2dd 100644 --- a/themes/classic/Makefile.in +++ b/themes/classic/Makefile.in @@ -26,18 +26,28 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = communicator/bookmarks/win \ - communicator/search/win \ - communicator/sidebar/win \ - communicator/win \ - global/win \ - messenger/win \ - messenger/addressbook/win \ - preview/win \ - editor/win \ - navigator/win \ +ifeq (mac,$(MOZ_WIDGET_TOOLKIT)) +THEME_PLATFORM = mac +else +THEME_PLATFORM = win +endif + +DIRS = communicator/bookmarks/$(THEME_PLATFORM) \ + communicator/search/$(THEME_PLATFORM) \ + communicator/sidebar/$(THEME_PLATFORM) \ + communicator/$(THEME_PLATFORM) \ + global/$(THEME_PLATFORM) \ + messenger/$(THEME_PLATFORM) \ + messenger/addressbook/$(THEME_PLATFORM) \ + preview/$(THEME_PLATFORM) \ + editor/$(THEME_PLATFORM) \ + navigator/$(THEME_PLATFORM) \ $(NULL) +ifeq ($(THEME_PLATFORM),mac) +DIRS += communicator/profile/$(THEME_PLATFORM) +endif + include $(topsrcdir)/config/rules.mk install:: diff --git a/themes/classic/communicator/bookmarks/mac/Makefile.in b/themes/classic/communicator/bookmarks/mac/Makefile.in new file mode 100644 index 000000000000..b1876dc5e2ee --- /dev/null +++ b/themes/classic/communicator/bookmarks/mac/Makefile.in @@ -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 diff --git a/themes/classic/communicator/mac/Makefile.in b/themes/classic/communicator/mac/Makefile.in new file mode 100644 index 000000000000..e1d403b23f65 --- /dev/null +++ b/themes/classic/communicator/mac/Makefile.in @@ -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 diff --git a/themes/classic/communicator/profile/mac/Makefile.in b/themes/classic/communicator/profile/mac/Makefile.in new file mode 100644 index 000000000000..b1876dc5e2ee --- /dev/null +++ b/themes/classic/communicator/profile/mac/Makefile.in @@ -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 diff --git a/themes/classic/communicator/search/mac/Makefile.in b/themes/classic/communicator/search/mac/Makefile.in new file mode 100644 index 000000000000..aa674a458ae2 --- /dev/null +++ b/themes/classic/communicator/search/mac/Makefile.in @@ -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 diff --git a/themes/classic/communicator/sidebar/mac/Makefile.in b/themes/classic/communicator/sidebar/mac/Makefile.in new file mode 100644 index 000000000000..338fadc8607d --- /dev/null +++ b/themes/classic/communicator/sidebar/mac/Makefile.in @@ -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 diff --git a/themes/classic/editor/mac/Makefile.in b/themes/classic/editor/mac/Makefile.in new file mode 100644 index 000000000000..c4d580ab6a1e --- /dev/null +++ b/themes/classic/editor/mac/Makefile.in @@ -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 + diff --git a/themes/classic/global/mac/Makefile.in b/themes/classic/global/mac/Makefile.in new file mode 100644 index 000000000000..0261ea5a1af8 --- /dev/null +++ b/themes/classic/global/mac/Makefile.in @@ -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 diff --git a/themes/classic/messenger/addressbook/mac/Makefile.in b/themes/classic/messenger/addressbook/mac/Makefile.in new file mode 100644 index 000000000000..b1876dc5e2ee --- /dev/null +++ b/themes/classic/messenger/addressbook/mac/Makefile.in @@ -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 diff --git a/themes/classic/messenger/mac/Makefile.in b/themes/classic/messenger/mac/Makefile.in new file mode 100644 index 000000000000..0261ea5a1af8 --- /dev/null +++ b/themes/classic/messenger/mac/Makefile.in @@ -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 diff --git a/themes/classic/navigator/mac/Makefile.in b/themes/classic/navigator/mac/Makefile.in new file mode 100644 index 000000000000..0261ea5a1af8 --- /dev/null +++ b/themes/classic/navigator/mac/Makefile.in @@ -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 diff --git a/themes/classic/preview/mac/Makefile.in b/themes/classic/preview/mac/Makefile.in new file mode 100644 index 000000000000..a3168e544c99 --- /dev/null +++ b/themes/classic/preview/mac/Makefile.in @@ -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 + diff --git a/xpfe/appshell/src/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp index 90bbdf6b515c..9cfe0bb39cab 100644 --- a/xpfe/appshell/src/nsAppShellService.cpp +++ b/xpfe/appshell/src/nsAppShellService.cpp @@ -251,7 +251,7 @@ nsAppShellService::CreateHiddenWindow() { nsresult rv; PRInt32 initialHeight = 100, initialWidth = 100; -#if XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) const char* hiddenWindowURL = "chrome://global/content/hiddenWindow.xul"; PRUint32 chromeMask = 0; #else @@ -270,7 +270,7 @@ nsAppShellService::CreateHiddenWindow() if (NS_SUCCEEDED(rv)) { mHiddenWindow = newWindow; -#if XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) // hide the hidden window by launching it into outer space. This // 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 @@ -514,7 +514,7 @@ nsAppShellService::JustCreateTopWindow(nsIXULWindow *aParent, zlevel = nsIXULWindow::raisedZ; else if (aChromeMask & nsIWebBrowserChrome::CHROME_WINDOW_LOWERED) zlevel = nsIXULWindow::loweredZ; -#ifdef XP_MAC +#ifdef defined(XP_MAC) || defined(XP_MACOSX) /* Platforms on which modal windows are always application-modal, not window-modal (that's just the Mac, right?) want modal windows to be stacked on top of everyone else. */ @@ -712,7 +712,7 @@ nsAppShellService::UnregisterTopLevelWindow(nsIXULWindow* aWindow) if (!windowsRemain) { -#if XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) // if no hidden window is available (perhaps due to initial // Profile Manager window being cancelled), then just quit. We don't have // to worry about focussing the hidden window, because it will get activated