Use gtk_widget_set_visible instead of gtk_widget_hide/show

Use the old native method as a wrapper that redirects to GTK3/4

Author: fedejeanne

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c

@@ -7,9 +7,6 @@
  * https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 
 /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
@@ -2275,6 +2272,16 @@ JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1widget_1get_1window)
 }
 #endif
 
+#ifndef NO_gtk_1widget_1hide
+JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1hide)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	GTK3_NATIVE_ENTER(env, that, gtk_1widget_1hide_FUNC);
+	gtk_widget_hide((GtkWidget *)arg0);
+	GTK3_NATIVE_EXIT(env, that, gtk_1widget_1hide_FUNC);
+}
+#endif
+
 #ifndef NO_gtk_1widget_1input_1shape_1combine_1region
 JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1input_1shape_1combine_1region)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
@@ -2408,6 +2415,16 @@ JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1shape_1combine_1region)
 }
 #endif
 
+#ifndef NO_gtk_1widget_1show
+JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1show)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	GTK3_NATIVE_ENTER(env, that, gtk_1widget_1show_FUNC);
+	gtk_widget_show((GtkWidget *)arg0);
+	GTK3_NATIVE_EXIT(env, that, gtk_1widget_1show_FUNC);
+}
+#endif
+
 #ifndef NO_gtk_1widget_1size_1allocate
 JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1widget_1size_1allocate)
 	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h

@@ -7,9 +7,6 @@
  * https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 
 /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
@@ -209,6 +206,7 @@ typedef enum {
 	gtk_1widget_1get_1screen_FUNC,
 	gtk_1widget_1get_1toplevel_FUNC,
 	gtk_1widget_1get_1window_FUNC,
+	gtk_1widget_1hide_FUNC,
 	gtk_1widget_1input_1shape_1combine_1region_FUNC,
 	gtk_1widget_1override_1font_FUNC,
 	gtk_1widget_1remove_1accelerator_FUNC,
@@ -221,6 +219,7 @@ typedef enum {
 	gtk_1widget_1set_1parent_1window_FUNC,
 	gtk_1widget_1set_1redraw_1on_1allocate_FUNC,
 	gtk_1widget_1shape_1combine_1region_FUNC,
+	gtk_1widget_1show_FUNC,
 	gtk_1widget_1size_1allocate_FUNC,
 	gtk_1widget_1style_1get__J_3B_3IJ_FUNC,
 	gtk_1widget_1style_1get__J_3B_3JJ_FUNC,

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c

@@ -7,9 +7,6 @@
  * https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 
 /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
@@ -2222,6 +2219,16 @@ JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1widget_1set_1focusable)
 }
 #endif
 
+#ifndef NO_gtk_1widget_1set_1visible
+JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1widget_1set_1visible)
+	(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
+{
+	GTK4_NATIVE_ENTER(env, that, gtk_1widget_1set_1visible_FUNC);
+	gtk_widget_set_visible(arg0, arg1);
+	GTK4_NATIVE_EXIT(env, that, gtk_1widget_1set_1visible_FUNC);
+}
+#endif
+
 #ifndef NO_gtk_1widget_1size_1allocate
 JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1widget_1size_1allocate)
 	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h

@@ -7,9 +7,6 @@
  * https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
  *******************************************************************************/
 
 /* Note: This file was auto-generated by org.eclipse.swt.tools.internal.JNIGenerator */
@@ -184,6 +181,7 @@ typedef enum {
 	gtk_1widget_1pick_FUNC,
 	gtk_1widget_1set_1cursor_FUNC,
 	gtk_1widget_1set_1focusable_FUNC,
+	gtk_1widget_1set_1visible_FUNC,
 	gtk_1widget_1size_1allocate_FUNC,
 	gtk_1widget_1snapshot_1child_FUNC,
 	gtk_1widget_1translate_1coordinates_FUNC,

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c

@@ -9352,16 +9352,6 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1widget_1has_1focus)
 }
 #endif
 
-#ifndef NO_gtk_1widget_1hide
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1hide)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1widget_1hide_FUNC);
-	gtk_widget_hide((GtkWidget *)arg0);
-	GTK_NATIVE_EXIT(env, that, gtk_1widget_1hide_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1widget_1insert_1action_1group
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1insert_1action_1group)
 	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2)
@@ -9680,16 +9670,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1visible)
 }
 #endif
 
-#ifndef NO_gtk_1widget_1show
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1show)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1widget_1show_FUNC);
-	gtk_widget_show((GtkWidget *)arg0);
-	GTK_NATIVE_EXIT(env, that, gtk_1widget_1show_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1widget_1unparent
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1unparent)
 	(JNIEnv *env, jclass that, jlong arg0)

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h

@@ -748,7 +748,6 @@ typedef enum {
 	gtk_1widget_1grab_1focus_FUNC,
 	gtk_1widget_1has_1default_FUNC,
 	gtk_1widget_1has_1focus_FUNC,
-	gtk_1widget_1hide_FUNC,
 	gtk_1widget_1insert_1action_1group_FUNC,
 	gtk_1widget_1is_1focus_FUNC,
 	gtk_1widget_1mnemonic_1activate_FUNC,
@@ -774,7 +773,6 @@ typedef enum {
 	gtk_1widget_1set_1valign_FUNC,
 	gtk_1widget_1set_1vexpand_FUNC,
 	gtk_1widget_1set_1visible_FUNC,
-	gtk_1widget_1show_FUNC,
 	gtk_1widget_1unparent_FUNC,
 	gtk_1window_1fullscreen_FUNC,
 	gtk_1window_1get_1default_1size_FUNC,

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java

@@ -14,6 +14,8 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.gtk;
 
+import org.eclipse.swt.internal.gtk3.*;
+
 /**
  * This class contains GTK specific native functions.
  *
@@ -2340,8 +2342,11 @@ public class GTK extends OS {
 	public static final native void gtk_widget_grab_focus(long widget);
 	/** @param widget cast=(GtkWidget *) */
 	public static final native boolean gtk_widget_has_focus(long widget);
-	/** @param widget cast=(GtkWidget *) */
-	public static final native void gtk_widget_hide(long widget);
+
+	public static final void gtk_widget_hide(long widget) {
+		if (GTK4) org.eclipse.swt.internal.gtk4.GTK4.gtk_widget_set_visible(widget, false);
+		else GTK3.gtk_widget_hide(widget);
+	}
 	/** @param widget cast=(GtkWidget *) */
 	public static final native boolean gtk_widget_is_focus(long widget);
 	/** @param widget cast=(GtkWidget *) */
@@ -2399,8 +2404,11 @@ public class GTK extends OS {
 	 * @param height cast=(gint)
 	 */
 	public static final native void gtk_widget_set_size_request(long widget, int width, int height);
-	/** @param widget cast=(GtkWidget *) */
-	public static final native void gtk_widget_show(long widget);
+
+	public static final void gtk_widget_show(long widget) {
+		if (GTK4) org.eclipse.swt.internal.gtk4.GTK4.gtk_widget_set_visible(widget, true);
+		else GTK3.gtk_widget_show(widget);
+	}
 	/** @param widget cast=(GtkWidget *) */
 	public static final native boolean gtk_widget_activate(long widget);
 	/** @param widget cast=(GtkWidget *) */

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java

@@ -1089,5 +1089,9 @@ public class GTK3 {
 	public static final native int GdkEventWindowState_sizeof();
 	public static final native int GdkGeometry_sizeof();
 	public static final native int GdkWindowAttr_sizeof();
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void gtk_widget_show(long widget);
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void gtk_widget_hide(long widget);
 
 }

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk4/GTK4.java

@@ -658,6 +658,8 @@ public class GTK4 {
 	public static final native void gtk_widget_set_focusable(long widget, boolean focusable);
 	/** @param widget cast=(GtkWidget *) */
 	public static final native long gtk_widget_get_clipboard(long widget);
+
+	public static final native void gtk_widget_set_visible(long widget, boolean v);
 	/**
 	 * @param widget cast=(GtkWidget *)
 	 * @param allocation cast=(GtkAllocation *),flags=no_out