*** empty log message ***

2 files changed, 8 insertions, 8 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Caret.java
index f188366416..849e745ee0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Caret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Caret.java
@@ -60,9 +60,9 @@ boolean drawCaret () {
 	int [] currentPort = new int [1];
 	OS.GetPort (currentPort);
 	OS.SetPort (port);
-	int oldRgn = OS.NewRgn ();
+	int oldClip = OS.NewRgn ();
 	int clipRgn = getClipping (parentHandle);
-	OS.GetClip (oldRgn);
+	OS.GetClip (oldClip);
 	OS.SetClip (clipRgn);
 	Rect rect = new Rect ();
 	OS.GetControlBounds (parentHandle, rect);
@@ -75,9 +75,9 @@ boolean drawCaret () {
 	color.blue = (short) 0xFFFF;
 	OS.RGBBackColor (color);
 	OS.InvertRect (rect);	
-	OS.SetClip (oldRgn);
+	OS.SetClip (oldClip);
 	OS.DisposeRgn (clipRgn);
-	OS.DisposeRgn (oldRgn);
+	OS.DisposeRgn (oldClip);
 	OS.SetPort (currentPort [0]);
 	return true;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Widget.java
index aa15d6dd0a..f091003188 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Widget.java
@@ -460,16 +460,16 @@ int kEventControlDraw (int nextHandler, int theEvent, int userData) {
 	int [] region = new int [1];	
 	OS.GetEventParameter (theEvent, OS.kEventParamRgnHandle, OS.typeQDRgnHandle, null, 4, null, region);
 	int clipRgn = getClipping (theControl [0]);
-	int oldRgn = OS.NewRgn ();
-	OS.GetClip (oldRgn);
+	int oldClip = OS.NewRgn ();
+	OS.GetClip (oldClip);
 //	OS.SectRgn(oldRgn, clipRgn, clipRgn);
 	OS.SectRgn(region [0], clipRgn, clipRgn);
 	OS.SetClip (clipRgn);
 	drawWidget (theControl [0]);
 	int result = OS.CallNextEventHandler (nextHandler, theEvent);
-	OS.SetClip (oldRgn);
+	OS.SetClip (oldClip);
 	OS.DisposeRgn (clipRgn);
-	OS.DisposeRgn (oldRgn);
+	OS.DisposeRgn (oldClip);
 	return result;
 }