Fix 32/64 bit warnings and minor formatting
Change-Id: I6ae65ac991c7a0a385089551c542849030bbb56b
Signed-off-by: Arun Thondapu <arunkumar.thondapu@in.ibm.com>
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 ec9a008..07ca890 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
@@ -3162,11 +3162,11 @@
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth () - event.width - event.x;
GCData data = new GCData ();
// data.damageRgn = gdkEvent.region;
- if (OS.GTK_VERSION <= OS.VERSION(3, 9, 0)) {
+ if (OS.GTK_VERSION <= OS.VERSION (3, 9, 0)) {
data.cairo = cairo;
}
GC gc = event.gc = GC.gtk_new (this, data);
- gc.setClipping(rect.x, rect.y, rect.width, rect.height);
+ gc.setClipping (rect.x, rect.y, rect.width, rect.height);
drawWidget (gc);
sendEvent (SWT.Paint, event);
gc.dispose ();
@@ -5484,7 +5484,7 @@
GdkRectangle rect = new GdkRectangle ();
OS.gdk_cairo_get_clip_rectangle (cairo, rect);
if (control == null) control = this;
- long window = OS.gtk_widget_get_window(handle);
+ long /*int*/ window = OS.gtk_widget_get_window (handle);
if (window != 0) {
drawBackground (control, window, 0, 0, rect.x, rect.y, rect.width, rect.height);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
index e1092f8..21e7790 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
@@ -2056,13 +2056,13 @@
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
if (OS.GTK3) {
- if (OS.GTK_VERSION >= OS.VERSION(3, 9, 0) && OS.GTK_IS_CONTAINER(handle)) {
- return gtk_draw(handle, arg0);
+ if (OS.GTK_VERSION >= OS.VERSION (3, 9, 0) && OS.GTK_IS_CONTAINER (handle)) {
+ return gtk_draw (handle, arg0);
}
} else {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
- long /*int*/ paintWindow = paintWindow();
+ long /*int*/ paintWindow = paintWindow ();
long /*int*/ window = gdkEvent.window;
if (window != paintWindow) return 0;
return (state & OBSCURED) != 0 ? 1 : 0;
@@ -2084,9 +2084,9 @@
case EVENT_AFTER: return gtk_event_after (handle, arg0);
case EXPOSE_EVENT: {
if (OS.GTK3) {
- if (OS.GTK_VERSION < OS.VERSION(3, 9, 0) || !OS.GTK_IS_CONTAINER(handle)) {
- return gtk_draw(handle, arg0);
- }
+ if (OS.GTK_VERSION < OS.VERSION (3, 9, 0) || !OS.GTK_IS_CONTAINER (handle)) {
+ return gtk_draw (handle, arg0);
+ }
} else {
return gtk_expose_event (handle, arg0);
}
