diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-10-24 23:23:17 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-10-24 23:23:17 -0400 |
| commit | 1ab4044727ad930e345a85a32c46889da6d91842 (patch) | |
| tree | 7530d36c02374b70ae155ed5155ad98e3c5b3326 | |
| parent | 90abd07e85821e6a6e5e8eb7ebe8d2f776eb6ae7 (diff) | |
| download | eclipse.platform.swt-1ab4044727ad930e345a85a32c46889da6d91842.tar.gz eclipse.platform.swt-1ab4044727ad930e345a85a32c46889da6d91842.tar.xz eclipse.platform.swt-1ab4044727ad930e345a85a32c46889da6d91842.zip | |
GdkEventExpose has is binary compatible between GTK2 and GTK3 - just remove casting
3 files changed, 2 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h index ac351f3c64..d9c4ed821a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h @@ -132,7 +132,6 @@ #define NO_GTK_1TEXTVIEW_1IM_1CONTEXT #define NO_GTK_1WIDGET_1REQUISITION_1HEIGHT #define NO_GTK_1WIDGET_1REQUISITION_1WIDTH -#define NO_GdkEventExpose #define NO_GdkWindowAttr #define NO_GtkAdjustment #define NO_GtkFixed diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c index 40e81e0df8..08c027f0cc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c @@ -529,7 +529,7 @@ GdkEventExpose *getGdkEventExposeFields(JNIEnv *env, jobject lpObject, GdkEventE lpStruct->area.y = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_y); lpStruct->area.width = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_width); lpStruct->area.height = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_height); - lpStruct->region = (GdkRegion *)(*env)->GetIntLongField(env, lpObject, GdkEventExposeFc.region); + lpStruct->region = (void *)(*env)->GetIntLongField(env, lpObject, GdkEventExposeFc.region); lpStruct->count = (gint)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.count); return lpStruct; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java index d54b41d851..0d594f66ac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java @@ -28,7 +28,7 @@ public class GdkEventExpose extends GdkEvent { public int area_width; /** @field accessor=area.height */ public int area_height; - /** @field cast=(GdkRegion *) */ + /** @field cast=(void *) */ public long /*int*/ region; /** @field cast=(gint) */ public int count; |