Bug 570533 - [GTK4] Make separate GTK3.java and GTK4.java native
wrappers - GtkScale, GtkComboBox, GtkAccessibility

- GtkScale functions organized together
- Added GtkFileChooserNative comment header
- Moved GtkComboBox, GtkAccessibility to their respective GTK3 & GTK4
files

Change-Id: I6571c45ae6b555d03e42f081d517ed3557f1c0f7
Signed-off-by: Paul D'Pong <sdamrong@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/180012
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index c6f7c05..6eeb54a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -4542,10 +4542,10 @@
 	}
 
 	static void windowPoint (AccessibleObject object, int [] x, int [] y) {
-		long widget = GTK.gtk_accessible_get_widget(object.atkHandle);
+		long widget = GTK3.gtk_accessible_get_widget(object.atkHandle);
 		while (widget == 0 && object.parent != null) {
 			object = object.parent;
-			widget = GTK.gtk_accessible_get_widget(object.atkHandle);
+			widget = GTK3.gtk_accessible_get_widget(object.atkHandle);
 		}
 		if (widget == 0) return;
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c
index 1195e04..ae5e246 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.c
@@ -83,6 +83,18 @@
 }
 #endif
 
+#ifndef NO_gtk_1accessible_1get_1widget
+JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1accessible_1get_1widget)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jlong rc = 0;
+	GTK3_NATIVE_ENTER(env, that, gtk_1accessible_1get_1widget_FUNC);
+	rc = (jlong)gtk_accessible_get_widget((GtkAccessible *)arg0);
+	GTK3_NATIVE_EXIT(env, that, gtk_1accessible_1get_1widget_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_gtk_1bin_1get_1child
 JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1bin_1get_1child)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -285,6 +297,28 @@
 }
 #endif
 
+#ifndef NO_gtk_1combo_1box_1get_1wrap_1width
+JNIEXPORT jint JNICALL GTK3_NATIVE(gtk_1combo_1box_1get_1wrap_1width)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jint rc = 0;
+	GTK3_NATIVE_ENTER(env, that, gtk_1combo_1box_1get_1wrap_1width_FUNC);
+	rc = (jint)gtk_combo_box_get_wrap_width((GtkComboBox *)arg0);
+	GTK3_NATIVE_EXIT(env, that, gtk_1combo_1box_1get_1wrap_1width_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_gtk_1combo_1box_1set_1wrap_1width
+JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1combo_1box_1set_1wrap_1width)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
+{
+	GTK3_NATIVE_ENTER(env, that, gtk_1combo_1box_1set_1wrap_1width_FUNC);
+	gtk_combo_box_set_wrap_width((GtkComboBox *)arg0, (gint)arg1);
+	GTK3_NATIVE_EXIT(env, that, gtk_1combo_1box_1set_1wrap_1width_FUNC);
+}
+#endif
+
 #ifndef NO_gtk_1container_1add
 JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1container_1add)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
@@ -552,6 +586,18 @@
 }
 #endif
 
+#ifndef NO_gtk_1event_1box_1new
+JNIEXPORT jlong JNICALL GTK3_NATIVE(gtk_1event_1box_1new)
+	(JNIEnv *env, jclass that)
+{
+	jlong rc = 0;
+	GTK3_NATIVE_ENTER(env, that, gtk_1event_1box_1new_FUNC);
+	rc = (jlong)gtk_event_box_new();
+	GTK3_NATIVE_EXIT(env, that, gtk_1event_1box_1new_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_gtk_1event_1controller_1handle_1event
 JNIEXPORT void JNICALL GTK3_NATIVE(gtk_1event_1controller_1handle_1event)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.c
index 4516487..87c4035 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.c
@@ -26,6 +26,7 @@
 	"gtk_1accel_1label_1new",
 	"gtk_1accel_1label_1set_1accel",
 	"gtk_1accel_1label_1set_1accel_1widget",
+	"gtk_1accessible_1get_1widget",
 	"gtk_1bin_1get_1child",
 	"gtk_1box_1pack_1end",
 	"gtk_1box_1reorder_1child",
@@ -44,6 +45,8 @@
 	"gtk_1clipboard_1set_1with_1owner",
 	"gtk_1clipboard_1store",
 	"gtk_1clipboard_1wait_1for_1contents",
+	"gtk_1combo_1box_1get_1wrap_1width",
+	"gtk_1combo_1box_1set_1wrap_1width",
 	"gtk_1container_1add",
 	"gtk_1container_1forall",
 	"gtk_1container_1get_1border_1width",
@@ -68,6 +71,7 @@
 	"gtk_1entry_1set_1text",
 	"gtk_1entry_1set_1width_1chars",
 	"gtk_1entry_1text_1index_1to_1layout_1index",
+	"gtk_1event_1box_1new",
 	"gtk_1event_1controller_1handle_1event",
 	"gtk_1events_1pending",
 	"gtk_1file_1chooser_1get_1filename",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h
index a3aff73..43e6d51 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3_stats.h
@@ -36,6 +36,7 @@
 	gtk_1accel_1label_1new_FUNC,
 	gtk_1accel_1label_1set_1accel_FUNC,
 	gtk_1accel_1label_1set_1accel_1widget_FUNC,
+	gtk_1accessible_1get_1widget_FUNC,
 	gtk_1bin_1get_1child_FUNC,
 	gtk_1box_1pack_1end_FUNC,
 	gtk_1box_1reorder_1child_FUNC,
@@ -54,6 +55,8 @@
 	gtk_1clipboard_1set_1with_1owner_FUNC,
 	gtk_1clipboard_1store_FUNC,
 	gtk_1clipboard_1wait_1for_1contents_FUNC,
+	gtk_1combo_1box_1get_1wrap_1width_FUNC,
+	gtk_1combo_1box_1set_1wrap_1width_FUNC,
 	gtk_1container_1add_FUNC,
 	gtk_1container_1forall_FUNC,
 	gtk_1container_1get_1border_1width_FUNC,
@@ -78,6 +81,7 @@
 	gtk_1entry_1set_1text_FUNC,
 	gtk_1entry_1set_1width_1chars_FUNC,
 	gtk_1entry_1text_1index_1to_1layout_1index_FUNC,
+	gtk_1event_1box_1new_FUNC,
 	gtk_1event_1controller_1handle_1event_FUNC,
 	gtk_1events_1pending_FUNC,
 	gtk_1file_1chooser_1get_1filename_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c
index 4af4632..f2d396e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c
@@ -265,6 +265,18 @@
 }
 #endif
 
+#ifndef NO_gtk_1combo_1box_1get_1child
+JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1combo_1box_1get_1child)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jlong rc = 0;
+	GTK4_NATIVE_ENTER(env, that, gtk_1combo_1box_1get_1child_FUNC);
+	rc = (jlong)gtk_combo_box_get_child((GtkComboBox *)arg0);
+	GTK4_NATIVE_EXIT(env, that, gtk_1combo_1box_1get_1child_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_gtk_1drag_1source_1new
 JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1drag_1source_1new)
 	(JNIEnv *env, jclass that)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.c
index 44a16a3..509e07d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.c
@@ -43,6 +43,7 @@
 	"gtk_1check_1button_1set_1group",
 	"gtk_1check_1button_1set_1inconsistent",
 	"gtk_1check_1button_1set_1use_1underline",
+	"gtk_1combo_1box_1get_1child",
 	"gtk_1drag_1source_1new",
 	"gtk_1drag_1source_1set_1actions",
 	"gtk_1drag_1source_1set_1icon",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h
index 43b6cd9..34e2382 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h
@@ -53,6 +53,7 @@
 	gtk_1check_1button_1set_1group_FUNC,
 	gtk_1check_1button_1set_1inconsistent_FUNC,
 	gtk_1check_1button_1set_1use_1underline_FUNC,
+	gtk_1combo_1box_1get_1child_FUNC,
 	gtk_1drag_1source_1new_FUNC,
 	gtk_1drag_1source_1set_1actions_FUNC,
 	gtk_1drag_1source_1set_1icon_FUNC,
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 a1a2e63..0e7b607 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
@@ -3911,26 +3911,6 @@
 }
 #endif
 
-#ifndef NO_gtk_1accessible_1get_1widget
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1accessible_1get_1widget)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1accessible_1get_1widget_FUNC);
-/*
-	rc = (jlong)gtk_accessible_get_widget((GtkAccessible *)arg0);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_accessible_get_widget)
-		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkAccessible *))fp)((GtkAccessible *)arg0);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1accessible_1get_1widget_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1adjustment_1configure
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1adjustment_1configure)
 	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
@@ -4019,7 +3999,7 @@
 {
 	jlong rc = 0;
 	GTK_NATIVE_ENTER(env, that, gtk_1adjustment_1new_FUNC);
-	rc = (jlong)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, arg5);
+	rc = (jlong)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 	GTK_NATIVE_EXIT(env, that, gtk_1adjustment_1new_FUNC);
 	return rc;
 }
@@ -4455,26 +4435,6 @@
 }
 #endif
 
-#ifndef NO_gtk_1combo_1box_1get_1child
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1combo_1box_1get_1child)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1combo_1box_1get_1child_FUNC);
-/*
-	rc = (jlong)gtk_combo_box_get_child((GtkComboBox *)arg0);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_combo_box_get_child)
-		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(GtkComboBox *))fp)((GtkComboBox *)arg0);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1combo_1box_1get_1child_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1combo_1box_1get_1model
 JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1combo_1box_1get_1model)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -4487,26 +4447,6 @@
 }
 #endif
 
-#ifndef NO_gtk_1combo_1box_1get_1wrap_1width
-JNIEXPORT jint JNICALL GTK_NATIVE(gtk_1combo_1box_1get_1wrap_1width)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jint rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1combo_1box_1get_1wrap_1width_FUNC);
-/*
-	rc = (jint)gtk_combo_box_get_wrap_width((GtkComboBox *)arg0);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_combo_box_get_wrap_width)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GtkComboBox *))fp)((GtkComboBox *)arg0);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1combo_1box_1get_1wrap_1width_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1combo_1box_1popdown
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1combo_1box_1popdown)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -4537,24 +4477,6 @@
 }
 #endif
 
-#ifndef NO_gtk_1combo_1box_1set_1wrap_1width
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1combo_1box_1set_1wrap_1width)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1combo_1box_1set_1wrap_1width_FUNC);
-/*
-	gtk_combo_box_set_wrap_width((GtkComboBox *)arg0, (gint)arg1);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_combo_box_set_wrap_width)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GtkComboBox *, gint))fp)((GtkComboBox *)arg0, (gint)arg1);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1combo_1box_1set_1wrap_1width_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1combo_1box_1text_1insert
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1combo_1box_1text_1insert)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
@@ -5017,26 +4939,6 @@
 }
 #endif
 
-#ifndef NO_gtk_1event_1box_1new
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1event_1box_1new)
-	(JNIEnv *env, jclass that)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1event_1box_1new_FUNC);
-/*
-	rc = (jlong)gtk_event_box_new();
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_event_box_new)
-		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)();
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1event_1box_1new_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1event_1controller_1get_1widget
 JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1event_1controller_1get_1widget)
 	(JNIEnv *env, jclass that, jlong arg0)
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 9f88877..a1831f0 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
@@ -321,7 +321,6 @@
 	"gtk_1accelerator_1name",
 	"gtk_1accelerator_1parse__J_3I_3I",
 	"gtk_1accelerator_1parse___3B_3I_3I",
-	"gtk_1accessible_1get_1widget",
 	"gtk_1adjustment_1configure",
 	"gtk_1adjustment_1get_1lower",
 	"gtk_1adjustment_1get_1page_1increment",
@@ -365,13 +364,10 @@
 	"gtk_1color_1chooser_1set_1rgba",
 	"gtk_1color_1chooser_1set_1use_1alpha",
 	"gtk_1combo_1box_1get_1active",
-	"gtk_1combo_1box_1get_1child",
 	"gtk_1combo_1box_1get_1model",
-	"gtk_1combo_1box_1get_1wrap_1width",
 	"gtk_1combo_1box_1popdown",
 	"gtk_1combo_1box_1popup",
 	"gtk_1combo_1box_1set_1active",
-	"gtk_1combo_1box_1set_1wrap_1width",
 	"gtk_1combo_1box_1text_1insert",
 	"gtk_1combo_1box_1text_1new",
 	"gtk_1combo_1box_1text_1new_1with_1entry",
@@ -410,7 +406,6 @@
 	"gtk_1entry_1set_1tabs",
 	"gtk_1entry_1set_1visibility",
 	"gtk_1enumerate_1printers",
-	"gtk_1event_1box_1new",
 	"gtk_1event_1controller_1get_1widget",
 	"gtk_1event_1controller_1set_1propagation_1phase",
 	"gtk_1expander_1get_1expanded",
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 74743eb..1a6c7be 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
@@ -319,7 +319,6 @@
 	gtk_1accelerator_1name_FUNC,
 	gtk_1accelerator_1parse__J_3I_3I_FUNC,
 	gtk_1accelerator_1parse___3B_3I_3I_FUNC,
-	gtk_1accessible_1get_1widget_FUNC,
 	gtk_1adjustment_1configure_FUNC,
 	gtk_1adjustment_1get_1lower_FUNC,
 	gtk_1adjustment_1get_1page_1increment_FUNC,
@@ -363,13 +362,10 @@
 	gtk_1color_1chooser_1set_1rgba_FUNC,
 	gtk_1color_1chooser_1set_1use_1alpha_FUNC,
 	gtk_1combo_1box_1get_1active_FUNC,
-	gtk_1combo_1box_1get_1child_FUNC,
 	gtk_1combo_1box_1get_1model_FUNC,
-	gtk_1combo_1box_1get_1wrap_1width_FUNC,
 	gtk_1combo_1box_1popdown_FUNC,
 	gtk_1combo_1box_1popup_FUNC,
 	gtk_1combo_1box_1set_1active_FUNC,
-	gtk_1combo_1box_1set_1wrap_1width_FUNC,
 	gtk_1combo_1box_1text_1insert_FUNC,
 	gtk_1combo_1box_1text_1new_FUNC,
 	gtk_1combo_1box_1text_1new_1with_1entry_FUNC,
@@ -408,7 +404,6 @@
 	gtk_1entry_1set_1tabs_FUNC,
 	gtk_1entry_1set_1visibility_FUNC,
 	gtk_1enumerate_1printers_FUNC,
-	gtk_1event_1box_1new_FUNC,
 	gtk_1event_1controller_1get_1widget_FUNC,
 	gtk_1event_1controller_1set_1propagation_1phase_FUNC,
 	gtk_1expander_1get_1expanded_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
index 200b5b3..2d9fffd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
@@ -289,15 +289,8 @@
 	/** @method flags=dynamic */
 	public static final native long gtk_accel_group_new();
 
-
-	/**
-	 * @method flags=dynamic
-	 * @param accessible cast=(GtkAccessible *)
-	 */
-	public static final native long gtk_accessible_get_widget(long accessible);
-	/**
-	 * @param adjustment cast=(GtkAdjustment *)
-	 */
+	/* GtkAdjustment */
+	/** @param adjustment cast=(GtkAdjustment *) */
 	public static final native void gtk_adjustment_configure(long adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size);
 	/**
 	 * @param value cast=(gdouble)
@@ -305,31 +298,20 @@
 	 * @param upper cast=(gdouble)
 	 * @param step_increment cast=(gdouble)
 	 * @param page_increment cast=(gdouble)
+	 * @param page_size cast=(gdouble)
 	 */
 	public static final native long gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
-	/**
-	 * @param adjustment cast=(GtkAdjustment *)
-	 */
+	/** @param adjustment cast=(GtkAdjustment *) */
 	public static final native double gtk_adjustment_get_lower(long adjustment);
-	/**
-	 * @param adjustment cast=(GtkAdjustment *)
-	 */
+	/** @param adjustment cast=(GtkAdjustment *) */
 	public static final native double gtk_adjustment_get_page_increment(long adjustment);
-	/**
-	 * @param adjustment cast=(GtkAdjustment *)
-	 */
+	/** @param adjustment cast=(GtkAdjustment *) */
 	public static final native double gtk_adjustment_get_page_size(long adjustment);
-	/**
-	 * @param adjustment cast=(GtkAdjustment *)
-	 */
+	/** @param adjustment cast=(GtkAdjustment *) */
 	public static final native double gtk_adjustment_get_step_increment(long adjustment);
-	/**
-	 * @param adjustment cast=(GtkAdjustment *)
-	 */
+	/** @param adjustment cast=(GtkAdjustment *) */
 	public static final native double gtk_adjustment_get_upper(long adjustment);
-	/**
-	 * @param adjustment cast=(GtkAdjustment *)
-	 */
+	/** @param adjustment cast=(GtkAdjustment *) */
 	public static final native double gtk_adjustment_get_value(long adjustment);
 	/**
 	 * @param adjustment cast=(GtkAdjustment *)
@@ -346,6 +328,8 @@
 	 * @param value cast=(gdouble)
 	 */
 	public static final native void gtk_adjustment_set_page_increment(long adjustment, double value);
+
+	/* GtkBorder */
 	/** @param border cast=(GtkBorder *) */
 	public static final native void gtk_border_free(long border);
 
@@ -363,7 +347,6 @@
 	 */
 	public static final native void gtk_box_set_homogeneous(long box, boolean homogeneous);
 
-
 	/* GtkCalendar */
 	public static final native long gtk_calendar_new();
 	/**
@@ -474,7 +457,6 @@
 	 */
 	public static final native long gtk_color_chooser_dialog_new(byte[] title, long parent);
 
-
 	/* GtkComboBox */
 	public static final native long gtk_combo_box_text_new();
 	public static final native long gtk_combo_box_text_new_with_entry();
@@ -516,29 +498,6 @@
 	*/
 	public static final native void gtk_combo_box_popdown(long combo_box);
 
-	/* GtkComboBox [GTK3 only] */
-	/**
-	 * @method flags=dynamic
-	 * @param combo_box cast=(GtkComboBox *)
-	 * @param width cast=(gint)
-	 */
-	/* Do not use directly. Instead use Combo.gtk_combo_box_toggle_wrap(..) */
-	public static final native void gtk_combo_box_set_wrap_width(long combo_box, int width);
-	/**
-	 * @method flags=dynamic
-	 * @param combo_box cast=(GtkComboBox *)
-	 * @return cast=(gint)
-	 */
-	public static final native int gtk_combo_box_get_wrap_width(long combo_box);
-
-	/* GtkComboBox [GTK4 only] */
-	/**
-	 * @method flags=dynamic
-	 * @param combo_box cast=(GtkComboBox *)
-	 * */
-	public static final native long gtk_combo_box_get_child(long combo_box);
-
-
 	/* GtkDialog */
 	/**
 	 * @param dialog cast=(GtkDialog *)
@@ -547,7 +506,6 @@
 	 */
 	public static final native long gtk_dialog_add_button(long dialog, byte[] button_text, int response_id);
 
-
 	/* GtkEditable Interface */
 	/**
 	 * @param editable cast=(GtkEditable *)
@@ -727,6 +685,7 @@
 	/** @param gesture cast=(GtkGestureSingle *) */
 	public static final native int gtk_gesture_single_get_current_button(long gesture);
 
+	/* GtkFileChooserNative */
 	/**
 	 * @method flags=dynamic
 	 * @param title cast=(const gchar *),flags=no_out
@@ -826,17 +785,23 @@
 
 	/* GTK Initialization */
 	public static final native long gtk_get_default_language();
-	/**
-	 * @method flags=dynamic
-	 */
-	/* [GTK3 only] */
-	public static final native long gtk_event_box_new();
+
+	/* GtkScale */
 	/**
 	 *  @param orientation cast=(GtkOrientation)
 	 *  @param adjustment cast=(GtkAdjustment *)
 	 */
 	public static final native long gtk_scale_new(int orientation, long adjustment);
-
+	/**
+	 * @param scale cast=(GtkScale *)
+	 * @param digits cast=(gint)
+	 */
+	public static final native void gtk_scale_set_digits(long scale, int digits);
+	/**
+	 * @param scale cast=(GtkScale *)
+	 * @param draw_value cast=(gboolean)
+	 */
+	public static final native void gtk_scale_set_draw_value(long scale, boolean draw_value);
 
 	/* GtkScrollbar */
 	/**
@@ -1581,16 +1546,6 @@
 	public static final native void gtk_range_get_slider_range(long range, int[] slider_start, int[] slider_end);
 
 
-	/**
-	 * @param scale cast=(GtkScale *)
-	 * @param digits cast=(gint)
-	 */
-	public static final native void gtk_scale_set_digits(long scale, int digits);
-	/**
-	 * @param scale cast=(GtkScale *)
-	 * @param draw_value cast=(gboolean)
-	 */
-	public static final native void gtk_scale_set_draw_value(long scale, boolean draw_value);
 	/** @param scrollable cast=(GtkScrollable *) */
 	public static final native long gtk_scrollable_get_vadjustment(long scrollable);
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java
index 01434a7..875cef8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk3/GTK3.java
@@ -815,4 +815,24 @@
 	 * @param type cast=(GtkShadowType)
 	 */
 	public static final native void gtk_viewport_set_shadow_type(long viewport, int type);
+
+	/* GtkAccessible */
+	/** @param accessible cast=(GtkAccessible *) */
+	public static final native long gtk_accessible_get_widget(long accessible);
+
+	/* GtkComboBox */
+	/**
+	 * @param combo_box cast=(GtkComboBox *)
+	 * @param width cast=(gint)
+	 */
+	/* Do not use directly. Instead use Combo.gtk_combo_box_toggle_wrap(..) */
+	public static final native void gtk_combo_box_set_wrap_width(long combo_box, int width);
+	/**
+	 * @param combo_box cast=(GtkComboBox *)
+	 * @return cast=(gint)
+	 */
+	public static final native int gtk_combo_box_get_wrap_width(long combo_box);
+
+	/* GtkEventBox */
+	public static final native long gtk_event_box_new();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk4/GTK4.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk4/GTK4.java
index 0883e88..b64bf04 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk4/GTK4.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk4/GTK4.java
@@ -412,4 +412,8 @@
 	public static final native void gtk_widget_class_add_binding_signal(long widget_class, int keyval, int mods, byte[] signal, byte[] format_string, boolean arg1, boolean arg2, boolean arg3);
 	/** @param widget cast=(GtkWidget *) */
 	public static final native boolean gtk_widget_get_receives_default(long widget);
+
+	/* GtkComboBox */
+	/** @param combo_box cast=(GtkComboBox *) */
+	public static final native long gtk_combo_box_get_child(long combo_box);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index 9e13e4e..284ba03 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -233,8 +233,8 @@
 private void gtk_combo_box_toggle_wrap (boolean wrap) {
 	if (handle == 0 || GTK.GTK4) return;
 	if (!wrap) {
-		if (GTK.gtk_combo_box_get_wrap_width(handle) == 1) {
-			GTK.gtk_combo_box_set_wrap_width(handle, 0);
+		if (GTK3.gtk_combo_box_get_wrap_width(handle) == 1) {
+			GTK3.gtk_combo_box_set_wrap_width(handle, 0);
 		}
 	} else  {
 		if (delayedEnableWrap) {
@@ -243,7 +243,7 @@
 			delayedEnableWrap = true;
 			display.asyncExec(() -> {
 				if (!isDisposed() && handle != 0) {
-					GTK.gtk_combo_box_set_wrap_width(handle, 1);
+					GTK3.gtk_combo_box_set_wrap_width(handle, 1);
 					delayedEnableWrap = false;
 				}
 			});
@@ -541,7 +541,7 @@
 		handle = GTK.gtk_combo_box_text_new();
 		if (handle == 0) error(SWT.ERROR_NO_HANDLES);
 
-		cellHandle = GTK.GTK4 ? GTK.gtk_combo_box_get_child(handle) : GTK3.gtk_bin_get_child (handle);
+		cellHandle = GTK.GTK4 ? GTK4.gtk_combo_box_get_child(handle) : GTK3.gtk_bin_get_child (handle);
 		if (cellHandle == 0) error(SWT.ERROR_NO_HANDLES);
 
 		gtk_combo_box_toggle_wrap(true);
@@ -549,7 +549,7 @@
 		handle = GTK.gtk_combo_box_text_new_with_entry();
 		if (handle == 0) error(SWT.ERROR_NO_HANDLES);
 
-		entryHandle = GTK.GTK4 ? GTK.gtk_combo_box_get_child(handle) : GTK3.gtk_bin_get_child(handle);
+		entryHandle = GTK.GTK4 ? GTK4.gtk_combo_box_get_child(handle) : GTK3.gtk_bin_get_child(handle);
 		if (entryHandle == 0) error(SWT.ERROR_NO_HANDLES);
 
 		imContext = OS.imContextLast();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
index ef4d958..81f82ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
@@ -264,7 +264,7 @@
 			gtk_box_set_child_packing(handle, labelHandle, true, true, 0, GTK.GTK_PACK_START);
 			gtk_box_set_child_packing(handle, imageHandle, true, true, 0, GTK.GTK_PACK_START);
 		} else {
-			handle = GTK.gtk_event_box_new();
+			handle = GTK3.gtk_event_box_new();
 			if (handle == 0) error(SWT.ERROR_NO_HANDLES);
 
 			boxHandle = gtk_box_new(GTK.GTK_ORIENTATION_HORIZONTAL, false, 0);