Revert "Bug 475784: half transparent composite as overlay composite not work with gtk3"

This reverts commit 70cce8be1320532905ef82171b46309da5c59bc7.

12 files changed, 9 insertions, 365 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
index 9733cccad0..dc39bccf20 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
@@ -875,26 +875,6 @@ JNIEXPORT jboolean JNICALL Cairo_NATIVE(_1cairo_1region_1contains_1point)
 }
 #endif
 
-#ifndef NO__1cairo_1region_1copy
-JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1region_1copy)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1copy_FUNC);
-/*
-	rc = (jintLong)cairo_region_copy(arg0);
-*/
-	{
-		Cairo_LOAD_FUNCTION(fp, cairo_region_copy)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	Cairo_NATIVE_EXIT(env, that, _1cairo_1region_1copy_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO__1cairo_1region_1get_1rectangle
 JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1get_1rectangle)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h
index fecaef595a..2554ab6068 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h
@@ -32,7 +32,6 @@
 #define cairo_ps_surface_set_size_LIB LIB_CAIRO
 #define cairo_region_num_rectangles_LIB LIB_CAIRO
 #define cairo_region_contains_point_LIB LIB_CAIRO
-#define cairo_region_copy_LIB LIB_CAIRO
 #define cairo_region_get_rectangle_LIB LIB_CAIRO
 #define cairo_surface_set_device_scale_LIB LIB_CAIRO
 #define cairo_surface_get_device_scale_LIB LIB_CAIRO
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
index 4153701dea..68d31d2c6a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
@@ -97,7 +97,6 @@ char * Cairo_nativeFunctionNames[] = {
 	"_1cairo_1rectangle",
 	"_1cairo_1reference",
 	"_1cairo_1region_1contains_1point",
-	"_1cairo_1region_1copy",
 	"_1cairo_1region_1get_1rectangle",
 	"_1cairo_1region_1num_1rectangles",
 	"_1cairo_1reset_1clip",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
index 1eae730340..13f3005169 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
@@ -107,7 +107,6 @@ typedef enum {
 	_1cairo_1rectangle_FUNC,
 	_1cairo_1reference_FUNC,
 	_1cairo_1region_1contains_1point_FUNC,
-	_1cairo_1region_1copy_FUNC,
 	_1cairo_1region_1get_1rectangle_FUNC,
 	_1cairo_1region_1num_1rectangles_FUNC,
 	_1cairo_1reset_1clip_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c
index 6f5afd45c9..a54a37e80d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c
@@ -15,7 +15,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Cairo and SWT
- * -  Copyright (C) 2005, 2018 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2005, 2016 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h
index 5faf6e80d8..6ffd32cb80 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h
@@ -15,7 +15,7 @@
  *
  * IBM
  * -  Binding to permit interfacing between Cairo and SWT
- * -  Copyright (C) 2005, 2018 IBM Corp.  All Rights Reserved.
+ * -  Copyright (C) 2005, 2016 IBM Corp.  All Rights Reserved.
  *
  * ***** END LICENSE BLOCK ***** */
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
index 2af4e020fa..27918325ef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
@@ -1276,16 +1276,6 @@ public static final int cairo_region_num_rectangles(long /*int*/ region) {
 	}
 }
 /** @method flags=dynamic */
-public static final native long /*int*/ _cairo_region_copy(long /*int*/ region);
-public static final long /*int*/ cairo_region_copy(long /*int*/ region) {
-	lock.lock();
-	try {
-		 return _cairo_region_copy(region);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
 public static final native boolean _cairo_region_contains_point(long /*int*/ region, int x, int y);
 public static final boolean cairo_region_contains_point(long /*int*/ region, int x, int y) {
 	lock.lock();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index 7a4642f963..127e1e216e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -206,23 +206,6 @@ static int checkStyle (int style) {
 }
 
 /**
- * Convenience method that applies a region to the Control using cairo_clip.
- *
- * @param cairo the cairo context to apply the region to
- */
-void cairoClipRegion (long /*int*/ cairo) {
-	if (cairo == 0) return;
-	GdkRectangle rect = new GdkRectangle ();
-	GDK.gdk_cairo_get_clip_rectangle (cairo, rect);
-	long /*int*/ regionHandle = data.regionSet;
-	long /*int*/ actualRegion = GDK.gdk_region_rectangle(rect);
-	GDK.gdk_region_subtract(actualRegion, regionHandle);
-	GDK.gdk_cairo_region(cairo, actualRegion);
-	Cairo.cairo_clip(cairo);
-	Cairo.cairo_paint(cairo);
-}
-
-/**
  * Invokes platform specific functionality to wrap a graphics context.
  * <p>
  * <b>IMPORTANT:</b> This method is <em>not</em> part of the public
@@ -1758,11 +1741,7 @@ void fillRectangleInPixels(int x, int y, int width, int height) {
 		height = -height;
 	}
 	long /*int*/ cairo = data.cairo;
-	if (data.regionSet != 0) {
-		cairoClipRegion(cairo);
-	} else {
-		Cairo.cairo_rectangle(cairo, x, y, width, height);
-	}
+	Cairo.cairo_rectangle(cairo, x, y, width, height);
 	Cairo.cairo_fill(cairo);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
index f9fa5a7efe..b6e8b7a799 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
@@ -69,7 +69,7 @@ public final class GCData {
 	public int interpolation = SWT.DEFAULT;
 	public Image image;
 
-	public long /*int*/ clipRgn, context, layout, damageRgn, drawable, cairo, regionSet;
+	public long /*int*/ clipRgn, context, layout, damageRgn, drawable, cairo;
 	public double cairoXoffset, cairoYoffset;
 	public boolean disposeCairo;
 	public double[] identity, clippingTransform;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index 5da0bdac43..cf786af88b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -127,13 +127,7 @@ public Composite (Composite parent, int style) {
 }
 
 static int checkStyle (int style) {
-	/*
-	 * With setRegion() using Cairo now, we need to keep this style bit
-	 * for cases where this Composite is used as an overlay. See bug 475784.
-	 */
-	if (GTK.GTK_VERSION < OS.VERSION(3, 10, 0)) {
-		style &= ~SWT.NO_BACKGROUND;
-	}
+	style &= ~SWT.NO_BACKGROUND;
 	style &= ~SWT.TRANSPARENT;
 	return style;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 52e426048c..ed9b3ae3f4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -60,11 +60,6 @@ public abstract class Control extends Widget implements Drawable {
 	Font font;
 	Region region;
 	long /*int*/ eventRegion;
-	/**
-	 * The handle to the Region, which is neccessary in the case
-	 * that <code>region</code> is disposed before this Control.
-	 */
-	long /*int*/ regionHandle;
 	String toolTipText;
 	Object layoutData;
 	Accessible accessible;
@@ -177,13 +172,6 @@ void drawBackground (Control control, long /*int*/ window, long /*int*/ region,
 
 void drawBackground (Control control, long /*int*/ window, long /*int*/ cr, long /*int*/ region, int x, int y, int width, int height) {
 	long /*int*/ cairo = cr != 0 ? cr : GDK.gdk_cairo_create(window);
-	/*
-	 * It's possible that a client is using an SWT.NO_BACKGROUND Composite with custom painting
-	 * and a region to provide "overlay" functionality. In this case we don't want to paint
-	 * any background color, as it will likely break desired behavior. The fix is to paint
-	 * this Control as transparent. See bug 475784.
-	 */
-	boolean noBackgroundRegion = drawRegion && hooks(SWT.Paint) && ((style & SWT.NO_BACKGROUND) != 0);
 	if (cairo == 0) error (SWT.ERROR_NO_HANDLES);
 	if (region != 0) {
 		GDK.gdk_cairo_region(cairo, region);
@@ -207,11 +195,7 @@ void drawBackground (Control control, long /*int*/ window, long /*int*/ cr, long
 		GdkRGBA rgba;
 		if (GTK.GTK3) {
 			rgba = control.getBackgroundGdkRGBA();
-			if (noBackgroundRegion) {
-				Cairo.cairo_set_source_rgba (cairo, 0.0, 0.0, 0.0, 0.0);
-			} else {
-				Cairo.cairo_set_source_rgba (cairo, rgba.red, rgba.green, rgba.blue, rgba.alpha);
-			}
+			Cairo.cairo_set_source_rgba (cairo, rgba.red, rgba.green, rgba.blue, rgba.alpha);
 		} else {
 			GdkColor color = control.getBackgroundGdkColor ();
 			Cairo.cairo_set_source_rgba_compatibility (cairo, color);
@@ -1392,11 +1376,6 @@ public void setRegion (Region region) {
 		GDK.gdk_window_shape_combine_region (window, shape_region, 0, 0);
 	} else {
 		drawRegion = (this.region != null && this.region.handle != 0);
-		if (drawRegion) {
-			cairoCopyRegion(this.region);
-		} else {
-			cairoDisposeRegion();
-		}
 		GTK.gtk_widget_queue_draw(topHandle());
 	}
 }
@@ -3601,24 +3580,6 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 }
 
 /**
- * Copies the region at the Cairo level, as we need to re-use these resources
- * after the Region object is disposed.
- *
- * @param region the Region object to copy to this Control
- */
-void cairoCopyRegion (Region region) {
-	if (region == null || region.isDisposed() || region.handle == 0) return;
-	regionHandle = Cairo.cairo_region_copy(region.handle);
-	return;
-}
-
-void cairoDisposeRegion () {
-	if (regionHandle != 0) GDK.gdk_region_destroy(regionHandle);
-	if (eventRegion != 0) GDK.gdk_region_destroy(eventRegion);
-	regionHandle = 0;
-	eventRegion = 0;
-}
-/**
  * Convenience method that applies a region to the Control using cairo_clip.
  *
  * @param cairo the cairo context to apply the region to
@@ -3626,16 +3587,13 @@ void cairoDisposeRegion () {
 void cairoClipRegion (long /*int*/ cairo) {
 	GdkRectangle rect = new GdkRectangle ();
 	GDK.gdk_cairo_get_clip_rectangle (cairo, rect);
-	long /*int*/ regionHandle = this.regionHandle;
-	// Disposal check just in case
-	if (regionHandle == 0) {
-		drawRegion = false;
-		return;
-	}
+	long /*int*/ regionHandle = this.region.handle;
+	GdkRectangle regionRect = new GdkRectangle();
 	/*
 	 * These gdk_region_* functions actually map to the proper
 	 * cairo_* functions in os.h.
 	 */
+	GDK.gdk_region_get_clipbox(regionHandle, regionRect);
 	long /*int*/ actualRegion = GDK.gdk_region_rectangle(rect);
 	GDK.gdk_region_subtract(actualRegion, regionHandle);
 	// Draw the Shell bg using cairo, only if it's a different color
@@ -3673,11 +3631,6 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) {
 	if ((style & SWT.MIRRORED) != 0) eventBounds.x = DPIUtil.autoScaleDown (getClientWidth ()) - eventBounds.width - eventBounds.x;
 	event.setBounds (eventBounds);
 	GCData data = new GCData ();
-	/*
-	 * Pass the region into the GCData so that GC.fill* methods can be aware of the region
-	 * and clip themselves accordingly. Only relevant on GTK3.10+, see bug 475784.
-	 */
-	if (drawRegion) data.regionSet = eventRegion;
 //	data.damageRgn = gdkEvent.region;
 	if (GTK.GTK_VERSION <= OS.VERSION (3, 9, 0) || (GTK.GTK_VERSION >= OS.VERSION (3, 14, 0) && OS.CAIRO_CONTEXT_REUSE)) {
 		data.cairo = cairo;
@@ -4357,7 +4310,6 @@ void releaseHandle () {
 	super.releaseHandle ();
 	fixedHandle = 0;
 	parent = null;
-	cairoDisposeRegion();
 }
 
 @Override
diff --git a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug475784_TransparentComposite.java b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug475784_TransparentComposite.java
deleted file mode 100644
index 800ad78429..0000000000
--- a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug475784_TransparentComposite.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.tests.gtk.snippets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Path;
-import org.eclipse.swt.graphics.PathData;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.Region;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-public class Bug475784_TransparentComposite extends Shell
-{
-  public static int RADIUS_OF_ROUND_EDGES = 30;
-
-  /**
-   * Launch the application.
-   * @param args
-   */
-  public static void main(String args[])
-  {
-    try
-    {
-      Display display = Display.getDefault();
-      Bug475784_TransparentComposite shell = new Bug475784_TransparentComposite(display);
-      shell.open();
-      shell.layout();
-      while (!shell.isDisposed())
-      {
-        if (!display.readAndDispatch())
-        {
-          display.sleep();
-        }
-      }
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * Create the shell.
-   * @param display
-   */
-  public Bug475784_TransparentComposite(final Display display)
-  {
-    super(display, SWT.SHELL_TRIM);
-    setLayout(new GridLayout(1, false));
-    final Composite composite = new Composite(this, SWT.NONE);
-    composite.setBackground(display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-    composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-    composite.setLayout(new GridLayout(1, false));
-    //overlay composite
-    final Composite overlay = new Composite(composite, SWT.NO_BACKGROUND | SWT.NO_FOCUS);
-    overlay.setLayout(new FillLayout());
-    overlay.setVisible(false);
-    //label
-    Label textLabel = new Label(composite, SWT.NONE);
-    textLabel.setText("Hello World!\nHello World!");
-    Button btnCheckButton = new Button(composite, SWT.CHECK);
-    btnCheckButton.setText("Check Button");
-    Button btnRadioButton = new Button(composite, SWT.RADIO);
-    btnRadioButton.setText("Radio Button");
-    //Composite for drawings
-    Composite compDraws = new Composite(composite, SWT.NONE);
-    compDraws.addPaintListener(e -> {
-        e.gc.setBackground(display.getSystemColor(SWT.COLOR_RED));
-        e.gc.fillArc(0, 0, 50, 50, 0, 360);
-      });
-    //exclude overlay composite
-    GridData gData = new GridData();
-    gData.exclude = true;
-    overlay.setLayoutData(gData);
-    //set region
-    Region reg = new Region();
-    getRegionForRoundRectangle(reg, 0, 0, 200, 200, RADIUS_OF_ROUND_EDGES);
-    overlay.setRegion(reg);
-    reg.dispose();
-    //toggle overlay button
-    final Button btnNewButton = new Button(composite, SWT.NONE);
-    btnNewButton.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, false, true, 1, 1));
-    btnNewButton.setText("Toggle overlay");
-    GridData gdDataButton = new GridData(GridData.VERTICAL_ALIGN_END);
-    gdDataButton.horizontalAlignment = SWT.LEFT;
-    gdDataButton.verticalAlignment = SWT.BOTTOM;
-    gdDataButton.grabExcessVerticalSpace = true;
-    btnNewButton.setLayoutData(gdDataButton);
-    btnNewButton.addSelectionListener(new SelectionAdapter()
-    {
-      @Override
-      public void widgetSelected(SelectionEvent e)
-      {
-        int width = composite.getSize().x;
-        int height = composite.getSize().y - btnNewButton.getSize().y - 10;
-        overlay.setSize(width, height);
-        overlay.setVisible(!overlay.isVisible());
-      }
-    });
-    overlay.moveAbove(null);
-    overlay.addPaintListener(e -> {
-        e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_YELLOW));
-        e.gc.setAlpha(150);
-        e.gc.fillRectangle(new Rectangle(0, 0, overlay.getSize().x, overlay.getSize().y));
-      });
-    createContents();
-  }
-
-  /**
-   * Create contents of the shell.
-   */
-  protected void createContents()
-  {
-    setText("SWT Application");
-    setSize(450, 300);
-  }
-
-  @Override
-  protected void checkSubclass()
-  {
-    // Disable the check that prevents subclassing of SWT components
-  }
-
-  public static void getCircleRegion(Region region, int r, int offsetX, int offsetY)
-  {
-    int[] polygon = new int[8 * r + 4];
-    // x^2 + y^2 = r^2
-    for (int i = 0; i < 2 * r + 1; i++)
-    {
-      int x = i - r;
-      int y = (int) Math.sqrt(r * r - x * x);
-      polygon[2 * i] = offsetX + x;
-      polygon[2 * i + 1] = offsetY + y;
-      polygon[8 * r - 2 * i - 2] = offsetX + x;
-      polygon[8 * r - 2 * i - 1] = offsetY - y;
-    }
-    region.add(polygon);
-  }
-
-  public static void drawRoundFrame(GC gc, int width, int height)
-  {
-    Rectangle tmpClippingRect = gc.getClipping();
-    Region reg = new Region();
-    gc.getClipping(reg);
-    Region roundReg = new Region();
-    getRegionForRoundRectangle(roundReg, 1, 1, width, height, RADIUS_OF_ROUND_EDGES - 1);
-    reg.subtract(roundReg);
-    gc.setClipping(reg);
-    gc.fillRectangle(0, 0, width + 1, height + 1);
-    reg.dispose();
-    roundReg.dispose();
-    gc.setClipping(tmpClippingRect);
-  }
-
-  public static void loadPath(Region region, float[] points, byte[] types)
-  {
-    int start = 0, end = 0;
-    for (int i = 0; i < types.length; i++)
-    {
-      switch (types[i])
-      {
-        case SWT.PATH_MOVE_TO:
-        {
-          if (start != end)
-          {
-            int n = 0;
-            int[] temp = new int[end - start];
-            for (int k = start; k < end; k++)
-            {
-              temp[n++] = Math.round(points[k]);
-            }
-            region.add(temp);
-          }
-          start = end;
-          end += 2;
-          break;
-        }
-        case SWT.PATH_LINE_TO:
-        {
-          end += 2;
-          break;
-        }
-        case SWT.PATH_CLOSE:
-        {
-          if (start != end)
-          {
-            int n = 0;
-            int[] temp = new int[end - start];
-            for (int k = start; k < end; k++)
-            {
-              temp[n++] = Math.round(points[k]);
-            }
-            region.add(temp);
-          }
-          start = end;
-          break;
-        }
-      }
-    }
-  }
-
-  public static Path getPathForRoundRectangle(int x, int y, int width, int height, int r)
-  {
-    Path path = new Path(Display.getDefault());
-    path.addArc(x, y, 2 * r, 2 * r, 0, 360);
-    path.addArc(width - 2 * r, y, 2 * r, 2 * r, 0, 360);
-    path.addArc(x, height - 2 * r, 2 * r, 2 * r, 0, 360);
-    path.addArc(width - 2 * r, height - 2 * r, 2 * r, 2 * r, 0, 360);
-    path.addRectangle(x, r - y, width - x, height - 2 * r);
-    path.addRectangle(r - x, y, width - 2 * r, height - y);
-    Path path2 = new Path(Display.getDefault(), path, 0.0001f);
-    path.dispose();
-    return path2;
-  }
-
-  public static void drawRoundRectangleByPath(GC gc, int x, int y, int width, int height)
-  {
-    Path path = getPathForRoundRectangle(x, y, width, height, RADIUS_OF_ROUND_EDGES - 1);
-    gc.drawPath(path);
-    path.dispose();
-  }
-
-  public static void getRegionForRoundRectangle(Region reg, int x, int y, int width, int height, int r)
-  {
-    Path tmpPath = getPathForRoundRectangle(x, y, width, height, r);
-    PathData data = tmpPath.getPathData();
-    tmpPath.dispose();
-    loadPath(reg, data.points, data.types);
-  }
-}
\ No newline at end of file