Skip to content

[GTK4] Guard new dialog API behind a 4.10 version check #1793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2025
Merged

[GTK4] Guard new dialog API behind a 4.10 version check #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 1 addition & 129 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2024 IBM Corporation and others.
* Copyright (c) 2000, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -780,16 +780,6 @@ JNIEXPORT jboolean JNICALL GTK3_NATIVE(gtk_1events_1pending)
}
#endif

#ifndef NO_gtk_1file_1chooser_1add_1filter
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1add_1filter)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
GTK3_NATIVE_ENTER(env, that, gtk_1file_1chooser_1add_1filter_FUNC);
gtk_file_chooser_add_filter((GtkFileChooser *)arg0, (GtkFileFilter *)arg1);
GTK3_NATIVE_EXIT(env, that, gtk_1file_1chooser_1add_1filter_FUNC);
}
#endif

#ifndef NO_gtk_1file_1chooser_1get_1filename
JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1file_1chooser_1get_1filename)
(JNIEnv *env, jclass that, jlong arg0)
Expand All @@ -814,18 +804,6 @@ JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1file_1chooser_1get_1filenames)
}
#endif

#ifndef NO_gtk_1file_1chooser_1get_1filter
JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1file_1chooser_1get_1filter)
(JNIEnv *env, jclass that, jlong arg0)
{
jlong rc = 0;
GTK3_NATIVE_ENTER(env, that, gtk_1file_1chooser_1get_1filter_FUNC);
rc = (jlong)gtk_file_chooser_get_filter((GtkFileChooser *)arg0);
GTK3_NATIVE_EXIT(env, that, gtk_1file_1chooser_1get_1filter_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1file_1chooser_1get_1uri
JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1file_1chooser_1get_1uri)
(JNIEnv *env, jclass that, jlong arg0)
Expand All @@ -850,36 +828,6 @@ JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1file_1chooser_1get_1uris)
}
#endif

#ifndef NO_gtk_1file_1chooser_1native_1new
JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1file_1chooser_1native_1new)
(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4)
{
jbyte *lparg0=NULL;
jbyte *lparg3=NULL;
jbyte *lparg4=NULL;
jlong rc = 0;
GTK3_NATIVE_ENTER(env, that, gtk_1file_1chooser_1native_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
/*
rc = (jlong)gtk_file_chooser_native_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)lparg3, (const gchar *)lparg4);
*/
{
GTK3_LOAD_FUNCTION(fp, gtk_file_chooser_native_new)
if (fp) {
rc = (jlong)((jlong (CALLING_CONVENTION*)(const gchar *, GtkWindow *, jint, const gchar *, const gchar *))fp)((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)lparg3, (const gchar *)lparg4);
}
}
fail:
if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, JNI_ABORT);
if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, JNI_ABORT);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
GTK3_NATIVE_EXIT(env, that, gtk_1file_1chooser_1native_1new_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1current_1folder
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1current_1folder)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
Expand All @@ -904,20 +852,6 @@ JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1current_1folder_1uri
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1current_1name
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1current_1name)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
GTK3_NATIVE_ENTER(env, that, gtk_1file_1chooser_1set_1current_1name_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
gtk_file_chooser_set_current_name((GtkFileChooser *)arg0, (const gchar *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
GTK3_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1current_1name_FUNC);
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1do_1overwrite_1confirmation
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1do_1overwrite_1confirmation)
(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
Expand Down Expand Up @@ -948,16 +882,6 @@ JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1filename)
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1filter
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1filter)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
GTK3_NATIVE_ENTER(env, that, gtk_1file_1chooser_1set_1filter_FUNC);
gtk_file_chooser_set_filter((GtkFileChooser *)arg0, (GtkFileFilter *)arg1);
GTK3_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1filter_FUNC);
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1local_1only
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1local_1only)
(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
Expand All @@ -968,16 +892,6 @@ JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1local_1only)
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1select_1multiple
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1select_1multiple)
(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
{
GTK3_NATIVE_ENTER(env, that, gtk_1file_1chooser_1set_1select_1multiple_FUNC);
gtk_file_chooser_set_select_multiple((GtkFileChooser *)arg0, (gboolean)arg1);
GTK3_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1select_1multiple_FUNC);
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1uri
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1uri)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
Expand All @@ -992,48 +906,6 @@ JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1file_1chooser_1set_1uri)
}
#endif

#ifndef NO_gtk_1font_1chooser_1dialog_1new
JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1font_1chooser_1dialog_1new)
(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1)
{
jbyte *lparg0=NULL;
jlong rc = 0;
GTK3_NATIVE_ENTER(env, that, gtk_1font_1chooser_1dialog_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
rc = (jlong)gtk_font_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
GTK3_NATIVE_EXIT(env, that, gtk_1font_1chooser_1dialog_1new_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1font_1chooser_1get_1font
JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1font_1chooser_1get_1font)
(JNIEnv *env, jclass that, jlong arg0)
{
jlong rc = 0;
GTK3_NATIVE_ENTER(env, that, gtk_1font_1chooser_1get_1font_FUNC);
rc = (jlong)gtk_font_chooser_get_font((GtkFontChooser *)arg0);
GTK3_NATIVE_EXIT(env, that, gtk_1font_1chooser_1get_1font_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1font_1chooser_1set_1font
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1font_1chooser_1set_1font)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
GTK3_NATIVE_ENTER(env, that, gtk_1font_1chooser_1set_1font_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
gtk_font_chooser_set_font((GtkFontChooser *)arg0, (const gchar *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
GTK3_NATIVE_EXIT(env, that, gtk_1font_1chooser_1set_1font_FUNC);
}
#endif

#ifndef NO_gtk_1frame_1set_1shadow_1type
JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1frame_1set_1shadow_1type)
(JNIEnv *env, jclass that, jlong arg0, jint arg1)
Expand Down
11 changes: 1 addition & 10 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2024 IBM Corporation and others.
* Copyright (c) 2000, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -88,26 +88,17 @@ typedef enum {
gtk_1event_1box_1new_FUNC,
gtk_1event_1controller_1handle_1event_FUNC,
gtk_1events_1pending_FUNC,
gtk_1file_1chooser_1add_1filter_FUNC,
gtk_1file_1chooser_1get_1filename_FUNC,
gtk_1file_1chooser_1get_1filenames_FUNC,
gtk_1file_1chooser_1get_1filter_FUNC,
gtk_1file_1chooser_1get_1uri_FUNC,
gtk_1file_1chooser_1get_1uris_FUNC,
gtk_1file_1chooser_1native_1new_FUNC,
gtk_1file_1chooser_1set_1current_1folder_FUNC,
gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC,
gtk_1file_1chooser_1set_1current_1name_FUNC,
gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC,
gtk_1file_1chooser_1set_1extra_1widget_FUNC,
gtk_1file_1chooser_1set_1filename_FUNC,
gtk_1file_1chooser_1set_1filter_FUNC,
gtk_1file_1chooser_1set_1local_1only_FUNC,
gtk_1file_1chooser_1set_1select_1multiple_FUNC,
gtk_1file_1chooser_1set_1uri_FUNC,
gtk_1font_1chooser_1dialog_1new_FUNC,
gtk_1font_1chooser_1get_1font_FUNC,
gtk_1font_1chooser_1set_1font_FUNC,
gtk_1frame_1set_1shadow_1type_FUNC,
gtk_1gesture_1drag_1new_FUNC,
gtk_1gesture_1rotate_1new_FUNC,
Expand Down
48 changes: 48 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,54 @@ JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1expander_1set_1child)
}
#endif

#ifndef NO_gtk_1file_1chooser_1get_1file
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1file_1chooser_1get_1file)
(JNIEnv *env, jclass that, jlong arg0)
{
jlong rc = 0;
GTK4_NATIVE_ENTER(env, that, gtk_1file_1chooser_1get_1file_FUNC);
rc = (jlong)gtk_file_chooser_get_file((GtkFileChooser *)arg0);
GTK4_NATIVE_EXIT(env, that, gtk_1file_1chooser_1get_1file_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1file_1chooser_1get_1files
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1file_1chooser_1get_1files)
(JNIEnv *env, jclass that, jlong arg0)
{
jlong rc = 0;
GTK4_NATIVE_ENTER(env, that, gtk_1file_1chooser_1get_1files_FUNC);
rc = (jlong)gtk_file_chooser_get_files((GtkFileChooser *)arg0);
GTK4_NATIVE_EXIT(env, that, gtk_1file_1chooser_1get_1files_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1current_1folder
JNIEXPORT jboolean JNICALL GTK4_NATIVE(gtk_1file_1chooser_1set_1current_1folder)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
jboolean rc = 0;
GTK4_NATIVE_ENTER(env, that, gtk_1file_1chooser_1set_1current_1folder_FUNC);
rc = (jboolean)gtk_file_chooser_set_current_folder((GtkFileChooser *)arg0, (GFile *)arg1, (GError **)arg2);
GTK4_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1current_1folder_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1file_1chooser_1set_1file
JNIEXPORT jboolean JNICALL GTK4_NATIVE(gtk_1file_1chooser_1set_1file)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
jboolean rc = 0;
GTK4_NATIVE_ENTER(env, that, gtk_1file_1chooser_1set_1file_FUNC);
rc = (jboolean)gtk_file_chooser_set_file((GtkFileChooser *)arg0, (GFile *)arg1, (GError **)arg2);
GTK4_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1file_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1file_1dialog_1get_1default_1filter
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1file_1dialog_1get_1default_1filter)
(JNIEnv *env, jclass that, jlong arg0)
Expand Down
4 changes: 4 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ typedef enum {
gtk_1event_1controller_1motion_1new_FUNC,
gtk_1event_1controller_1scroll_1new_FUNC,
gtk_1expander_1set_1child_FUNC,
gtk_1file_1chooser_1get_1file_FUNC,
gtk_1file_1chooser_1get_1files_FUNC,
gtk_1file_1chooser_1set_1current_1folder_FUNC,
gtk_1file_1chooser_1set_1file_FUNC,
gtk_1file_1dialog_1get_1default_1filter_FUNC,
gtk_1file_1dialog_1new_FUNC,
gtk_1file_1dialog_1open_FUNC,
Expand Down
Loading
Loading