From a844c1bfd25de2c82dbfe560b20b52f5733627ea Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com" <sfraser%netscape.com>
Date: Thu, 20 Apr 2000 03:55:00 +0000
Subject: [PATCH] Just rename some mFoo static member variables to sFoo.

---
 widget/src/mac/nsMacEventHandler.cpp | 20 ++++++++++----------
 widget/src/mac/nsMacEventHandler.h   |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/widget/src/mac/nsMacEventHandler.cpp b/widget/src/mac/nsMacEventHandler.cpp
index f9aefa32ffe9..23ce0f188eef 100644
--- a/widget/src/mac/nsMacEventHandler.cpp
+++ b/widget/src/mac/nsMacEventHandler.cpp
@@ -53,8 +53,8 @@ extern nsIWidget         * gRollupWidget;
 	#define botRight(r)	(((Point *) &(r))[1])
 #endif
 
-PRBool	nsMacEventHandler::mInBackground = PR_FALSE;
-PRBool	nsMacEventHandler::mMouseInWidgetHit = PR_FALSE;
+PRBool	nsMacEventHandler::sInBackground = PR_FALSE;
+PRBool	nsMacEventHandler::sMouseInWidgetHit = PR_FALSE;
 
 nsMacEventDispatchHandler	gEventDispatchHandler;
 
@@ -368,9 +368,9 @@ PRBool nsMacEventHandler::HandleOSEvent ( EventRecord& aOSEvent )
 			if (eventType == suspendResumeMessage)
 			{
 				if ((aOSEvent.message & 1) == resumeFlag) {
-					mInBackground = PR_FALSE;		// resume message
+					sInBackground = PR_FALSE;		// resume message
 				} else {
-					mInBackground = PR_TRUE;		// suspend message
+					sInBackground = PR_TRUE;		// suspend message
 					if (nsnull != gRollupListener && (nsnull != gRollupWidget) ) {
 						gRollupListener->Rollup();
 					}
@@ -379,14 +379,14 @@ PRBool nsMacEventHandler::HandleOSEvent ( EventRecord& aOSEvent )
 			}
 			else if (eventType == mouseMovedMessage)
 			{
-				if (! mInBackground)
+				if (! sInBackground)
 					retVal = HandleMouseMoveEvent(aOSEvent);
 			}
 		}
 		break;
 	
 		case nullEvent:
-			if (! mInBackground)
+			if (! sInBackground)
 				retVal = HandleMouseMoveEvent(aOSEvent);
 			break;
 	}
@@ -1009,7 +1009,7 @@ PRBool nsMacEventHandler::HandleActivateEvent(EventRecord& aOSEvent)
       break;
 
     case osEvt:
-      isActive = ! mInBackground;
+      isActive = ! sInBackground;
       break;
   }
 
@@ -1203,7 +1203,7 @@ PRBool nsMacEventHandler::HandleMouseDownEvent(EventRecord&	aOSEvent)
 			} 
 						
 			gEventDispatchHandler.SetWidgetHit(widgetHit);
-			mMouseInWidgetHit = PR_TRUE;
+			sMouseInWidgetHit = PR_TRUE;
 			break;
 		}
 
@@ -1281,9 +1281,9 @@ PRBool nsMacEventHandler::HandleMouseMoveEvent( EventRecord& aOSEvent )
 		Point macPoint = aOSEvent.where;
 		::GlobalToLocal(&macPoint);
 		PRBool inWidgetHit = lastWidgetHit->PointInWidget(macPoint);
-		if (mMouseInWidgetHit != inWidgetHit)
+		if (sMouseInWidgetHit != inWidgetHit)
 		{
-			mMouseInWidgetHit = inWidgetHit;
+			sMouseInWidgetHit = inWidgetHit;
 			mouseEvent.message = (inWidgetHit ? NS_MOUSE_ENTER : NS_MOUSE_EXIT);
 		}
 		retVal |= lastWidgetHit->DispatchMouseEvent(mouseEvent);
diff --git a/widget/src/mac/nsMacEventHandler.h b/widget/src/mac/nsMacEventHandler.h
index ce88f4976151..d6d33f293e25 100644
--- a/widget/src/mac/nsMacEventHandler.h
+++ b/widget/src/mac/nsMacEventHandler.h
@@ -124,8 +124,8 @@ protected:
 		virtual nsresult  HandleTextEvent(PRUint32 textRangeCount, nsTextRangeArray textRangeArray);
 
 protected:
-	static PRBool	mMouseInWidgetHit;
-  static PRBool	mInBackground;
+	static PRBool	sMouseInWidgetHit;
+  static PRBool	sInBackground;
 
 
 	nsMacWindow*	mTopLevelWidget;