summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT Theme
diff options
context:
space:
mode:
authorArun Thondapu <arunkumar.thondapu@in.ibm.com>2012-10-29 18:42:50 +0530
committerArun Thondapu <arunkumar.thondapu@in.ibm.com>2012-10-29 18:42:50 +0530
commitc721692e5dcfce6418ad18b09e8c08689848a34e (patch)
tree46419a779d2edd219c188664a3e6c05b09dcdc0e /bundles/org.eclipse.swt/Eclipse SWT Theme
parenta5d74e982d75f01573494e0517f943b706533c50 (diff)
downloadeclipse.platform.swt-c721692e5dcfce6418ad18b09e8c08689848a34e.tar.gz
eclipse.platform.swt-c721692e5dcfce6418ad18b09e8c08689848a34e.tar.xz
eclipse.platform.swt-c721692e5dcfce6418ad18b09e8c08689848a34e.zip
Use macros to redefine gdk_region_XXX in terms of cairo_region_XXX in
Theme (was missed in earlier commit 21eb151f1a668a710645fe690cf473d0b86ddaf0)
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Theme')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java11
1 files changed, 0 insertions, 11 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java
index 70cd3ba21c..02bb6672cd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java
@@ -13,7 +13,6 @@ package org.eclipse.swt.internal.theme;
import org.eclipse.swt.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.internal.*;
-import org.eclipse.swt.internal.cairo.Cairo;
import org.eclipse.swt.internal.gtk.*;
public class Theme {
@@ -188,15 +187,9 @@ void transferClipping(GC gc, long /*int*/ style) {
long /*int*/ clipping = clipRgn;
if (damageRgn != 0) {
if (clipping != 0) {
- if (OS.GTK_VERSION >= OS.VERSION(3, 0, 0)) {
- clipping = Cairo.cairo_region_create ();
- Cairo.cairo_region_union (clipping, clipRgn);
- Cairo.cairo_region_intersect (clipping, damageRgn);
- } else {
clipping = OS.gdk_region_new();
OS.gdk_region_union (clipping, clipRgn);
OS.gdk_region_intersect (clipping, damageRgn);
- }
} else {
clipping = damageRgn;
}
@@ -226,11 +219,7 @@ void transferClipping(GC gc, long /*int*/ style) {
if (curGC[0] != 0) OS.gdk_gc_set_clip_region (curGC[0], clipping);
}
if (clipping != clipRgn && clipping != damageRgn) {
- if (OS.GTK_VERSION >= OS.VERSION(3, 0, 0)) {
- Cairo.cairo_region_destroy ( clipping);
- } else {
OS.gdk_region_destroy (clipping);
- }
}
}
}