diff options
| author | Xi Yan | 2019-01-25 15:39:49 +0000 |
|---|---|---|
| committer | Xi Yan | 2019-01-25 15:39:49 +0000 |
| commit | d120090e99d9a3249fdca7227321d867b1995b65 (patch) | |
| tree | ca1f48b6425bdf2c3f8370bec0c89702045ce224 /bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library | |
| parent | b039f55b1d5df8a3d866ae1233c543dd6ade1788 (diff) | |
| download | eclipse.platform.swt-d120090e99d9a3249fdca7227321d867b1995b65.tar.gz eclipse.platform.swt-d120090e99d9a3249fdca7227321d867b1995b65.tar.xz eclipse.platform.swt-d120090e99d9a3249fdca7227321d867b1995b65.zip | |
Bug 540675 - [GTK4] Adapt to sizing machinery changes
Replace gtK_widget_get_preferred_height_for_width/width_for_height with
gtk_widget_measure for GTK4.
Change-Id: If5133b5a17200d3e3f9b7f8bf234dfdbc3d0f21a
Signed-off-by: Xi Yan <xixiyan@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library')
3 files changed, 25 insertions, 0 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 0a79e11d58..753a70a0ae 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 @@ -12676,6 +12676,29 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1map) } #endif +#ifndef NO__1gtk_1widget_1measure +JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1measure) + (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6) +{ + jint *lparg3=NULL; + jint *lparg4=NULL; + jint *lparg5=NULL; + jint *lparg6=NULL; + GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1measure_FUNC); + if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail; + if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail; + if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail; + gtk_widget_measure((GtkWidget *)arg0, arg1, arg2, lparg3, lparg4, lparg5, lparg6); +fail: + if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); + if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0); + if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0); + if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0); + GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1measure_FUNC); +} +#endif + #ifndef NO__1gtk_1widget_1mnemonic_1activate JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1mnemonic_1activate) (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c index cc4f8e54ea..0a29907f25 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c @@ -1142,6 +1142,7 @@ char * GTK_nativeFunctionNames[] = { "_1gtk_1widget_1input_1shape_1combine_1region", "_1gtk_1widget_1is_1focus", "_1gtk_1widget_1map", + "_1gtk_1widget_1measure", "_1gtk_1widget_1mnemonic_1activate", "_1gtk_1widget_1override_1background_1color", "_1gtk_1widget_1override_1color", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h index 365dad3bfe..55b2013aed 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h @@ -1140,6 +1140,7 @@ typedef enum { _1gtk_1widget_1input_1shape_1combine_1region_FUNC, _1gtk_1widget_1is_1focus_FUNC, _1gtk_1widget_1map_FUNC, + _1gtk_1widget_1measure_FUNC, _1gtk_1widget_1mnemonic_1activate_FUNC, _1gtk_1widget_1override_1background_1color_FUNC, _1gtk_1widget_1override_1color_FUNC, |