From b4a24ff6aba36bef95694b2fc78d49bb468c283a Mon Sep 17 00:00:00 2001
From: "joshmoz%gmail.com"
 <joshmoz%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 13 Aug 2005 00:20:46 +0000
Subject: [PATCH] get rid of XP_MAC macros from mozilla/content. no bug.
 r+sr=dbaron

git-svn-id: svn://10.0.0.236/trunk@177681 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../content/base/src/nsDocumentEncoder.cpp    | 23 --------------
 mozilla/content/base/src/nsRange.cpp          | 31 -------------------
 .../events/src/nsEventStateManager.cpp        |  4 +--
 .../content/xbl/src/nsXBLPrototypeHandler.cpp |  2 +-
 4 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/mozilla/content/base/src/nsDocumentEncoder.cpp b/mozilla/content/base/src/nsDocumentEncoder.cpp
index 83ddfc52b08..547f52e7722 100644
--- a/mozilla/content/base/src/nsDocumentEncoder.cpp
+++ b/mozilla/content/base/src/nsDocumentEncoder.cpp
@@ -81,12 +81,6 @@ enum nsRangeIterationDirection {
   kDirectionIn = 1
 };
 
-#ifdef XP_MAC
-#pragma mark -
-#pragma mark  nsDocumentEncoder declaration 
-#pragma mark -
-#endif
-
 class nsDocumentEncoder : public nsIDocumentEncoder
 {
 public:
@@ -166,11 +160,6 @@ protected:
   PRPackedBool      mIsCopying;  // Set to PR_TRUE only while copying
 };
 
-#ifdef XP_MAC
-#pragma mark  nsDocumentEncoder implementation 
-#pragma mark -
-#endif
-
 NS_IMPL_ADDREF(nsDocumentEncoder)
 NS_IMPL_RELEASE(nsDocumentEncoder)
 
@@ -1008,13 +997,6 @@ NS_NewTextEncoder(nsIDocumentEncoder** aResult)
  return NS_OK;
 }
 
-
-#ifdef XP_MAC
-#pragma mark -
-#pragma mark  nsDocumentEncoder declaration 
-#pragma mark -
-#endif
-
 class nsHTMLCopyEncoder : public nsDocumentEncoder
 {
 public:
@@ -1056,11 +1038,6 @@ protected:
   PRBool mIsTextWidget;
 };
 
-#ifdef XP_MAC
-#pragma mark  nsDocumentEncoder implementation 
-#pragma mark -
-#endif
-
 nsHTMLCopyEncoder::nsHTMLCopyEncoder()
 {
   mIsTextWidget = PR_FALSE;
diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp
index 1bf2a0b135f..54546d02511 100644
--- a/mozilla/content/base/src/nsRange.cpp
+++ b/mozilla/content/base/src/nsRange.cpp
@@ -84,15 +84,6 @@ nsVoidArray* nsRange::mEndAncestorOffsets = nsnull;
 nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult);
 nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aInstancePtrResult);
 
-
-
-#ifdef XP_MAC
-#pragma mark -
-#pragma mark  utility functions (some exposed through nsRangeUtils, below
-#pragma mark -
-#endif
-
-
 /******************************************************
  * stack based utilty class for managing monitor
  ******************************************************/
@@ -296,15 +287,6 @@ PRBool GetNodeBracketPoints(nsIContent* aNode,
   return PR_TRUE;
 }
 
-
-
-#ifdef XP_MAC
-#pragma mark -
-#pragma mark  class nsRangeUtils
-#pragma mark -
-#endif
-
-
 /******************************************************
  * non members
  ******************************************************/
@@ -364,13 +346,6 @@ nsRangeUtils::CompareNodeToRange(nsIContent* aNode, nsIDOMRange* aRange,
                                      outNodeAfter);
 }
 
-#ifdef XP_MAC
-#pragma mark -
-#pragma mark  class nsRange
-#pragma mark -
-#endif
-
-
 /******************************************************
  * non members
  ******************************************************/
@@ -1148,12 +1123,6 @@ nsresult nsRange::SelectNodeContents(nsIDOMNode* aN)
   return DoSetRange(theNode,0,theNode,indx);
 }
 
-#ifdef XP_MAC
-#pragma mark -
-#pragma mark  class RangeSubtreeIterator
-#pragma mark -
-#endif
-
 // The Subtree Content Iterator only returns subtrees that are
 // completely within a given range. It doesn't return a CharacterData
 // node that contains either the start or end point of the range.
diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index e96db063b08..ee52d8e0411 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -125,7 +125,7 @@
 #include "nsIProperties.h"
 #include "nsISupportsPrimitives.h"
 
-#if defined (XP_MAC) || defined(XP_MACOSX)
+#ifdef XP_MACOSX
 #include <Events.h>
 #endif
 
@@ -1253,7 +1253,7 @@ nsEventStateManager::FireContextClick()
   if ( !mGestureDownContent )
     return;
 
-#if defined (XP_MAC) || defined(XP_MACOSX)
+#ifdef XP_MACOSX
   // hacky OS call to ensure that we don't show a context menu when the user
   // let go of the mouse already, after a long, cpu-hogging operation prevented
   // us from handling any OS events. See bug 117589.
diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
index b0434492b3a..f9ec7097df7 100644
--- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
+++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
@@ -192,7 +192,7 @@ nsXBLPrototypeHandler::InitAccessKeys()
 
   // Compiled-in defaults, in case we can't get the pref --
   // mac doesn't have menu shortcuts, other platforms use alt.
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#ifdef XP_MACOSX
   kMenuAccessKey = 0;
   kAccelKey = nsIDOMKeyEvent::DOM_VK_META;
 #else