*** empty log message ***

2 files changed, 5 insertions, 7 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java
index a05c056f03..3e67d9a5a8 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java
@@ -470,17 +470,18 @@ int processPaint (int callData) {
 	if (xDisplay == 0) return 0;

 	Event event = new Event ();

 	GC gc = event.gc = new GC (this);

-	OS.XSetRegion (xDisplay, gc.handle, damagedRegion);

+	Region region = Region.motif_new (damagedRegion);

+	gc.setClipping (region);

 	XRectangle rect = new XRectangle ();

 	OS.XClipBox (damagedRegion, rect);

-	OS.XDestroyRegion (damagedRegion);

-	damagedRegion = 0;

 	event.time = OS.XtLastTimestampProcessed (xDisplay);

 	event.x = rect.x;  event.y = rect.y;

 	event.width = rect.width;  event.height = rect.height;

 	sendEvent (SWT.Paint, event);

 	gc.dispose ();

 	event.gc = null;

+	OS.XDestroyRegion (damagedRegion);

+	damagedRegion = 0;

 	return 0;

 }

 void propagateChildren (boolean enabled) {

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
index 0d72025115..c7caee4920 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
@@ -1398,10 +1398,7 @@ int processPaint (int callData) {
 	event.x = xEvent.x;  event.y = xEvent.y;

 	event.width = xEvent.width;  event.height = xEvent.height;

 	GC gc = event.gc = new GC (this);

-	XRectangle rect = new XRectangle ();

-	rect.x = (short) xEvent.x;  rect.y = (short) xEvent.y;

-	rect.width = (short) xEvent.width;  rect.height = (short) xEvent.height;

-	OS.XSetClipRectangles (xDisplay, gc.handle, 0, 0, rect, 1, OS.Unsorted);

+	gc.setClipping (event.x, event.y, event.width, event.height);

 	sendEvent (SWT.Paint, event);

 	if (!gc.isDisposed ()) gc.dispose ();

 	event.gc = null;