Skip to content

[GTK] Silence *Chooser APIs deprecations #2310

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
Jul 11, 2025
Merged

[GTK] Silence *Chooser APIs deprecations #2310

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
8 changes: 8 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 @@ -870,6 +870,7 @@ JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1expander_1set_1child)
#endif

#ifndef NO_gtk_1file_1chooser_1get_1file
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1file_1chooser_1get_1file)
(JNIEnv *env, jclass that, jlong arg0)
{
Expand All @@ -879,9 +880,11 @@ JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1file_1chooser_1get_1file)
GTK4_NATIVE_EXIT(env, that, gtk_1file_1chooser_1get_1file_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1chooser_1get_1files
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1file_1chooser_1get_1files)
(JNIEnv *env, jclass that, jlong arg0)
{
Expand All @@ -891,9 +894,11 @@ JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1file_1chooser_1get_1files)
GTK4_NATIVE_EXIT(env, that, gtk_1file_1chooser_1get_1files_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1chooser_1set_1current_1folder
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jboolean JNICALL GTK4_NATIVE(gtk_1file_1chooser_1set_1current_1folder)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
Expand All @@ -903,9 +908,11 @@ JNIEXPORT jboolean JNICALL GTK4_NATIVE(gtk_1file_1chooser_1set_1current_1folder)
GTK4_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1current_1folder_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1chooser_1set_1file
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jboolean JNICALL GTK4_NATIVE(gtk_1file_1chooser_1set_1file)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
{
Expand All @@ -915,6 +922,7 @@ JNIEXPORT jboolean JNICALL GTK4_NATIVE(gtk_1file_1chooser_1set_1file)
GTK4_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1file_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1dialog_1get_1default_1filter
Expand Down
28 changes: 28 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4079,16 +4079,19 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1check_1version)
#endif

#ifndef NO_gtk_1color_1chooser_1add_1palette
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1color_1chooser_1add_1palette)
(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4)
{
GTK_NATIVE_ENTER(env, that, gtk_1color_1chooser_1add_1palette_FUNC);
gtk_color_chooser_add_palette((GtkColorChooser *)arg0, (GtkOrientation)arg1, (gint)arg2, (gint)arg3, (GdkRGBA *)arg4);
GTK_NATIVE_EXIT(env, that, gtk_1color_1chooser_1add_1palette_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1color_1chooser_1dialog_1new
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1color_1chooser_1dialog_1new)
(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1)
{
Expand All @@ -4102,9 +4105,11 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1color_1chooser_1dialog_1new)
GTK_NATIVE_EXIT(env, that, gtk_1color_1chooser_1dialog_1new_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1color_1chooser_1get_1rgba
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1color_1chooser_1get_1rgba)
(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
{
Expand All @@ -4116,9 +4121,11 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1color_1chooser_1get_1rgba)
if (arg1 && lparg1) setGdkRGBAFields(env, arg1, lparg1);
GTK_NATIVE_EXIT(env, that, gtk_1color_1chooser_1get_1rgba_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1color_1chooser_1get_1use_1alpha
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1color_1chooser_1get_1use_1alpha)
(JNIEnv *env, jclass that, jlong arg0)
{
Expand All @@ -4128,9 +4135,11 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1color_1chooser_1get_1use_1alpha)
GTK_NATIVE_EXIT(env, that, gtk_1color_1chooser_1get_1use_1alpha_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1color_1chooser_1set_1rgba
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1color_1chooser_1set_1rgba)
(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
{
Expand All @@ -4142,16 +4151,19 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1color_1chooser_1set_1rgba)
if (arg1 && lparg1) setGdkRGBAFields(env, arg1, lparg1);
GTK_NATIVE_EXIT(env, that, gtk_1color_1chooser_1set_1rgba_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1color_1chooser_1set_1use_1alpha
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1color_1chooser_1set_1use_1alpha)
(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
{
GTK_NATIVE_ENTER(env, that, gtk_1color_1chooser_1set_1use_1alpha_FUNC);
gtk_color_chooser_set_use_alpha((GtkColorChooser *)arg0, (gboolean)arg1);
GTK_NATIVE_EXIT(env, that, gtk_1color_1chooser_1set_1use_1alpha_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1combo_1box_1get_1active
Expand Down Expand Up @@ -4730,16 +4742,19 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1expander_1set_1label_1widget)
#endif

#ifndef NO_gtk_1file_1chooser_1add_1filter
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1file_1chooser_1add_1filter)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
GTK_NATIVE_ENTER(env, that, gtk_1file_1chooser_1add_1filter_FUNC);
gtk_file_chooser_add_filter((GtkFileChooser *)arg0, (GtkFileFilter *)arg1);
GTK_NATIVE_EXIT(env, that, gtk_1file_1chooser_1add_1filter_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1chooser_1get_1filter
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1file_1chooser_1get_1filter)
(JNIEnv *env, jclass that, jlong arg0)
{
Expand All @@ -4749,6 +4764,7 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1file_1chooser_1get_1filter)
GTK_NATIVE_EXIT(env, that, gtk_1file_1chooser_1get_1filter_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1chooser_1native_1new
Expand Down Expand Up @@ -4782,6 +4798,7 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1file_1chooser_1native_1new)
#endif

#ifndef NO_gtk_1file_1chooser_1set_1current_1name
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1file_1chooser_1set_1current_1name)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
{
Expand All @@ -4793,26 +4810,31 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1file_1chooser_1set_1current_1name)
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
GTK_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1current_1name_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1chooser_1set_1filter
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1file_1chooser_1set_1filter)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
GTK_NATIVE_ENTER(env, that, gtk_1file_1chooser_1set_1filter_FUNC);
gtk_file_chooser_set_filter((GtkFileChooser *)arg0, (GtkFileFilter *)arg1);
GTK_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1filter_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1chooser_1set_1select_1multiple
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1file_1chooser_1set_1select_1multiple)
(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
{
GTK_NATIVE_ENTER(env, that, gtk_1file_1chooser_1set_1select_1multiple_FUNC);
gtk_file_chooser_set_select_multiple((GtkFileChooser *)arg0, (gboolean)arg1);
GTK_NATIVE_EXIT(env, that, gtk_1file_1chooser_1set_1select_1multiple_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1file_1filter_1add_1pattern
Expand Down Expand Up @@ -4868,6 +4890,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1file_1filter_1set_1name)
#endif

#ifndef NO_gtk_1font_1chooser_1dialog_1new
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1font_1chooser_1dialog_1new)
(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1)
{
Expand All @@ -4881,9 +4904,11 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1font_1chooser_1dialog_1new)
GTK_NATIVE_EXIT(env, that, gtk_1font_1chooser_1dialog_1new_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1font_1chooser_1get_1font
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1font_1chooser_1get_1font)
(JNIEnv *env, jclass that, jlong arg0)
{
Expand All @@ -4893,9 +4918,11 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1font_1chooser_1get_1font)
GTK_NATIVE_EXIT(env, that, gtk_1font_1chooser_1get_1font_FUNC);
return rc;
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1font_1chooser_1set_1font
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1font_1chooser_1set_1font)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
{
Expand All @@ -4907,6 +4934,7 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1font_1chooser_1set_1font)
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
GTK_NATIVE_EXIT(env, that, gtk_1font_1chooser_1set_1font_FUNC);
}
G_GNUC_END_IGNORE_DEPRECATIONS
#endif

#ifndef NO_gtk_1frame_1get_1label_1widget
Expand Down
22 changes: 20 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ public class GTK extends OS {

/* GtkColorChooser Interface */
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkColorChooser *)
* @param orientation cast=(GtkOrientation)
* @param colors_per_line cast=(gint)
Expand All @@ -482,25 +483,30 @@ public class GTK extends OS {
*/
public static final native void gtk_color_chooser_add_palette(long chooser, int orientation, int colors_per_line, int n_colors, long colors);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkColorChooser *)
* @param use_alpha cast=(gboolean)
*/
public static final native void gtk_color_chooser_set_use_alpha(long chooser, boolean use_alpha);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkColorChooser *)
*/
public static final native boolean gtk_color_chooser_get_use_alpha(long chooser);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkColorChooser *)
* @param color cast=(GdkRGBA *)
*/
public static final native void gtk_color_chooser_set_rgba(long chooser, GdkRGBA color);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkColorChooser *)
* @param color cast=(GdkRGBA *)
*/
public static final native void gtk_color_chooser_get_rgba(long chooser, GdkRGBA color);
/**
* @method flags=ignore_deprecations
* @param title cast=(const gchar *)
* @param parent cast=(GtkWindow *)
*/
Expand Down Expand Up @@ -703,23 +709,30 @@ public class GTK extends OS {

/* GtkFileChooser */
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
* @param filter cast=(GtkFileFilter *)
*/
public static final native void gtk_file_chooser_add_filter(long chooser, long filter);
/** @param chooser cast=(GtkFileChooser *) */
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
*/
public static final native long gtk_file_chooser_get_filter(long chooser);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
* @param name cast=(const gchar *)
*/
public static final native void gtk_file_chooser_set_current_name(long chooser, byte[] name);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
* @param filter cast=(GtkFileFilter *)
*/
public static final native void gtk_file_chooser_set_filter(long chooser, long filter);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
* @param select_multiple cast=(gboolean)
*/
Expand Down Expand Up @@ -812,15 +825,20 @@ public class GTK extends OS {

/* GtkFontChooserDialog */
/**
* @method flags=ignore_deprecations
* @param title cast=(const gchar *)
* @param parent cast=(GtkWindow *)
*/
public static final native long gtk_font_chooser_dialog_new(byte[] title, long parent);

/* GtkFontChooser Interface */
/** @param fontchooser cast=(GtkFontChooser *) */
/**
* @method flags=ignore_deprecations
* @param fontchooser cast=(GtkFontChooser *)
*/
public static final native long gtk_font_chooser_get_font(long fontchooser);
/**
* @method flags=ignore_deprecations
* @param fsd cast=(GtkFontChooser *)
* @param fontname cast=(const gchar *)
*/
Expand Down
12 changes: 10 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk4/GTK4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,25 @@ public class GTK4 {
public static final native long gdk_content_formats_builder_free_to_formats(long builder);

/* GtkFileChooser */
/** @param chooser cast=(GtkFileChooser *) */
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
*/
public static final native long gtk_file_chooser_get_files(long chooser);
/** @param chooser cast=(GtkFileChooser *) */
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
*/
public static final native long gtk_file_chooser_get_file(long chooser);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
* @param file cast=(GFile *)
* @param error cast=(GError **)
*/
public static final native boolean gtk_file_chooser_set_current_folder(long chooser, long file, long error);
/**
* @method flags=ignore_deprecations
* @param chooser cast=(GtkFileChooser *)
* @param file cast=(GFile *)
* @param error cast=(GError **)
Expand Down
Loading