diff options
| author | Eric Williams | 2018-01-17 17:09:15 +0000 |
|---|---|---|
| committer | Eric Williams | 2018-01-17 17:41:37 +0000 |
| commit | d88da66379385cdf0365a99e2990a60daf96864e (patch) | |
| tree | 41d893a815200419ac9db7d2b3a878b1b611ef16 /bundles/org.eclipse.swt/Eclipse SWT PI/gtk | |
| parent | b604b5bff36ee1e1907249135a76eb97ba7a525f (diff) | |
| download | eclipse.platform.swt-d88da66379385cdf0365a99e2990a60daf96864e.tar.gz eclipse.platform.swt-d88da66379385cdf0365a99e2990a60daf96864e.tar.xz eclipse.platform.swt-d88da66379385cdf0365a99e2990a60daf96864e.zip | |
Bug 528284: [GTK3] Toolbar: TCF dropdown control is cutoff
Fix casting in OS.java.
Change-Id: I470bd08d636945360f32c81c8a6b9a433db0837e
Signed-off-by: Eric Williams <ericwill@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 282f8fd346..d6b860ef94 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -7746,7 +7746,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1set_1image) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { OS_NATIVE_ENTER(env, that, _1gtk_1button_1set_1image_FUNC); - gtk_button_set_image(arg0, arg1); + gtk_button_set_image((GtkButton *)arg0, (GtkWidget *)arg1); OS_NATIVE_EXIT(env, that, _1gtk_1button_1set_1image_FUNC); } #endif 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 3fa2ede5c6..db7a6fce50 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 @@ -6180,11 +6180,15 @@ public static final long /*int*/ gtk_button_new() { lock.unlock(); } } -public static final native void /*int*/ _gtk_button_set_image(long /*int*/ handle, long /*int*/ image); -public static final void /*int*/ gtk_button_set_image(long /*int*/ handle, long /*int*/ image) { +/** + * @param button cast=(GtkButton *) + * @param image cast=(GtkWidget *) + */ +public static final native void /*int*/ _gtk_button_set_image(long /*int*/ button, long /*int*/ image); +public static final void /*int*/ gtk_button_set_image(long /*int*/ button, long /*int*/ image) { lock.lock(); try { - _gtk_button_set_image(handle, image); + _gtk_button_set_image(button, image); } finally { lock.unlock(); } |