In compositing mode, updates are not needed while grabbing

8 files changed, 29 insertions, 18 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
index 25f2d8268d..e390837b6b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
@@ -3224,8 +3224,7 @@ boolean runGrabs () {
 	mouseUpControl = null;
 	try {
 		while (grabControl != null && !grabControl.isDisposed () && outResult [0] != OS.kMouseTrackingMouseUp) {
-			//TEMPORARY CODE
-			grabControl.getShell().update (true);
+			if (!OS.HIVIEW) grabControl.getShell().update (true);
 			lastModifiers = OS.GetCurrentEventKeyModifiers ();
 			int oldState = OS.GetCurrentEventButtonState ();
 			int handle = grabControl.handle;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Link.java
index e5002bc2c7..e309f2286a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Link.java
@@ -371,7 +371,7 @@ int kEventMouseDown (int nextHandler, int theEvent, int userData) {
 						}
 						Rectangle rectangle = layout.getBounds (oldSelection, newSelection);
 						redraw (rectangle.x, rectangle.y, rectangle.width, rectangle.height, false);
-						update ();
+						if (!OS.HIVIEW) update ();
 					}
 				}
 				break;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java
index 5079af0220..ceecfe1953 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java
@@ -614,8 +614,10 @@ int kEventMenuClosed (int nextHandler, int theEvent, int userData) {
 //		item.x = item.y = item.width = item.height = 0;
 //	}
 	sendEvent (SWT.Hide);
-	if (hooks (SWT.Hide)) {
-		getShell().update (true);
+	if (!OS.HIVIEW) {
+		if (hooks (SWT.Hide)) {
+			getShell().update (true);
+		}
 	}
 	return OS.eventNotHandledErr;
 }
@@ -763,8 +765,10 @@ int kEventMenuOpening (int nextHandler, int theEvent, int userData) {
 	closed = false;
 	sendEvent (SWT.Show);
 	modified = false;
-	if (hooks (SWT.Show)) {
-		getShell().update (true);
+	if (!OS.HIVIEW) {
+		if (hooks (SWT.Show)) {
+			getShell().update (true);
+		}
 	}
 	return OS.eventNotHandledErr;
 }
@@ -778,8 +782,10 @@ int kEventMenuTargetItem (int nextHandler, int theEvent, int userData) {
 		if (index [0] > 0) lastTarget = items [index [0] - 1];
 		if (lastTarget != null) {
 			lastTarget.sendEvent (SWT.Arm);
-			if (lastTarget.hooks (SWT.Arm)) {
-				getShell().update (true);
+			if (!OS.HIVIEW) {
+				if (lastTarget.hooks (SWT.Arm)) {
+					getShell().update (true);
+				}
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Sash.java
index 5d84c626af..4f7fb2f159 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Sash.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Sash.java
@@ -248,7 +248,7 @@ int kEventMouseDown (int nextHandler, int theEvent, int userData) {
 				if (event.doit) {
 					setBounds (event.x, event.y, width, height);
 					if (isDisposed ()) return result;
-					parent.update (true);
+					if (!OS.HIVIEW) parent.update (true);
 				}
 				break;
 			}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Scale.java
index 15f43302da..c379b43cd9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Scale.java
@@ -74,8 +74,10 @@ public Scale (Composite parent, int style) {
 
 int actionProc (int theControl, int partCode) {
 	sendEvent (SWT.Selection);
-	Shell shell = getShell ();
-	shell.update (true);
+	if (!OS.HIVIEW) {
+		Shell shell = getShell ();
+		shell.update (true);
+	}
 	return 0;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/ScrollBar.java
index 97478f80a4..dbdca6138a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/ScrollBar.java
@@ -171,7 +171,7 @@ int actionProc (int theControl, int partCode) {
 	}
 	OS.SetControl32BitValue (handle, value);
 	sendEvent (SWT.Selection, event);
-	parent.update (true);
+	if (!OS.HIVIEW) parent.update (true);
 	return 0;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Scrollable.java
index d9af01fabc..285e65c8d9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Scrollable.java
@@ -358,9 +358,11 @@ boolean sendMouseWheel (short wheelAxis, int wheelDelta) {
 			Event event = new Event ();
 		    event.detail = wheelDelta > 0 ? SWT.PAGE_UP : SWT.PAGE_DOWN;	
 			bar.sendEvent (SWT.Selection, event);
-//			Display display = getDisplay ();
-//			display.update ();
-			update ();
+			if (!OS.HIVIEW) {
+//				Display display = getDisplay ();
+//				display.update ();
+				update ();
+			}
 			return true;
 		}
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Slider.java
index 4fc4196b90..edd7aabdda 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Slider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Slider.java
@@ -178,8 +178,10 @@ int actionProc (int theControl, int partCode) {
 	}
 	OS.SetControl32BitValue (handle, value);
 	sendEvent (SWT.Selection, event);
-	Shell shell = getShell ();
-	shell.update (true);
+	if (!OS.HIVIEW) {
+		Shell shell = getShell ();
+		shell.update (true);
+	}
 	return 0;
 }