fixing line style and arc param name
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 8f166d2..bcbf2ba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -113,7 +113,6 @@
public static final int GDK_LEAVE_NOTIFY_MASK = 0x2000;
public static final int GDK_LEFT_PTR = 0x44;
public static final int GDK_LEFT_SIDE = 0x46;
- public static final int GDK_LINE_DOUBLE_DASH = 0x2;
public static final int GDK_LINE_ON_OFF_DASH = 0x1;
public static final int GDK_LINE_SOLID = 0x0;
public static final int GDK_Linefeed = 0xff0A;
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 da04471..ea3e19c 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
@@ -245,7 +245,7 @@
* <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
* </ul>
*/
-public void drawArc(int x, int y, int width, int height, int startAngle, int endAngle) {
+public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (width < 0) {
x = x + width;
@@ -255,10 +255,10 @@
y = y + height;
height = -height;
}
- if (width == 0 || height == 0 || endAngle == 0) {
+ if (width == 0 || height == 0 || arcAngle == 0) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
- OS.gdk_draw_arc(data.drawable, handle, 0, x, y, width, height, startAngle * 64, endAngle * 64);
+ OS.gdk_draw_arc(data.drawable, handle, 0, x, y, width, height, startAngle * 64, arcAngle * 64);
}
/**
@@ -991,7 +991,7 @@
*
* @see #drawArc
*/
-public void fillArc(int x, int y, int width, int height, int startAngle, int endAngle) {
+public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (width < 0) {
x = x + width;
@@ -1001,7 +1001,7 @@
y = y + height;
height = -height;
}
- if (width == 0 || height == 0 || endAngle == 0) {
+ if (width == 0 || height == 0 || arcAngle == 0) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
GdkGCValues values = new GdkGCValues();
@@ -1009,7 +1009,7 @@
GdkColor color = new GdkColor();
color.pixel = values.background_pixel;
OS.gdk_gc_set_foreground(handle, color);
- OS.gdk_draw_arc(data.drawable, handle, 1, x, y, width, height, startAngle * 64, endAngle * 64);
+ OS.gdk_draw_arc(data.drawable, handle, 1, x, y, width, height, startAngle * 64, arcAngle * 64);
color.pixel = values.foreground_pixel;
OS.gdk_gc_set_foreground(handle, color);
}
@@ -1758,13 +1758,11 @@
*/
public void setLineStyle(int lineStyle) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- GdkGCValues values = new GdkGCValues();
- OS.gdk_gc_get_values(handle, values);
+ int line_style = OS.GDK_LINE_ON_OFF_DASH;
switch (lineStyle) {
case SWT.LINE_SOLID:
- data.lineStyle = lineStyle;
- OS.gdk_gc_set_line_attributes(handle, values.line_width, OS.GDK_LINE_SOLID, OS.GDK_CAP_BUTT, OS.GDK_JOIN_MITER);
- return;
+ line_style = OS.GDK_LINE_SOLID;
+ break;
case SWT.LINE_DASH:
OS.gdk_gc_set_dashes(handle, 0, new byte[] {6, 2}, 2);
break;
@@ -1781,7 +1779,9 @@
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
data.lineStyle = lineStyle;
- OS.gdk_gc_set_line_attributes(handle, values.line_width, OS.GDK_LINE_ON_OFF_DASH, OS.GDK_CAP_BUTT, OS.GDK_JOIN_MITER);
+ GdkGCValues values = new GdkGCValues();
+ OS.gdk_gc_get_values(handle, values);
+ OS.gdk_gc_set_line_attributes(handle, values.line_width, line_style, OS.GDK_CAP_BUTT, OS.GDK_JOIN_MITER);
}
/**
@@ -1798,11 +1798,8 @@
*/
public void setLineWidth(int width) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- if (data.lineStyle == SWT.LINE_SOLID) {
- OS.gdk_gc_set_line_attributes(handle, width, OS.GDK_LINE_SOLID, OS.GDK_CAP_BUTT, OS.GDK_JOIN_MITER);
- } else {
- OS.gdk_gc_set_line_attributes(handle, width, OS.GDK_LINE_DOUBLE_DASH, OS.GDK_CAP_BUTT, OS.GDK_JOIN_MITER);
- }
+ int line_style = data.lineStyle == SWT.LINE_SOLID ? OS.GDK_LINE_SOLID : OS.GDK_LINE_ON_OFF_DASH;
+ OS.gdk_gc_set_line_attributes(handle, width, line_style, OS.GDK_CAP_BUTT, OS.GDK_JOIN_MITER);
}
/**
