Bug 529151 [Gtk] Move gtk function from OS.java to GTK.java

Benefits:
- Adding dynamic functions doesn't require one to manually link
  the function in os_custom.h anymore.
  This makes prototyping much faster and SWT development more user
friendly.
- NativeStats tool generates a separate category for gtk functions
  (from OS.java once).

Technical details:
- SWT Tools generates <CLASS_NAME>_LOAD_FUNCTION
  with GTK.java, we get GTK_LOAD_FUNCTION
- we hard-code GTK_LOAD_FUNCTION to link to gtk lib (see os.h).

- All native code is still put into os.(c|h)

- I manually Updated a few special OS_LOAD_FUNCTION calls and
  removed old bindings in os_custom.h

Verified with child eclipse.
Fedora 27, Gtk3.22.

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=529151
Change-Id: I6446ee5cca090022a8d984a1f92969c26e5e2f24
Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>

84 files changed, 25057 insertions, 25121 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
index 7a949e7de0..85754ffc36 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
@@ -183,10 +183,10 @@ public static Frame new_Frame (final Composite parent) {
 					long /*int*/ awtHandle = getAWTHandle(window);
 					if (awtHandle == 0) return;
 					long /*int*/ xWindow;
-					if (OS.GTK3) {
-						xWindow = OS.gdk_x11_window_get_xid (OS.gtk_widget_get_window (shell.handle));
+					if (GTK.GTK3) {
+						xWindow = OS.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (shell.handle));
 					} else {
-						xWindow = OS.gdk_x11_drawable_get_xid(OS.gtk_widget_get_window(OS.gtk_widget_get_toplevel(shell.handle)));
+						xWindow = OS.gdk_x11_drawable_get_xid(GTK.gtk_widget_get_window(GTK.gtk_widget_get_toplevel(shell.handle)));
 					}
 					OS.XSetTransientForHint(OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()), awtHandle, xWindow);
 				});
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
index b25fb08c00..2b478eac95 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
@@ -114,7 +114,7 @@ public class Accessible {
 	Accessible (Control control) {
 		super ();
 		this.control = control;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			long /*int*/ type = OS.G_OBJECT_TYPE (getControlHandle());
 			accessibleObject = new AccessibleObject (type, getControlHandle(), this, false);
 			addRelations();
@@ -480,7 +480,7 @@ public class Accessible {
 
 	AccessibleObject getAccessibleObject () {
 		if (accessibleObject == null) {
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				long /*int*/ widget = this.getControlHandle();
 				long /*int*/ type = OS.G_OBJECT_TYPE (widget);
 				if (parent == null) {
@@ -505,12 +505,12 @@ public class Accessible {
 	long /*int*/ getControlHandle () {
 		long /*int*/ result = control.handle;
 		if (control instanceof Label) {
-			long /*int*/ list = OS.gtk_container_get_children (result);
+			long /*int*/ list = GTK.gtk_container_get_children (result);
 			if (list != 0) {
 				long /*int*/ temp = list;
 				while (temp != 0) {
 					long /*int*/ widget = OS.g_list_data( temp);
-					if (OS.gtk_widget_get_visible (widget)) {
+					if (GTK.gtk_widget_get_visible (widget)) {
 						result = widget;
 						break;
 					}
@@ -535,7 +535,7 @@ public class Accessible {
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	public void internal_dispose_Accessible() {
-		if (!OS.GTK3) AccessibleFactory.unregisterAccessible (Accessible.this);
+		if (!GTK.GTK3) AccessibleFactory.unregisterAccessible (Accessible.this);
 		release ();
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
index 49a2d55293..d5afd4ca4b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
@@ -336,7 +336,7 @@ class AccessibleFactory {
 		}
 		long /*int*/ widgetType = OS.G_OBJECT_TYPE (widget);
 		long /*int*/ parentType = getParentType (widgetType);
-		if (parentType == 0) parentType = OS.GTK_TYPE_ACCESSIBLE();
+		if (parentType == 0) parentType = GTK.GTK_TYPE_ACCESSIBLE();
 		long /*int*/ type = getType (getTypeName(widgetType), accessible, parentType, ACC.CHILDID_SELF);
 		AccessibleObject object = new AccessibleObject (type, widget, accessible, false);
 		accessible.accessibleObject = object;
@@ -345,13 +345,13 @@ class AccessibleFactory {
 	}
 
 	static AccessibleObject createChildAccessible (Accessible accessible, int childId) {
-		long /*int*/ childType = getType (CHILD_TYPENAME, accessible, OS.GTK_TYPE_ACCESSIBLE(), childId);
+		long /*int*/ childType = getType (CHILD_TYPENAME, accessible, GTK.GTK_TYPE_ACCESSIBLE(), childId);
 		return new AccessibleObject(childType, 0, accessible, true);
 	}
 
 	static void createAccessible (Accessible accessible) {
 		long /*int*/ controlHandle = accessible.getControlHandle ();
-		OS.gtk_widget_get_accessible(controlHandle);
+		GTK.gtk_widget_get_accessible(controlHandle);
 	}
 
 	static long /*int*/ getType (String widgetTypeName, Accessible accessible, long /*int*/ parentType, int childId) {
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 1b5e80c047..50e7ad087f 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
@@ -44,7 +44,7 @@ class AccessibleObject {
 
 		// Gtk3.2 has a minimum requirement of ATK 2.1.5
 		// ATK_ROLE_TABLE_ROW was introduced in ATK 2.1.0. See Bug 470629  for details.
-		if (OS.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
 			ROW_ROLE = ATK.ATK_ROLE_TABLE_ROW;
 		} else {
 			ROW_ROLE = ATK.atk_role_register(Converter.wcsToMbcs("row", true)); //$NON-NLS-1$
@@ -53,10 +53,10 @@ class AccessibleObject {
 
 	AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, boolean isLightweight) {
 		super ();
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			if (type == OS.swt_fixed_get_type()) {
 				if (widget != 0 && !isLightweight) {
-					atkHandle = OS.gtk_widget_get_accessible(widget);
+					atkHandle = GTK.gtk_widget_get_accessible(widget);
 				} else {
 					// Lightweight widgets map to no "real" GTK widget, so we
 					// just instantiate a new SwtFixedAccessible
@@ -66,7 +66,7 @@ class AccessibleObject {
 			} else {
 				// TODO_a11y: accessibility listeners on the Java side have not yet
 				// been implemented for native GTK widgets on GTK3.
-				atkHandle = OS.gtk_widget_get_accessible(widget);
+				atkHandle = GTK.gtk_widget_get_accessible(widget);
 			}
 		} else {
 			atkHandle = OS.g_object_new (type, 0);
@@ -96,7 +96,7 @@ class AccessibleObject {
 	 * parent
 	 */
 	static AtkActionIface getParentActionIface (long /*int*/ atkObject) {
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_ACTION())) {
 			AtkActionIface iface = new AtkActionIface ();
 			ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (atkObject)));
@@ -343,7 +343,7 @@ class AccessibleObject {
 	 * parent
 	 */
 	static AtkComponentIface getParentComponentIface (long /*int*/ atkObject) {
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_COMPONENT())) {
 			AtkComponentIface iface = new AtkComponentIface ();
 			ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (atkObject)));
@@ -502,7 +502,7 @@ class AccessibleObject {
 		AtkComponentIface iface = getParentComponentIface (atkObject);
 		if (iface != null && iface.get_size != 0) {
 			// ATK with GTK3 doesn't have the coord_type parameter
-			if (!OS.GTK3) {
+			if (!GTK.GTK3) {
 				OS.call (iface.get_size, atkObject, width, height, coord_type);
 			} else {
 				ATK.call (iface.get_size, atkObject, width, height);
@@ -596,7 +596,7 @@ class AccessibleObject {
 	 * parent
 	 */
 	static AtkEditableTextIface getParentEditableTextIface (long /*int*/ atkObject) {
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_EDITABLE_TEXT())) {
 			AtkEditableTextIface iface = new AtkEditableTextIface ();
 			ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_EDITABLE_TEXT_GET_IFACE (atkObject)));
@@ -1036,7 +1036,7 @@ class AccessibleObject {
 	 * parent
 	 */
 	static AtkHypertextIface getParentHypertextIface (long /*int*/ atkObject) {
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_HYPERTEXT())) {
 			AtkHypertextIface iface = new AtkHypertextIface ();
 			ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_HYPERTEXT_GET_IFACE (atkObject)));
@@ -1171,7 +1171,7 @@ class AccessibleObject {
 	 */
 	static AtkObjectClass getParentAtkObjectClass (long /*int*/ atkObject) {
 		AtkObjectClass objectClass = new AtkObjectClass ();
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (type != 0) {
 			long /*int*/ parentType = OS.g_type_parent (type);
 			if (parentType != 0) ATK.memmove (objectClass, OS.g_type_class_peek (parentType));
@@ -1722,7 +1722,7 @@ class AccessibleObject {
 	 * parent
 	 */
 	static AtkSelectionIface getParentSelectionIface (long /*int*/ atkObject) {
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_SELECTION())) {
 			AtkSelectionIface iface = new AtkSelectionIface ();
 			ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (atkObject)));
@@ -1827,7 +1827,7 @@ class AccessibleObject {
 	 * parent
 	 */
 	static AtkTableIface getParentTableIface (long /*int*/ atkObject) {
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_TABLE())) {
 			AtkTableIface iface = new AtkTableIface ();
 			ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_TABLE_GET_IFACE (atkObject)));
@@ -2798,7 +2798,7 @@ class AccessibleObject {
 	 * parent
 	 */
 	static AtkTextIface getParentTextIface (long /*int*/ atkObject) {
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_TEXT())) {
 			AtkTextIface iface = new AtkTextIface ();
 			ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (atkObject)));
@@ -3041,7 +3041,7 @@ class AccessibleObject {
 					if (color != null && !color.isDisposed()) {
 						long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
 						attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR));
-						if (OS.GTK3) {
+						if (GTK.GTK3) {
 							attr.value = getStringPtr ((color.handleRGBA.red * 255) + "," + (color.handleRGBA.green * 255) + "," + (color.handleRGBA.blue * 255)); //$NON-NLS-1$ //$NON-NLS-2$
 						} else {
 							attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
@@ -3053,7 +3053,7 @@ class AccessibleObject {
 					if (color != null && !color.isDisposed()) {
 						long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
 						attr.name = OS.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR));
-						if (OS.GTK3) {
+						if (GTK.GTK3) {
 							attr.value = getStringPtr ((color.handleRGBA.red * 255) + "," + (color.handleRGBA.green * 255) + "," + (color.handleRGBA.blue * 255)); //$NON-NLS-1$ //$NON-NLS-2$
 						} else {
 							attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
@@ -4393,7 +4393,7 @@ class AccessibleObject {
 	 * parent
 	 */
 	static AtkValueIface getParentValueIface (long /*int*/ atkObject) {
-		long /*int*/ type = OS.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
+		long /*int*/ type = GTK.GTK3 ? OS.swt_fixed_accessible_get_type() : OS.G_OBJECT_TYPE (atkObject);
 		if (OS.g_type_is_a (OS.g_type_parent (type), ATK.ATK_TYPE_VALUE())) {
 			AtkValueIface iface = new AtkValueIface ();
 			ATK.memmove (iface, OS.g_type_interface_peek_parent (ATK.ATK_VALUE_GET_IFACE (atkObject)));
@@ -4617,7 +4617,7 @@ class AccessibleObject {
 		 * Both GTK3 and GTK2 need to remove the AccessibleObject from
 		 * the map of AccessibleObjects, though.
 		 */
-		if (!OS.GTK3) {
+		if (!GTK.GTK3) {
 			long /*int*/ superType = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (atkObject));
 			long /*int*/ gObjectClass = OS.G_OBJECT_CLASS (superType);
 			GObjectClass objectClassStruct = new GObjectClass ();
@@ -4653,14 +4653,14 @@ class AccessibleObject {
 	}
 
 	static void windowPoint (AccessibleObject object, int [] x, int [] y) {
-		long /*int*/ widget = OS.gtk_accessible_get_widget(object.atkHandle);
+		long /*int*/ widget = GTK.gtk_accessible_get_widget(object.atkHandle);
 		while (widget == 0 && object.parent != null) {
 			object = object.parent;
-			widget = OS.gtk_accessible_get_widget(object.atkHandle);
+			widget = GTK.gtk_accessible_get_widget(object.atkHandle);
 		}
 		if (widget == 0) return;
-		long /*int*/ topLevel = OS.gtk_widget_get_toplevel (widget);
-		long /*int*/ window = OS.gtk_widget_get_window (topLevel);
+		long /*int*/ topLevel = GTK.gtk_widget_get_toplevel (widget);
+		long /*int*/ window = GTK.gtk_widget_get_window (topLevel);
 		OS.gdk_window_get_origin (window, x, y);
 	}
 
@@ -5022,7 +5022,7 @@ class AccessibleObject {
 						object = event.accessible.getAccessibleObject();
 						if (object != null)	OS.g_object_ref(object.atkHandle);
 					} else {
-						if (OS.GTK3) {
+						if (GTK.GTK3) {
 							long /*int*/ type = OS.G_OBJECT_TYPE (accessible.getControlHandle());
 							long /*int*/ widget = accessible.getControlHandle();
 							object = new AccessibleObject(type, widget, accessible, true);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
index c8f2cb8598..67218efb3b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
@@ -36,10 +36,10 @@ public class Clipboard {
 	private static long /*int*/ TARGET;
 
 	static {
-		GTKCLIPBOARD = OS.gtk_clipboard_get(OS.GDK_NONE);
+		GTKCLIPBOARD = GTK.gtk_clipboard_get(OS.GDK_NONE);
 		byte[] buffer = Converter.wcsToMbcs("PRIMARY", true);
 		long /*int*/ primary = OS.gdk_atom_intern(buffer, false);
-		GTKPRIMARYCLIPBOARD = OS.gtk_clipboard_get(primary);
+		GTKPRIMARYCLIPBOARD = GTK.gtk_clipboard_get(primary);
 		buffer = Converter.wcsToMbcs("TARGETS", true);
 		TARGET = OS.gdk_atom_intern(buffer, false);
 	}
@@ -313,12 +313,12 @@ public Object getContents(Transfer transfer, int clipboards) {
 	}
 	if (selection_data == 0) return null;
 	TransferData tdata = new TransferData();
-	tdata.type = OS.gtk_selection_data_get_data_type(selection_data);
-	tdata.pValue = OS.gtk_selection_data_get_data(selection_data);
-	tdata.length = OS.gtk_selection_data_get_length(selection_data);
-	tdata.format = OS.gtk_selection_data_get_format(selection_data);
+	tdata.type = GTK.gtk_selection_data_get_data_type(selection_data);
+	tdata.pValue = GTK.gtk_selection_data_get_data(selection_data);
+	tdata.length = GTK.gtk_selection_data_get_length(selection_data);
+	tdata.format = GTK.gtk_selection_data_get_format(selection_data);
 	Object result = transfer.nativeToJava(tdata);
-	OS.gtk_selection_data_free(selection_data);
+	GTK.gtk_selection_data_free(selection_data);
 	return result;
 }
 
@@ -599,15 +599,15 @@ private  int[] getAvailablePrimaryTypes() {
 	OS.gdk_threads_leave();
 	if (selection_data != 0) {
 		try {
-			int length = OS.gtk_selection_data_get_length(selection_data);
-			int format = OS.gtk_selection_data_get_format(selection_data);
-			long /*int*/ data = OS.gtk_selection_data_get_data(selection_data);
+			int length = GTK.gtk_selection_data_get_length(selection_data);
+			int format = GTK.gtk_selection_data_get_format(selection_data);
+			long /*int*/ data = GTK.gtk_selection_data_get_data(selection_data);
 			if (length != 0) {
 				types = new int[length * 8 / format];
 				C.memmove(types, data, length);
 			}
 		} finally {
-			OS.gtk_selection_data_free(selection_data);
+			GTK.gtk_selection_data_free(selection_data);
 		}
 	}
 	return types;
@@ -624,15 +624,15 @@ private int[] getAvailableClipboardTypes () {
 	OS.gdk_threads_leave();
 	if (selection_data != 0) {
 		try {
-			int length = OS.gtk_selection_data_get_length(selection_data);
-			int format = OS.gtk_selection_data_get_format(selection_data);
-			long /*int*/ data = OS.gtk_selection_data_get_data(selection_data);
+			int length = GTK.gtk_selection_data_get_length(selection_data);
+			int format = GTK.gtk_selection_data_get_format(selection_data);
+			long /*int*/ data = GTK.gtk_selection_data_get_data(selection_data);
 			if (length != 0) {
 				types = new int[length * 8 / format];
 				C.memmove(types, data, length);
 			}
 		} finally {
-			OS.gtk_selection_data_free(selection_data);
+			GTK.gtk_selection_data_free(selection_data);
 		}
 	}
 	return types;
@@ -643,7 +643,7 @@ long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*
 	String key = "org.eclipse.swt.internal.gtk.dispatchEvent";
 	Display display = this.display;
 	display.setData(key, new int[]{OS.GDK_PROPERTY_NOTIFY, OS.GDK_SELECTION_CLEAR, OS.GDK_SELECTION_REQUEST, OS.GDK_SELECTION_NOTIFY});
-	long /*int*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target);
+	long /*int*/ selection_data = GTK.gtk_clipboard_wait_for_contents(clipboard, target);
 	display.setData(key, null);
 	long duration = System.currentTimeMillis() - startTime;
 	if (selection_data == 0 && duration > 5000) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java
index f9c5e2ac21..5393247716 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java
@@ -25,7 +25,7 @@ class ClipboardProxy {
 	Object[] primaryClipboardData;
 	Transfer[] primaryClipboardDataTypes;
 
-	long /*int*/ clipboardOwner = OS.gtk_window_new(0);
+	long /*int*/ clipboardOwner = GTK.gtk_window_new(0);
 	Display display;
 	Clipboard activeClipboard = null;
 	Clipboard activePrimaryClipboard = null;
@@ -58,10 +58,10 @@ ClipboardProxy(Display display) {
 
 void clear (Clipboard owner, int clipboards) {
 	if ((clipboards & DND.CLIPBOARD) != 0 && activeClipboard == owner) {
-		OS.gtk_clipboard_clear(Clipboard.GTKCLIPBOARD);
+		GTK.gtk_clipboard_clear(Clipboard.GTKCLIPBOARD);
 	}
 	if ((clipboards & DND.SELECTION_CLIPBOARD) != 0 && activePrimaryClipboard == owner) {
-		OS.gtk_clipboard_clear(Clipboard.GTKPRIMARYCLIPBOARD);
+		GTK.gtk_clipboard_clear(Clipboard.GTKPRIMARYCLIPBOARD);
 	}
 }
 
@@ -82,10 +82,10 @@ long /*int*/ clearFunc(long /*int*/ clipboard,long /*int*/ user_data_or_owner){
 void dispose () {
 	if (display == null) return;
 	if (activeClipboard != null) {
-		OS.gtk_clipboard_store(Clipboard.GTKCLIPBOARD);
+		GTK.gtk_clipboard_store(Clipboard.GTKCLIPBOARD);
 	}
 	if (activePrimaryClipboard != null) {
-		OS.gtk_clipboard_store(Clipboard.GTKPRIMARYCLIPBOARD);
+		GTK.gtk_clipboard_store(Clipboard.GTKPRIMARYCLIPBOARD);
 	}
 	display = null;
 	if (getFunc != null ) getFunc.dispose();
@@ -96,7 +96,7 @@ void dispose () {
 	clipboardDataTypes = null;
 	primaryClipboardData = null;
 	primaryClipboardDataTypes = null;
-	if (clipboardOwner != 0) OS.gtk_widget_destroy (clipboardOwner);
+	if (clipboardOwner != 0) GTK.gtk_widget_destroy (clipboardOwner);
 	clipboardOwner = 0;
 }
 
@@ -106,7 +106,7 @@ void dispose () {
  */
 long /*int*/ getFunc(long /*int*/ clipboard, long /*int*/ selection_data, long /*int*/ info, long /*int*/ user_data_or_owner){
 	if (selection_data == 0) return 0;
-	long /*int*/ target = OS.gtk_selection_data_get_target(selection_data);
+	long /*int*/ target = GTK.gtk_selection_data_get_target(selection_data);
 	TransferData tdata = new TransferData();
 	tdata.type = target;
 	Transfer[] types = (clipboard == Clipboard.GTKCLIPBOARD) ? clipboardDataTypes : primaryClipboardDataTypes;
@@ -123,7 +123,7 @@ long /*int*/ getFunc(long /*int*/ clipboard, long /*int*/ selection_data, long /
 	if (tdata.format < 8 || tdata.format % 8 != 0) {
 		return 0;
 	}
-	OS.gtk_selection_data_set(selection_data, tdata.type, tdata.format, tdata.pValue, tdata.length);
+	GTK.gtk_selection_data_set(selection_data, tdata.type, tdata.format, tdata.pValue, tdata.length);
 	OS.g_free(tdata.pValue);
 	return 1;
 }
@@ -171,10 +171,10 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo
 			* though we set the data again. So, this API has to be used whenever we
 			* are setting the contents.
 			*/
-			if (!OS.gtk_clipboard_set_with_owner (Clipboard.GTKCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) {
+			if (!GTK.gtk_clipboard_set_with_owner (Clipboard.GTKCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) {
 				return false;
 			}
-			OS.gtk_clipboard_set_can_store(Clipboard.GTKCLIPBOARD, 0, 0);
+			GTK.gtk_clipboard_set_can_store(Clipboard.GTKCLIPBOARD, 0, 0);
 			activeClipboard = owner;
 		}
 		if ((clipboards & DND.SELECTION_CLIPBOARD) != 0) {
@@ -182,10 +182,10 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo
 			primaryClipboardDataTypes = dataTypes;
 			long /*int*/ getFuncProc = getFunc.getAddress();
 			long /*int*/ clearFuncProc = clearFunc.getAddress();
-			if (!OS.gtk_clipboard_set_with_owner (Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) {
+			if (!GTK.gtk_clipboard_set_with_owner (Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) {
 				return false;
 			}
-			OS.gtk_clipboard_set_can_store(Clipboard.GTKPRIMARYCLIPBOARD, 0, 0);
+			GTK.gtk_clipboard_set_can_store(Clipboard.GTKPRIMARYCLIPBOARD, 0, 0);
 			activePrimaryClipboard = owner;
 		}
 		return true;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java
index da257d127f..7cf05b62c2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java
@@ -310,17 +310,17 @@ void drag(Event dragEvent) {
 	int actions = opToOsOp(getStyle());
 	Image image = event.image;
 	long /*int*/ context;
-	if (OS.GTK_VERSION >= OS.VERSION(3, 10, 0)) {
-		context = OS.gtk_drag_begin_with_coordinates(control.handle, targetList, actions, 1, 0, -1, -1);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 10, 0)) {
+		context = GTK.gtk_drag_begin_with_coordinates(control.handle, targetList, actions, 1, 0, -1, -1);
 	} else {
-		context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0);
+		context = GTK.gtk_drag_begin(control.handle, targetList, actions, 1, 0);
 	}
 	if (context != 0 && image != null) {
-		if (OS.GTK3) {
-			OS.gtk_drag_set_icon_surface(context, image.surface);
+		if (GTK.GTK3) {
+			GTK.gtk_drag_set_icon_surface(context, image.surface);
 		} else {
 			long /*int*/ pixbuf = ImageList.createPixbuf(image);
-			OS.gtk_drag_set_icon_pixbuf(context, pixbuf, 0, 0);
+			GTK.gtk_drag_set_icon_pixbuf(context, pixbuf, 0, 0);
 			OS.g_object_unref(pixbuf);
 		}
 	}
@@ -332,7 +332,7 @@ void dragBegin(long /*int*/ widget, long /*int*/ context) {
 	 * When we recieve the signal from GTK of DragBegin, we will
 	 * notify SWT that a drag has occurred.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0) && this.control instanceof Text) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0) && this.control instanceof Text) {
 		DNDEvent event = new DNDEvent();
 		Display display = Display.getCurrent();
 		Point loc = display.getCursorLocation();
@@ -345,7 +345,7 @@ void dragBegin(long /*int*/ widget, long /*int*/ context) {
 		if (targetList == 0) return;
 		Image image = event.image;
 		if (context != 0 && image != null) {
-			OS.gtk_drag_set_icon_surface(context, image.surface);
+			GTK.gtk_drag_set_icon_surface(context, image.surface);
 		}
 	}
 }
@@ -360,8 +360,8 @@ void dragEnd(long /*int*/ widget, long /*int*/ context){
 	 * NOTE: We believe that it is never an error to ungrab when
 	 * a drag is finished.
 	 */
-	if (OS.GTK3) {
-		long /*int*/ display = OS.gdk_window_get_display(OS.gtk_widget_get_window(widget));
+	if (GTK.GTK3) {
+		long /*int*/ display = OS.gdk_window_get_display(GTK.gtk_widget_get_window(widget));
 		long /*int*/ device_manager = OS.gdk_display_get_device_manager(display);
 		long /*int*/ pointer = OS.gdk_device_manager_get_client_pointer(device_manager);
 		long /*int*/ keyboard = OS.gdk_device_get_associated_device(pointer);
@@ -382,7 +382,7 @@ void dragEnd(long /*int*/ widget, long /*int*/ context){
 		 * GTKGestures will handle file operations correctly without the
 		 * gdk_drag_context_get_dest_window() call. See Bug 503431.
 		 */
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			action = OS.gdk_drag_context_get_selected_action(context);
 			if (OS.isX11()) { // Wayland
 				dest_window = OS.gdk_drag_context_get_dest_window(context);
@@ -419,8 +419,8 @@ void dragEnd(long /*int*/ widget, long /*int*/ context){
 		if (this.control instanceof Table
 				|| this.control instanceof Tree
 				|| this.control instanceof List) {
-			long /*int*/ selection = OS.gtk_tree_view_get_selection (widget);
-			OS.gtk_tree_selection_set_select_function(selection,0,0,0);
+			long /*int*/ selection = GTK.gtk_tree_view_get_selection (widget);
+			GTK.gtk_tree_selection_set_select_function(selection,0,0,0);
 		}
 
 		/*
@@ -435,10 +435,10 @@ void dragEnd(long /*int*/ widget, long /*int*/ context){
 
 void dragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data,  int info, int time){
 	if (selection_data == 0) return;
-	int length = OS.gtk_selection_data_get_length(selection_data);
-	int format = OS.gtk_selection_data_get_format(selection_data);
-	long /*int*/ data = OS.gtk_selection_data_get_data(selection_data);
-	long /*int*/ target = OS.gtk_selection_data_get_target(selection_data);
+	int length = GTK.gtk_selection_data_get_length(selection_data);
+	int format = GTK.gtk_selection_data_get_format(selection_data);
+	long /*int*/ data = GTK.gtk_selection_data_get_data(selection_data);
+	long /*int*/ target = GTK.gtk_selection_data_get_target(selection_data);
 	if (target == 0) return;
 
 	TransferData transferData = new TransferData();
@@ -465,7 +465,7 @@ void dragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selecti
 	if (transfer == null) return;
 	transfer.javaToNative(event.data, transferData);
 	if (transferData.result != 1) return;
-	OS.gtk_selection_data_set(selection_data, transferData.type, transferData.format, transferData.pValue, transferData.length);
+	GTK.gtk_selection_data_set(selection_data, transferData.type, transferData.format, transferData.pValue, transferData.length);
 	OS.g_free(transferData.pValue);
 	return;
 }
@@ -546,7 +546,7 @@ public Transfer[] getTransfer(){
 void onDispose() {
 	if (control == null) return;
 	if (targetList != 0) {
-		OS.gtk_target_list_unref(targetList);
+		GTK.gtk_target_list_unref(targetList);
 	}
 	targetList = 0;
 	if (controlListener != null) {
@@ -632,7 +632,7 @@ public void setDragSourceEffect(DragSourceEffect effect) {
  */
 public void setTransfer(Transfer... transferAgents){
 	if (targetList != 0) {
-		OS.gtk_target_list_unref(targetList);
+		GTK.gtk_target_list_unref(targetList);
 		targetList = 0;
 	}
 	this.transferAgents = transferAgents;
@@ -662,7 +662,7 @@ public void setTransfer(Transfer... transferAgents){
 	for (int i = 0; i < targets.length; i++) {
 		OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
 	}
-	targetList = OS.gtk_target_list_new(pTargets, targets.length);
+	targetList = GTK.gtk_target_list_new(pTargets, targets.length);
 
 	for (int i = 0; i < targets.length; i++) {
 		OS.g_free(targets[i].target);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java
index c780a732fd..32b8fa9c59 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java
@@ -338,10 +338,10 @@ void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int
 	// Get data in a Java format
 	Object object = null;
 	TransferData transferData = new TransferData();
-	int length = OS.gtk_selection_data_get_length(selection_data);
-	int format = OS.gtk_selection_data_get_format(selection_data);
-	long /*int*/ data = OS.gtk_selection_data_get_data(selection_data);
-	long /*int*/ type = OS.gtk_selection_data_get_data_type(selection_data);
+	int length = GTK.gtk_selection_data_get_length(selection_data);
+	int format = GTK.gtk_selection_data_get_format(selection_data);
+	long /*int*/ data = GTK.gtk_selection_data_get_data(selection_data);
+	long /*int*/ type = GTK.gtk_selection_data_get_data_type(selection_data);
 	if (data != 0) {
 		transferData.type = type;
 		transferData.length = length;
@@ -371,7 +371,7 @@ void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int
 	OS.g_signal_stop_emission_by_name(widget, OS.drag_data_received);
 
 	//notify source of action taken
-	OS.gtk_drag_finish(context, selectedOperation != DND.DROP_NONE, selectedOperation== DND.DROP_MOVE, time);
+	GTK.gtk_drag_finish(context, selectedOperation != DND.DROP_NONE, selectedOperation== DND.DROP_MOVE, time);
 	return;
 }
 
@@ -408,7 +408,7 @@ boolean drag_drop(long /*int*/ widget, long /*int*/ context, int x, int y, int t
 		return false;
 	}
 	// ask drag source for dropped data
-	OS.gtk_drag_get_data(widget, context, selectedDataType.type, time);
+	GTK.gtk_drag_get_data(widget, context, selectedDataType.type, time);
 	return true;
 }
 
@@ -564,7 +564,7 @@ public DropTargetEffect getDropTargetEffect() {
 
 int getOperationFromKeyState() {
 	int[] state = new int[1];
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/ root = OS.gdk_get_default_root_window ();
 		long /*int*/ device_manager = OS.gdk_display_get_device_manager (OS.gdk_window_get_display (root));
 		long /*int*/ pointer = OS.gdk_device_manager_get_client_pointer (device_manager);
@@ -596,7 +596,7 @@ void onDispose(){
 	OS.g_signal_handler_disconnect(control.handle, drag_data_received_handler);
 	OS.g_signal_handler_disconnect(control.handle, drag_drop_handler);
 	if (transferAgents.length != 0)
-		OS.gtk_drag_dest_unset(control.handle);
+		GTK.gtk_drag_dest_unset(control.handle);
 	transferAgents = null;
 	if (controlListener != null)
 		control.removeListener(SWT.Dispose, controlListener);
@@ -672,7 +672,7 @@ public void setTransfer(Transfer... transferAgents){
 	if (transferAgents == null) DND.error(SWT.ERROR_NULL_ARGUMENT);
 
 	if (this.transferAgents.length != 0) {
-		OS.gtk_drag_dest_unset(control.handle);
+		GTK.gtk_drag_dest_unset(control.handle);
 	}
 	this.transferAgents = transferAgents;
 
@@ -704,13 +704,13 @@ public void setTransfer(Transfer... transferAgents){
 	int actions = opToOsOp(getStyle());
 	if (control instanceof Combo) {
 		if ((control.getStyle() & SWT.READ_ONLY) == 0) {
-			long /*int*/ entryHandle = OS.gtk_bin_get_child (control.handle);
+			long /*int*/ entryHandle = GTK.gtk_bin_get_child (control.handle);
 			if (entryHandle != 0) {
-				OS.gtk_drag_dest_unset(entryHandle);
+				GTK.gtk_drag_dest_unset(entryHandle);
 			}
 		}
 	}
-	OS.gtk_drag_dest_set(control.handle, 0, pTargets, targets.length, actions);
+	GTK.gtk_drag_dest_set(control.handle, 0, pTargets, targets.length, actions);
 
 	for (int i = 0; i < targets.length; i++) {
 		OS.g_free(targets[i].target);
@@ -734,7 +734,7 @@ boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent even
 	if (context == 0) return false;
 	long /*int*/ targets = 0;
 	int actions = 0;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		targets = OS.gdk_drag_context_list_targets(context);
 		actions = OS.gdk_drag_context_get_actions(context);
 	} else {
@@ -780,7 +780,7 @@ boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent even
 		targets = OS.g_list_next (targets);
 	}
 	if (dataTypes.length == 0) return false;
-	long /*int*/ window = OS.gtk_widget_get_window (control.handle);
+	long /*int*/ window = GTK.gtk_widget_get_window (control.handle);
 	int [] origin_x = new int[1], origin_y = new int[1];
 	OS.gdk_window_get_origin(window, origin_x, origin_y);
 	Point coordinates = DPIUtil.autoScaleDown(new Point(origin_x[0] + x, origin_y[0] + y));
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java
index e2fe849291..891edfe9c8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -92,9 +92,9 @@ public class TableDragSourceEffect extends DragSourceEffect {
 		* to give a valid pointer instead.
 		*/
 		long /*int*/ handle = table.handle;
-		long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+		long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 		long /*int*/ [] model = null;
-		long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);
+		long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, model);
 		if (list == 0) return null;
 		int count = Math.min(10, OS.g_list_length (list));
 		long /*int*/ originalList = list;
@@ -102,9 +102,9 @@ public class TableDragSourceEffect extends DragSourceEffect {
 		Display display = table.getDisplay();
 		if (count == 1) {
 			long /*int*/ path = OS.g_list_nth_data (list, 0);
-			long /*int*/ icon = OS.gtk_tree_view_create_row_drag_icon (handle, path);
+			long /*int*/ icon = GTK.gtk_tree_view_create_row_drag_icon (handle, path);
 			dragSourceImage =  Image.gtk_new (display, SWT.ICON, icon, 0);
-			OS.gtk_tree_path_free (path);
+			GTK.gtk_tree_path_free (path);
 		} else {
 			int width = 0, height = 0;
 			int[] w = new int[1], h = new int[1];
@@ -113,9 +113,9 @@ public class TableDragSourceEffect extends DragSourceEffect {
 			GdkRectangle rect = new GdkRectangle ();
 			for (int i=0; i<count; i++) {
 				long /*int*/ path = OS.g_list_data (list);
-				OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
-				icons[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);
-				if (OS.GTK3) {
+				GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect);
+				icons[i] = GTK.gtk_tree_view_create_row_drag_icon(handle, path);
+				if (GTK.GTK3) {
 					switch (Cairo.cairo_surface_get_type(icons[i])) {
 					case Cairo.CAIRO_SURFACE_TYPE_IMAGE:
 						w[0] = Cairo.cairo_image_surface_get_width(icons[i]);
@@ -134,11 +134,11 @@ public class TableDragSourceEffect extends DragSourceEffect {
 				yy[i] = rect.y;
 				hh[i] = h[0];
 				list = OS.g_list_next (list);
-				OS.gtk_tree_path_free (path);
+				GTK.gtk_tree_path_free (path);
 			}
 			long /*int*/ surface;
 			long /*int*/ cairo ;
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
 				if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 				cairo = Cairo.cairo_create(surface);
@@ -150,19 +150,19 @@ public class TableDragSourceEffect extends DragSourceEffect {
 			if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 			Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE);
 			for (int i=0; i<count; i++) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					Cairo.cairo_set_source_surface (cairo, icons[i], 2, yy[i] - yy[0] + 2);
 				} else {
 					OS.gdk_cairo_set_source_pixmap(cairo, icons[i], 0, yy[i] - yy[0]);
 				}
 				Cairo.cairo_rectangle(cairo, 0, yy[i] - yy[0], width, hh[i]);
 				Cairo.cairo_fill(cairo);
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					Cairo.cairo_surface_destroy(icons[i]);
 				}
 			}
 			Cairo.cairo_destroy(cairo);
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				dragSourceImage =  Image.gtk_new (display, SWT.ICON, surface, 0);
 			} else {
 				long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
index baa03a90f6..7227095698 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
@@ -106,7 +106,7 @@ public class TableDropTargetEffect extends DropTargetEffect {
 	public void dragLeave(DropTargetEvent event) {
 		Table table = (Table) control;
 		long /*int*/ handle = table.handle;
-		OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
+		GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
 
 		scrollBeginTime = 0;
 		scrollIndex = -1;
@@ -137,10 +137,10 @@ public class TableDropTargetEffect extends DropTargetEffect {
 		Point coordinates = new Point(event.x, event.y);
 		coordinates = DPIUtil.autoScaleUp(table.toControl(coordinates));
 		long /*int*/ [] path = new long /*int*/ [1];
-		OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
+		GTK.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
 		int index = -1;
 		if (path[0] != 0) {
-			long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]);
+			long /*int*/ indices = GTK.gtk_tree_path_get_indices (path[0]);
 			if (indices != 0) {
 				int[] temp = new int[1];
 				C.memmove (temp, indices, 4);
@@ -154,15 +154,15 @@ public class TableDropTargetEffect extends DropTargetEffect {
 			if (index != -1 && scrollIndex == index && scrollBeginTime != 0) {
 				if (System.currentTimeMillis() >= scrollBeginTime) {
 					if (coordinates.y < DPIUtil.autoScaleUp(table.getItemHeight())) {
-						OS.gtk_tree_path_prev(path[0]);
+						GTK.gtk_tree_path_prev(path[0]);
 					} else {
-						OS.gtk_tree_path_next(path[0]);
+						GTK.gtk_tree_path_next(path[0]);
 					}
 					if (path[0] != 0) {
-						OS.gtk_tree_view_scroll_to_cell(handle, path[0], 0, false, 0, 0);
-						OS.gtk_tree_path_free(path[0]);
+						GTK.gtk_tree_view_scroll_to_cell(handle, path[0], 0, false, 0, 0);
+						GTK.gtk_tree_path_free(path[0]);
 						path[0] = 0;
-						OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
+						GTK.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
 					}
 					scrollBeginTime = 0;
 					scrollIndex = -1;
@@ -174,17 +174,17 @@ public class TableDropTargetEffect extends DropTargetEffect {
 		}
 		if (path[0] != 0) {
 			int position = -1;
-			if ((effect & DND.FEEDBACK_SELECT) != 0) position = OS.GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
-			if ((effect & DND.FEEDBACK_INSERT_BEFORE) != 0) position = OS.GTK_TREE_VIEW_DROP_BEFORE;
-			if ((effect & DND.FEEDBACK_INSERT_AFTER) != 0) position = OS.GTK_TREE_VIEW_DROP_AFTER;
+			if ((effect & DND.FEEDBACK_SELECT) != 0) position = GTK.GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
+			if ((effect & DND.FEEDBACK_INSERT_BEFORE) != 0) position = GTK.GTK_TREE_VIEW_DROP_BEFORE;
+			if ((effect & DND.FEEDBACK_INSERT_AFTER) != 0) position = GTK.GTK_TREE_VIEW_DROP_AFTER;
 			if (position != -1) {
-				OS.gtk_tree_view_set_drag_dest_row(handle, path[0], position);
+				GTK.gtk_tree_view_set_drag_dest_row(handle, path[0], position);
 			} else {
-				OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
+				GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
 			}
 		} else {
-			OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
+			GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
 		}
-		if (path[0] != 0) OS.gtk_tree_path_free (path [0]);
+		if (path[0] != 0) GTK.gtk_tree_path_free (path [0]);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
index fa0eb4bc86..172d08c7a7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -91,9 +91,9 @@ public class TreeDragSourceEffect extends DragSourceEffect {
 		 * to give a valid pointer instead.
 		 */
 		long /*int*/ handle = tree.handle;
-		long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+		long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 		long /*int*/ [] model =  null;
-		long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);
+		long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, model);
 		if (list == 0) return null;
 		int count = Math.min(10, OS.g_list_length (list));
 		long /*int*/ originalList = list;
@@ -101,9 +101,9 @@ public class TreeDragSourceEffect extends DragSourceEffect {
 		Display display = tree.getDisplay();
 		if (count == 1) {
 			long /*int*/ path = OS.g_list_nth_data (list, 0);
-			long /*int*/ icon = OS.gtk_tree_view_create_row_drag_icon (handle, path);
+			long /*int*/ icon = GTK.gtk_tree_view_create_row_drag_icon (handle, path);
 			dragSourceImage =  Image.gtk_new (display, SWT.ICON, icon, 0);
-			OS.gtk_tree_path_free (path);
+			GTK.gtk_tree_path_free (path);
 		} else {
 			int width = 0, height = 0;
 			int[] w = new int[1], h = new int[1];
@@ -112,9 +112,9 @@ public class TreeDragSourceEffect extends DragSourceEffect {
 			GdkRectangle rect = new GdkRectangle ();
 			for (int i=0; i<count; i++) {
 				long /*int*/ path = OS.g_list_data (list);
-				OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
-				icons[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);
-				if (OS.GTK3) {
+				GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect);
+				icons[i] = GTK.gtk_tree_view_create_row_drag_icon(handle, path);
+				if (GTK.GTK3) {
 					switch (Cairo.cairo_surface_get_type(icons[i])) {
 					case Cairo.CAIRO_SURFACE_TYPE_IMAGE:
 						w[0] = Cairo.cairo_image_surface_get_width(icons[i]);
@@ -133,11 +133,11 @@ public class TreeDragSourceEffect extends DragSourceEffect {
 				yy[i] = rect.y;
 				hh[i] = h[0];
 				list = OS.g_list_next (list);
-				OS.gtk_tree_path_free (path);
+				GTK.gtk_tree_path_free (path);
 			}
 			long /*int*/ surface;
 			long /*int*/ cairo ;
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
 				if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 				cairo = Cairo.cairo_create(surface);
@@ -149,19 +149,19 @@ public class TreeDragSourceEffect extends DragSourceEffect {
 			if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 			Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE);
 			for (int i=0; i<count; i++) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					Cairo.cairo_set_source_surface (cairo, icons[i], 2, yy[i] - yy[0] + 2);
 				} else {
 					OS.gdk_cairo_set_source_pixmap(cairo, icons[i], 0, yy[i] - yy[0]);
 				}
 				Cairo.cairo_rectangle(cairo, 0, yy[i] - yy[0], width, hh[i]);
 				Cairo.cairo_fill(cairo);
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					Cairo.cairo_surface_destroy(icons[i]);
 				}
 			}
 			Cairo.cairo_destroy(cairo);
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				dragSourceImage =  Image.gtk_new (display, SWT.ICON, surface, 0);
 			} else {
 				long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
index 9d75676c10..386c9e782c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
@@ -115,7 +115,7 @@ public class TreeDropTargetEffect extends DropTargetEffect {
 	public void dragLeave(DropTargetEvent event) {
 		Tree tree = (Tree) control;
 		long /*int*/ handle = tree.handle;
-		OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
+		GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
 
 		scrollBeginTime = 0;
 		scrollIndex = -1;
@@ -150,12 +150,12 @@ public class TreeDropTargetEffect extends DropTargetEffect {
 		Point coordinates = new Point(event.x, event.y);
 		coordinates = DPIUtil.autoScaleUp(tree.toControl(coordinates));
 		long /*int*/ [] path = new long /*int*/ [1];
-		OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
+		GTK.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
 		int index = -1;
 		if (path[0] != 0) {
-			long /*int*/ indices = OS.gtk_tree_path_get_indices(path[0]);
+			long /*int*/ indices = GTK.gtk_tree_path_get_indices(path[0]);
 			if (indices != 0) {
-				int depth = OS.gtk_tree_path_get_depth(path[0]);
+				int depth = GTK.gtk_tree_path_get_depth(path[0]);
 				int[] temp = new int[depth];
 				C.memmove (temp, indices, temp.length * 4);
 				index = temp[temp.length - 1];
@@ -168,20 +168,20 @@ public class TreeDropTargetEffect extends DropTargetEffect {
 			if (index != -1 && scrollIndex == index && scrollBeginTime != 0) {
 				if (System.currentTimeMillis() >= scrollBeginTime) {
 					GdkRectangle cellRect = new GdkRectangle ();
-					OS.gtk_tree_view_get_cell_area (handle, path[0], 0, cellRect);
+					GTK.gtk_tree_view_get_cell_area (handle, path[0], 0, cellRect);
 					if (cellRect.y < cellRect.height) {
 						int[] tx = new int[1], ty = new int[1];
-						OS.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y - cellRect.height, tx, ty);
-						OS.gtk_tree_view_scroll_to_point (handle, -1, ty[0]);
+						GTK.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y - cellRect.height, tx, ty);
+						GTK.gtk_tree_view_scroll_to_point (handle, -1, ty[0]);
 					} else {
 						//scroll down
-						OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y + cellRect.height, path, null, null, null);
+						GTK.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y + cellRect.height, path, null, null, null);
 						if (path[0] != 0) {
-							OS.gtk_tree_view_scroll_to_cell(handle, path[0], 0, false, 0, 0);
-							OS.gtk_tree_path_free(path[0]);
+							GTK.gtk_tree_view_scroll_to_cell(handle, path[0], 0, false, 0, 0);
+							GTK.gtk_tree_path_free(path[0]);
 							path[0] = 0;
 						}
-						OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
+						GTK.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
 					}
 					scrollBeginTime = 0;
 					scrollIndex = -1;
@@ -197,7 +197,7 @@ public class TreeDropTargetEffect extends DropTargetEffect {
 		} else {
 			if (index != -1 && expandIndex == index && expandBeginTime != 0) {
 				if (System.currentTimeMillis() >= expandBeginTime) {
-					OS.gtk_tree_view_expand_row (handle, path[0], false);
+					GTK.gtk_tree_view_expand_row (handle, path[0], false);
 					expandBeginTime = 0;
 					expandIndex = -1;
 				}
@@ -208,19 +208,19 @@ public class TreeDropTargetEffect extends DropTargetEffect {
 		}
 		if (path[0] != 0) {
 			int position = -1;
-			if ((effect & DND.FEEDBACK_SELECT) != 0) position = OS.GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
-			if ((effect & DND.FEEDBACK_INSERT_BEFORE) != 0) position = OS.GTK_TREE_VIEW_DROP_BEFORE;
-			if ((effect & DND.FEEDBACK_INSERT_AFTER) != 0) position = OS.GTK_TREE_VIEW_DROP_AFTER;
+			if ((effect & DND.FEEDBACK_SELECT) != 0) position = GTK.GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
+			if ((effect & DND.FEEDBACK_INSERT_BEFORE) != 0) position = GTK.GTK_TREE_VIEW_DROP_BEFORE;
+			if ((effect & DND.FEEDBACK_INSERT_AFTER) != 0) position = GTK.GTK_TREE_VIEW_DROP_AFTER;
 			if (position != -1) {
-				OS.gtk_tree_view_set_drag_dest_row(handle, path[0], position);
+				GTK.gtk_tree_view_set_drag_dest_row(handle, path[0], position);
 			} else {
-				OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
+				GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
 			}
 		} else {
-			OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
+			GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
 		}
 
-		if (path[0] != 0) OS.gtk_tree_path_free (path [0]);
+		if (path[0] != 0) GTK.gtk_tree_path_free (path [0]);
 	}
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java
index ec6e0cb4a7..886680f19c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/internal/dnd/gtk/ListDragSourceEffect.java
@@ -88,9 +88,9 @@ public class ListDragSourceEffect extends DragSourceEffect {
 		if (dragList.isListening(SWT.EraseItem) || dragList.isListening (SWT.PaintItem)) return null;
 
 		long /*int*/ handle = dragList.handle;
-		long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+		long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 		long /*int*/ [] model = null;
-		long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);
+		long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, model);
 		if (list == 0) return null;
 		int count = Math.min(10, OS.g_list_length (list));
 		long /*int*/ originalList = list;
@@ -98,9 +98,9 @@ public class ListDragSourceEffect extends DragSourceEffect {
 		Display display = dragList.getDisplay();
 		if (count == 1) {
 			long /*int*/ path = OS.g_list_nth_data (list, 0);
-			long /*int*/ icon = OS.gtk_tree_view_create_row_drag_icon (handle, path);
+			long /*int*/ icon = GTK.gtk_tree_view_create_row_drag_icon (handle, path);
 			dragSourceImage =  Image.gtk_new (display, SWT.ICON, icon, 0);
-			OS.gtk_tree_path_free (path);
+			GTK.gtk_tree_path_free (path);
 		} else {
 			int width = 0, height = 0;
 			int[] w = new int[1], h = new int[1];
@@ -109,9 +109,9 @@ public class ListDragSourceEffect extends DragSourceEffect {
 			GdkRectangle rect = new GdkRectangle ();
 			for (int i=0; i<count; i++) {
 				long /*int*/ path = OS.g_list_data (list);
-				OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
-				icons[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path);
-				if (OS.GTK3) {
+				GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect);
+				icons[i] = GTK.gtk_tree_view_create_row_drag_icon(handle, path);
+				if (GTK.GTK3) {
 					switch (Cairo.cairo_surface_get_type(icons[i])) {
 					case Cairo.CAIRO_SURFACE_TYPE_IMAGE:
 						w[0] = Cairo.cairo_image_surface_get_width(icons[i]);
@@ -130,11 +130,11 @@ public class ListDragSourceEffect extends DragSourceEffect {
 				yy[i] = rect.y;
 				hh[i] = h[0];
 				list = OS.g_list_next (list);
-				OS.gtk_tree_path_free (path);
+				GTK.gtk_tree_path_free (path);
 			}
 			long /*int*/ surface;
 			long /*int*/ cairo ;
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, width, height);
 				if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 				cairo = Cairo.cairo_create(surface);
@@ -146,19 +146,19 @@ public class ListDragSourceEffect extends DragSourceEffect {
 			if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 			Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE);
 			for (int i=0; i<count; i++) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					Cairo.cairo_set_source_surface (cairo, icons[i], 2, yy[i] - yy[0] + 2);
 				} else {
 					OS.gdk_cairo_set_source_pixmap(cairo, icons[i], 0, yy[i] - yy[0]);
 				}
 				Cairo.cairo_rectangle(cairo, 0, yy[i] - yy[0], width, hh[i]);
 				Cairo.cairo_fill(cairo);
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					Cairo.cairo_surface_destroy(icons[i]);
 				}
 			}
 			Cairo.cairo_destroy(cairo);
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				dragSourceImage =  Image.gtk_new (display, SWT.ICON, surface, 0);
 			} else {
 				long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java
index f56e6c9491..d35e1e260c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java
@@ -104,8 +104,8 @@ public GLCanvas (Composite parent, int style, GLData data) {
 		glxAttrib [pos++] = data.samples;
 	}
 	glxAttrib [pos++] = 0;
-	OS.gtk_widget_realize (handle);
-	long /*int*/ window = OS.gtk_widget_get_window (handle);
+	GTK.gtk_widget_realize (handle);
+	long /*int*/ window = GTK.gtk_widget_get_window (handle);
 
 	long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window));
 	long /*int*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib);
@@ -134,7 +134,7 @@ public GLCanvas (Composite parent, int style, GLData data) {
 	glWindow = OS.gdk_window_new (window, attrs, OS.GDK_WA_VISUAL);
 	OS.gdk_window_set_user_data (glWindow, handle);
 	if ((style & SWT.NO_BACKGROUND) != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		xWindow = OS.gdk_x11_window_get_xid (glWindow);
 	} else {
 		xWindow = OS.gdk_x11_drawable_get_xid (glWindow);
@@ -160,7 +160,7 @@ public GLCanvas (Composite parent, int style, GLData data) {
 			OS.gdk_window_resize (glWindow, clientArea.width, clientArea.height);
 			break;
 		case SWT.Dispose:
-			long /*int*/ window1 = OS.gtk_widget_get_window (handle);
+			long /*int*/ window1 = GTK.gtk_widget_get_window (handle);
 			long /*int*/ xDisplay1 = gdk_x11_display_get_xdisplay (window1);
 			if (context != 0) {
 				if (GLX.glXGetCurrentContext () == context) {
@@ -192,7 +192,7 @@ public GLCanvas (Composite parent, int style, GLData data) {
  */
 public GLData getGLData () {
 	checkWidget ();
-	long /*int*/ window = OS.gtk_widget_get_window (handle);
+	long /*int*/ window = GTK.gtk_widget_get_window (handle);
 	long /*int*/ xDisplay = gdk_x11_display_get_xdisplay (window);
 	GLData data = new GLData ();
 	int [] value = new int [1];
@@ -255,7 +255,7 @@ public boolean isCurrent () {
 public void setCurrent () {
 	checkWidget ();
 	if (GLX.glXGetCurrentContext () == context) return;
-	long /*int*/ window = OS.gtk_widget_get_window (handle);
+	long /*int*/ window = GTK.gtk_widget_get_window (handle);
 	long /*int*/ xDisplay = gdk_x11_display_get_xdisplay (window);
 	GLX.glXMakeCurrent (xDisplay, xWindow, context);
 }
@@ -270,7 +270,7 @@ public void setCurrent () {
  */
 public void swapBuffers () {
 	checkWidget ();
-	long /*int*/ window = OS.gtk_widget_get_window (handle);
+	long /*int*/ window = GTK.gtk_widget_get_window (handle);
 	long /*int*/ xDisplay = gdk_x11_display_get_xdisplay (window);
 	GLX.glXSwapBuffers (xDisplay, xWindow);
 }
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 7d440c0a8f..cc6b7a846d 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
@@ -20,7807 +20,963 @@
 #include "os_structs.h"
 #include "os_stats.h"
 
-#ifndef OS_NATIVE
-#define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func
-#endif
-
-#if (!defined(NO_Call__IIII) && !defined(JNI64)) || (!defined(NO_Call__JJII) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jint JNICALL OS_NATIVE(Call__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
-#else
-JNIEXPORT jint JNICALL OS_NATIVE(Call__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
-#endif
-{
-	jint rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, Call__IIII_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, Call__JJII_FUNC);
-#endif
-	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, Call__IIII_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, Call__JJII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO_Call__IIIJ) && !defined(JNI64)) || (!defined(NO_Call__JJIJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jlong JNICALL OS_NATIVE(Call__IIIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3)
-#else
-JNIEXPORT jlong JNICALL OS_NATIVE(Call__JJIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3)
-#endif
-{
-	jlong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, Call__IIIJ_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, Call__JJIJ_FUNC);
-#endif
-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, Call__IIIJ_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, Call__JJIJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO_GDK_1EVENT_1TYPE
-JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1TYPE)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GDK_1EVENT_1TYPE_FUNC);
-	rc = (jint)GDK_EVENT_TYPE((GdkEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, GDK_1EVENT_1TYPE_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GDK_1EVENT_1WINDOW
-JNIEXPORT jintLong JNICALL OS_NATIVE(GDK_1EVENT_1WINDOW)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GDK_1EVENT_1WINDOW_FUNC);
-	rc = (jintLong)GDK_EVENT_WINDOW((GdkEventAny *)arg0);
-	OS_NATIVE_EXIT(env, that, GDK_1EVENT_1WINDOW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GDK_1IS_1X11_1DISPLAY
-JNIEXPORT jboolean JNICALL OS_NATIVE(GDK_1IS_1X11_1DISPLAY)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, GDK_1IS_1X11_1DISPLAY_FUNC);
-	rc = (jboolean)GDK_IS_X11_DISPLAY((GdkDisplay *)arg0);
-	OS_NATIVE_EXIT(env, that, GDK_1IS_1X11_1DISPLAY_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GInterfaceInfo_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GInterfaceInfo_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GInterfaceInfo_1sizeof_FUNC);
-	rc = (jint)GInterfaceInfo_sizeof();
-	OS_NATIVE_EXIT(env, that, GInterfaceInfo_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GPollFD_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GPollFD_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GPollFD_1sizeof_FUNC);
-	rc = (jint)GPollFD_sizeof();
-	OS_NATIVE_EXIT(env, that, GPollFD_1sizeof_FUNC);
-	return rc;
-}
+#ifndef GTK_NATIVE
+#define GTK_NATIVE(func) Java_org_eclipse_swt_internal_gtk_GTK_##func
 #endif
 
 #ifndef NO_GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING
-JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
+	GTK_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
 	rc = (jintLong)GTK_ACCEL_LABEL_GET_ACCEL_STRING((GtkAccelLabel *)arg0);
-	OS_NATIVE_EXIT(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
+	GTK_NATIVE_EXIT(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING
-JNIEXPORT void JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING)
+JNIEXPORT void JNICALL GTK_NATIVE(GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC);
+	GTK_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC);
 	GTK_ACCEL_LABEL_SET_ACCEL_STRING((GtkAccelLabel *)arg0, (gchar *)arg1);
-	OS_NATIVE_EXIT(env, that, GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC);
+	GTK_NATIVE_EXIT(env, that, GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC);
 }
 #endif
 
 #ifndef NO_GTK_1ENTRY_1IM_1CONTEXT
-JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
+	GTK_NATIVE_ENTER(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
 	rc = (jintLong)GTK_ENTRY_IM_CONTEXT((GtkEntry *)arg0);
-	OS_NATIVE_EXIT(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
+	GTK_NATIVE_EXIT(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GTK_1TEXTVIEW_1IM_1CONTEXT
-JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
+	GTK_NATIVE_ENTER(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
 	rc = (jintLong)GTK_TEXTVIEW_IM_CONTEXT((GtkTextView *)arg0);
-	OS_NATIVE_EXIT(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
+	GTK_NATIVE_EXIT(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GTK_1TYPE_1ACCESSIBLE
-JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1TYPE_1ACCESSIBLE)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(GTK_1TYPE_1ACCESSIBLE)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GTK_1TYPE_1ACCESSIBLE_FUNC);
+	GTK_NATIVE_ENTER(env, that, GTK_1TYPE_1ACCESSIBLE_FUNC);
 	rc = (jintLong)GTK_TYPE_ACCESSIBLE;
-	OS_NATIVE_EXIT(env, that, GTK_1TYPE_1ACCESSIBLE_FUNC);
+	GTK_NATIVE_EXIT(env, that, GTK_1TYPE_1ACCESSIBLE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GTK_1WIDGET_1GET_1CLASS
-JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1WIDGET_1GET_1CLASS)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(GTK_1WIDGET_1GET_1CLASS)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1GET_1CLASS_FUNC);
+	GTK_NATIVE_ENTER(env, that, GTK_1WIDGET_1GET_1CLASS_FUNC);
 	rc = (jintLong)GTK_WIDGET_GET_CLASS((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, GTK_1WIDGET_1GET_1CLASS_FUNC);
+	GTK_NATIVE_EXIT(env, that, GTK_1WIDGET_1GET_1CLASS_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GTK_1WIDGET_1REQUISITION_1HEIGHT
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1HEIGHT)
+JNIEXPORT jint JNICALL GTK_NATIVE(GTK_1WIDGET_1REQUISITION_1HEIGHT)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC);
+	GTK_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC);
 	rc = (jint)GTK_WIDGET_REQUISITION_HEIGHT((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC);
+	GTK_NATIVE_EXIT(env, that, GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GTK_1WIDGET_1REQUISITION_1WIDTH
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1WIDTH)
+JNIEXPORT jint JNICALL GTK_NATIVE(GTK_1WIDGET_1REQUISITION_1WIDTH)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC);
+	GTK_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC);
 	rc = (jint)GTK_WIDGET_REQUISITION_WIDTH((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GTypeInfo_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GTypeInfo_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GTypeInfo_1sizeof_FUNC);
-	rc = (jint)GTypeInfo_sizeof();
-	OS_NATIVE_EXIT(env, that, GTypeInfo_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GTypeQuery_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GTypeQuery_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GTypeQuery_1sizeof_FUNC);
-	rc = (jint)GTypeQuery_sizeof();
-	OS_NATIVE_EXIT(env, that, GTypeQuery_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_G_1OBJECT_1CLASS_1CONSTRUCTOR
-JNIEXPORT jintLong JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1CONSTRUCTOR)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC);
-	rc = (jintLong)G_OBJECT_CLASS_CONSTRUCTOR((GObjectClass *)arg0);
-	OS_NATIVE_EXIT(env, that, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR
-JNIEXPORT void JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC);
-	G_OBJECT_CLASS_SET_CONSTRUCTOR((GObjectClass *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC);
-}
-#endif
-
-#ifndef NO_G_1TYPE_1BOOLEAN
-JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1BOOLEAN)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1TYPE_1BOOLEAN_FUNC);
-	rc = (jintLong)G_TYPE_BOOLEAN;
-	OS_NATIVE_EXIT(env, that, G_1TYPE_1BOOLEAN_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_G_1TYPE_1DOUBLE
-JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1DOUBLE)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1TYPE_1DOUBLE_FUNC);
-	rc = (jintLong)G_TYPE_DOUBLE;
-	OS_NATIVE_EXIT(env, that, G_1TYPE_1DOUBLE_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_G_1TYPE_1FLOAT
-JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1FLOAT)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1TYPE_1FLOAT_FUNC);
-	rc = (jintLong)G_TYPE_FLOAT;
-	OS_NATIVE_EXIT(env, that, G_1TYPE_1FLOAT_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_G_1TYPE_1INT
-JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1INT)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1TYPE_1INT_FUNC);
-	rc = (jintLong)G_TYPE_INT;
-	OS_NATIVE_EXIT(env, that, G_1TYPE_1INT_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_G_1TYPE_1INT64
-JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1INT64)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1TYPE_1INT64_FUNC);
-	rc = (jintLong)G_TYPE_INT64;
-	OS_NATIVE_EXIT(env, that, G_1TYPE_1INT64_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_G_1VALUE_1TYPE
-JNIEXPORT jintLong JNICALL OS_NATIVE(G_1VALUE_1TYPE)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1VALUE_1TYPE_FUNC);
-	rc = (jintLong)G_VALUE_TYPE(arg0);
-	OS_NATIVE_EXIT(env, that, G_1VALUE_1TYPE_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkColor_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkColor_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkColor_1sizeof_FUNC);
-	rc = (jint)GdkColor_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkColor_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkDragContext_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkDragContext_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkDragContext_1sizeof_FUNC);
-	rc = (jint)GdkDragContext_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkDragContext_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventAny_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventAny_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventAny_1sizeof_FUNC);
-	rc = (jint)GdkEventAny_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventAny_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventButton_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventButton_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventButton_1sizeof_FUNC);
-	rc = (jint)GdkEventButton_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventButton_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventCrossing_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventCrossing_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventCrossing_1sizeof_FUNC);
-	rc = (jint)GdkEventCrossing_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventCrossing_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventExpose_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventExpose_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventExpose_1sizeof_FUNC);
-	rc = (jint)GdkEventExpose_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventExpose_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventFocus_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventFocus_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventFocus_1sizeof_FUNC);
-	rc = (jint)GdkEventFocus_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventFocus_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventKey_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventKey_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventKey_1sizeof_FUNC);
-	rc = (jint)GdkEventKey_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventKey_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventMotion_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventMotion_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventMotion_1sizeof_FUNC);
-	rc = (jint)GdkEventMotion_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventMotion_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventProperty_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventProperty_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventProperty_1sizeof_FUNC);
-	rc = (jint)GdkEventProperty_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventProperty_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventScroll_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventScroll_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventScroll_1sizeof_FUNC);
-	rc = (jint)GdkEventScroll_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventScroll_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventWindowState_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventWindowState_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEventWindowState_1sizeof_FUNC);
-	rc = (jint)GdkEventWindowState_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEventWindowState_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEvent_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEvent_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkEvent_1sizeof_FUNC);
-	rc = (jint)GdkEvent_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkEvent_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkGeometry_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkGeometry_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkGeometry_1sizeof_FUNC);
-	rc = (jint)GdkGeometry_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkGeometry_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkKeymapKey_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkKeymapKey_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkKeymapKey_1sizeof_FUNC);
-	rc = (jint)GdkKeymapKey_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkKeymapKey_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkRGBA_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkRGBA_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkRGBA_1sizeof_FUNC);
-	rc = (jint)GdkRGBA_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkRGBA_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkRectangle_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkRectangle_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkRectangle_1sizeof_FUNC);
-	rc = (jint)GdkRectangle_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkRectangle_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkWindowAttr_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkWindowAttr_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GdkWindowAttr_1sizeof_FUNC);
-	rc = (jint)GdkWindowAttr_sizeof();
-	OS_NATIVE_EXIT(env, that, GdkWindowAttr_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkAllocation_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkAllocation_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkAllocation_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkAllocation_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkAllocation_1sizeof_FUNC);
 	rc = (jint)GtkAllocation_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkAllocation_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkAllocation_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkBorder_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkBorder_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkBorder_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkBorder_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkBorder_1sizeof_FUNC);
 	rc = (jint)GtkBorder_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkBorder_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkBorder_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkCellRendererPixbufClass_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkCellRendererPixbufClass_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkCellRendererPixbufClass_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkCellRendererPixbufClass_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkCellRendererPixbufClass_1sizeof_FUNC);
 	rc = (jint)GtkCellRendererPixbufClass_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkCellRendererPixbufClass_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkCellRendererPixbufClass_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkCellRendererPixbuf_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkCellRendererPixbuf_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkCellRendererPixbuf_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkCellRendererPixbuf_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkCellRendererPixbuf_1sizeof_FUNC);
 	rc = (jint)GtkCellRendererPixbuf_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkCellRendererPixbuf_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkCellRendererPixbuf_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkCellRendererTextClass_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkCellRendererTextClass_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkCellRendererTextClass_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkCellRendererTextClass_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkCellRendererTextClass_1sizeof_FUNC);
 	rc = (jint)GtkCellRendererTextClass_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkCellRendererTextClass_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkCellRendererTextClass_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkCellRendererText_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkCellRendererText_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkCellRendererText_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkCellRendererText_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkCellRendererText_1sizeof_FUNC);
 	rc = (jint)GtkCellRendererText_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkCellRendererText_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkCellRendererText_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkCellRendererToggleClass_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkCellRendererToggleClass_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkCellRendererToggleClass_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkCellRendererToggleClass_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkCellRendererToggleClass_1sizeof_FUNC);
 	rc = (jint)GtkCellRendererToggleClass_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkCellRendererToggleClass_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkCellRendererToggleClass_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkCellRendererToggle_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkCellRendererToggle_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkCellRendererToggle_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkCellRendererToggle_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkCellRendererToggle_1sizeof_FUNC);
 	rc = (jint)GtkCellRendererToggle_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkCellRendererToggle_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkCellRendererToggle_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkRequisition_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkRequisition_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkRequisition_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkRequisition_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkRequisition_1sizeof_FUNC);
 	rc = (jint)GtkRequisition_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkRequisition_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkRequisition_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkTargetEntry_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkTargetEntry_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkTargetEntry_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkTargetEntry_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkTargetEntry_1sizeof_FUNC);
 	rc = (jint)GtkTargetEntry_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkTargetEntry_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkTargetEntry_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkTextIter_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkTextIter_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkTextIter_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkTextIter_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkTextIter_1sizeof_FUNC);
 	rc = (jint)GtkTextIter_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkTextIter_1sizeof_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkTextIter_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_GtkTreeIter_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkTreeIter_1sizeof)
+JNIEXPORT jint JNICALL GTK_NATIVE(GtkTreeIter_1sizeof)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GtkTreeIter_1sizeof_FUNC);
+	GTK_NATIVE_ENTER(env, that, GtkTreeIter_1sizeof_FUNC);
 	rc = (jint)GtkTreeIter_sizeof();
-	OS_NATIVE_EXIT(env, that, GtkTreeIter_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoAttrColor_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoAttrColor_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PangoAttrColor_1sizeof_FUNC);
-	rc = (jint)PangoAttrColor_sizeof();
-	OS_NATIVE_EXIT(env, that, PangoAttrColor_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoAttrInt_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoAttrInt_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PangoAttrInt_1sizeof_FUNC);
-	rc = (jint)PangoAttrInt_sizeof();
-	OS_NATIVE_EXIT(env, that, PangoAttrInt_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoAttribute_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoAttribute_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PangoAttribute_1sizeof_FUNC);
-	rc = (jint)PangoAttribute_sizeof();
-	OS_NATIVE_EXIT(env, that, PangoAttribute_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoItem_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoItem_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PangoItem_1sizeof_FUNC);
-	rc = (jint)PangoItem_sizeof();
-	OS_NATIVE_EXIT(env, that, PangoItem_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoLayoutLine_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoLayoutLine_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PangoLayoutLine_1sizeof_FUNC);
-	rc = (jint)PangoLayoutLine_sizeof();
-	OS_NATIVE_EXIT(env, that, PangoLayoutLine_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoLayoutRun_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoLayoutRun_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PangoLayoutRun_1sizeof_FUNC);
-	rc = (jint)PangoLayoutRun_sizeof();
-	OS_NATIVE_EXIT(env, that, PangoLayoutRun_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoLogAttr_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoLogAttr_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PangoLogAttr_1sizeof_FUNC);
-	rc = (jint)PangoLogAttr_sizeof();
-	OS_NATIVE_EXIT(env, that, PangoLogAttr_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoRectangle_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoRectangle_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, PangoRectangle_1sizeof_FUNC);
-	rc = (jint)PangoRectangle_sizeof();
-	OS_NATIVE_EXIT(env, that, PangoRectangle_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RTLD_1GLOBAL
-JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1GLOBAL)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RTLD_1GLOBAL_FUNC);
-	rc = (jint)RTLD_GLOBAL;
-	OS_NATIVE_EXIT(env, that, RTLD_1GLOBAL_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RTLD_1LAZY
-JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1LAZY)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RTLD_1LAZY_FUNC);
-	rc = (jint)RTLD_LAZY;
-	OS_NATIVE_EXIT(env, that, RTLD_1LAZY_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RTLD_1NOW
-JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1NOW)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RTLD_1NOW_FUNC);
-	rc = (jint)RTLD_NOW;
-	OS_NATIVE_EXIT(env, that, RTLD_1NOW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_XAnyEvent_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(XAnyEvent_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, XAnyEvent_1sizeof_FUNC);
-	rc = (jint)XAnyEvent_sizeof();
-	OS_NATIVE_EXIT(env, that, XAnyEvent_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_XEvent_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(XEvent_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, XEvent_1sizeof_FUNC);
-	rc = (jint)XEvent_sizeof();
-	OS_NATIVE_EXIT(env, that, XEvent_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_XExposeEvent_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(XExposeEvent_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, XExposeEvent_1sizeof_FUNC);
-	rc = (jint)XExposeEvent_sizeof();
-	OS_NATIVE_EXIT(env, that, XExposeEvent_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_XFocusChangeEvent_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(XFocusChangeEvent_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, XFocusChangeEvent_1sizeof_FUNC);
-	rc = (jint)XFocusChangeEvent_sizeof();
-	OS_NATIVE_EXIT(env, that, XFocusChangeEvent_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_X_1EVENT_1TYPE
-JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, X_1EVENT_1TYPE_FUNC);
-	rc = (jint)X_EVENT_TYPE((XEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, X_1EVENT_1TYPE_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_X_1EVENT_1WINDOW
-JNIEXPORT jintLong JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, X_1EVENT_1WINDOW_FUNC);
-	rc = (jintLong)X_EVENT_WINDOW((XAnyEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, X_1EVENT_1WINDOW_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1Call
-JNIEXPORT jint JNICALL OS_NATIVE(_1Call)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1Call_FUNC);
-	rc = (jint)((jint (*)())arg0)(arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1Call_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1FcConfigAppFontAddFile
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1FcConfigAppFontAddFile_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)FcConfigAppFontAddFile(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, FcConfigAppFontAddFile)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1FcConfigAppFontAddFile_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1GDK_1PIXMAP_1XID
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GDK_1PIXMAP_1XID_FUNC);
-	rc = (jintLong)GDK_PIXMAP_XID((GdkPixmap *)arg0);
-	OS_NATIVE_EXIT(env, that, _1GDK_1PIXMAP_1XID_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1GDK_1TYPE_1COLOR
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1COLOR)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1COLOR_FUNC);
-	rc = (jintLong)GDK_TYPE_COLOR;
-	OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1COLOR_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1GDK_1TYPE_1PIXBUF
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
-	rc = (jintLong)GDK_TYPE_PIXBUF;
-	OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1GDK_1TYPE_1RGBA
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1RGBA)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1RGBA_FUNC);
-	rc = (jintLong)GDK_TYPE_RGBA;
-	OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1RGBA_FUNC);
+	GTK_NATIVE_EXIT(env, that, GtkTreeIter_1sizeof_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GET_1FUNCTION_1POINTER_1gtk_1false
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GET_1FUNCTION_1POINTER_1gtk_1false)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GET_1FUNCTION_1POINTER_1gtk_1false)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GET_1FUNCTION_1POINTER_1gtk_1false_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GET_1FUNCTION_1POINTER_1gtk_1false_FUNC);
 	rc = (jintLong)GET_FUNCTION_POINTER_gtk_false();
-	OS_NATIVE_EXIT(env, that, _1GET_1FUNCTION_1POINTER_1gtk_1false_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1GString_1len
-JNIEXPORT jint JNICALL OS_NATIVE(_1GString_1len)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GString_1len_FUNC);
-	rc = (jint)((GString *)arg0)->len;
-	OS_NATIVE_EXIT(env, that, _1GString_1len_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1GString_1str
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GString_1str)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GString_1str_FUNC);
-	rc = (jintLong)((GString *)arg0)->str;
-	OS_NATIVE_EXIT(env, that, _1GString_1str_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GET_1FUNCTION_1POINTER_1gtk_1false_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1ACCESSIBLE
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1ACCESSIBLE)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1ACCESSIBLE)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1ACCESSIBLE_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1ACCESSIBLE_FUNC);
 	rc = (jintLong)GTK_ACCESSIBLE(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1ACCESSIBLE_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1ACCESSIBLE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1ACCEL_1LABEL
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1ACCEL_1LABEL)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1ACCEL_1LABEL)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1ACCEL_1LABEL_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1ACCEL_1LABEL_FUNC);
 	rc = (jboolean)GTK_IS_ACCEL_LABEL(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1ACCEL_1LABEL_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1ACCEL_1LABEL_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1BUTTON
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1BUTTON)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1BUTTON)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1BUTTON_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1BUTTON_FUNC);
 	rc = (jboolean)GTK_IS_BUTTON(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1BUTTON_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1BUTTON_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1PIXBUF
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1PIXBUF_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1PIXBUF_FUNC);
 	rc = (jboolean)GTK_IS_CELL_RENDERER_PIXBUF(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1CELL_1RENDERER_1PIXBUF_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1CELL_1RENDERER_1PIXBUF_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TEXT
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TEXT_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TEXT_FUNC);
 	rc = (jboolean)GTK_IS_CELL_RENDERER_TEXT(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1CELL_1RENDERER_1TEXT_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1CELL_1RENDERER_1TEXT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TOGGLE
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TOGGLE_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TOGGLE_FUNC);
 	rc = (jboolean)GTK_IS_CELL_RENDERER_TOGGLE(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1CELL_1RENDERER_1TOGGLE_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1CELL_1RENDERER_1TOGGLE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1CONTAINER
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CONTAINER)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1CONTAINER)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CONTAINER_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1CONTAINER_FUNC);
 	rc = (jboolean)GTK_IS_CONTAINER(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1CONTAINER_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1CONTAINER_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1IMAGE_1MENU_1ITEM
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1IMAGE_1MENU_1ITEM)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1IMAGE_1MENU_1ITEM)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1IMAGE_1MENU_1ITEM_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1IMAGE_1MENU_1ITEM_FUNC);
 	rc = (jboolean)GTK_IS_IMAGE_MENU_ITEM(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1IMAGE_1MENU_1ITEM_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1IMAGE_1MENU_1ITEM_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1LABEL
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1LABEL)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1LABEL)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1LABEL_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1LABEL_FUNC);
 	rc = (jboolean)GTK_IS_LABEL(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1LABEL_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1LABEL_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1MENU_1ITEM
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1MENU_1ITEM)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1MENU_1ITEM)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1MENU_1ITEM_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1MENU_1ITEM_FUNC);
 	rc = (jboolean)GTK_IS_MENU_ITEM(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1MENU_1ITEM_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1MENU_1ITEM_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1PLUG
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1PLUG)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1PLUG)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1PLUG_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1PLUG_FUNC);
 	rc = (jboolean)GTK_IS_PLUG(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1PLUG_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1PLUG_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1SCROLLED_1WINDOW
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1SCROLLED_1WINDOW)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1SCROLLED_1WINDOW)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1SCROLLED_1WINDOW_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1SCROLLED_1WINDOW_FUNC);
 	rc = (jboolean)GTK_IS_SCROLLED_WINDOW(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1SCROLLED_1WINDOW_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1SCROLLED_1WINDOW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1IS_1WINDOW
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1WINDOW)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1GTK_1IS_1WINDOW)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1IS_1WINDOW_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1IS_1WINDOW_FUNC);
 	rc = (jboolean)GTK_IS_WINDOW(arg0);
-	OS_NATIVE_EXIT(env, that, _1GTK_1IS_1WINDOW_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1IS_1WINDOW_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1STOCK_1CANCEL
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1STOCK_1CANCEL)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1STOCK_1CANCEL)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
 	rc = (jintLong)GTK_STOCK_CANCEL;
-	OS_NATIVE_EXIT(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1STOCK_1OK
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1STOCK_1OK)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1STOCK_1OK)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1STOCK_1OK_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1STOCK_1OK_FUNC);
 	rc = (jintLong)GTK_STOCK_OK;
-	OS_NATIVE_EXIT(env, that, _1GTK_1STOCK_1OK_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1STOCK_1OK_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
 	rc = (jintLong)GTK_TYPE_CELL_RENDERER_PIXBUF;
-	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TEXT
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
 	rc = (jintLong)GTK_TYPE_CELL_RENDERER_TEXT;
-	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
 	rc = (jintLong)GTK_TYPE_CELL_RENDERER_TOGGLE;
-	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1FIXED
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1FIXED)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1FIXED)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1FIXED_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1FIXED_FUNC);
 	rc = (jintLong)GTK_TYPE_FIXED;
-	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1FIXED_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1FIXED_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1IM_1MULTICONTEXT
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1IM_1MULTICONTEXT)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1IM_1MULTICONTEXT)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1IM_1MULTICONTEXT_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1IM_1MULTICONTEXT_FUNC);
 	rc = (jintLong)GTK_TYPE_IM_MULTICONTEXT;
-	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1IM_1MULTICONTEXT_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1IM_1MULTICONTEXT_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1MENU
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1MENU)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1MENU)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1MENU_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1MENU_FUNC);
 	rc = (jintLong)GTK_TYPE_MENU;
-	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1MENU_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1MENU_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1TYPE_1WIDGET
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1GTK_1TYPE_1WIDGET)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
 	rc = (jintLong)GTK_TYPE_WIDGET;
-	OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1GTK_1WIDGET_1SET_1FLAGS
-JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1SET_1FLAGS)
+JNIEXPORT void JNICALL GTK_NATIVE(_1GTK_1WIDGET_1SET_1FLAGS)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1SET_1FLAGS_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1SET_1FLAGS_FUNC);
 	GTK_WIDGET_SET_FLAGS(arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1GTK_1WIDGET_1SET_1FLAGS_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1GTK_1WIDGET_1SET_1FLAGS_FUNC);
 }
 #endif
 
 #ifndef NO__1GTK_1WIDGET_1UNSET_1FLAGS
-JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1UNSET_1FLAGS)
+JNIEXPORT void JNICALL GTK_NATIVE(_1GTK_1WIDGET_1UNSET_1FLAGS)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1UNSET_1FLAGS_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1UNSET_1FLAGS_FUNC);
 	GTK_WIDGET_UNSET_FLAGS(arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1GTK_1WIDGET_1UNSET_1FLAGS_FUNC);
-}
-#endif
-
-#ifndef NO__1G_1OBJECT_1CLASS
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1CLASS_FUNC);
-	rc = (jintLong)G_OBJECT_CLASS(arg0);
-	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1CLASS_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1G_1OBJECT_1GET_1CLASS
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
-	rc = (jintLong)G_OBJECT_GET_CLASS(arg0);
-	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1G_1OBJECT_1TYPE
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_FUNC);
-	rc = (jintLong)G_OBJECT_TYPE(arg0);
-	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1G_1OBJECT_1TYPE_1NAME
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
-	rc = (jintLong)G_OBJECT_TYPE_NAME(arg0);
-	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1G_1TYPE_1CHECK_1INSTANCE_1TYPE
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1G_1TYPE_1CHECK_1INSTANCE_1TYPE)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC);
-	rc = (jboolean)G_TYPE_CHECK_INSTANCE_TYPE(arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1G_1TYPE_1STRING
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1STRING)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1G_1TYPE_1STRING_FUNC);
-	rc = (jintLong)G_TYPE_STRING;
-	OS_NATIVE_EXIT(env, that, _1G_1TYPE_1STRING_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1PANGO_1PIXELS
-JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1PIXELS)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1PANGO_1PIXELS_FUNC);
-	rc = (jint)PANGO_PIXELS(arg0);
-	OS_NATIVE_EXIT(env, that, _1PANGO_1PIXELS_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1PANGO_1TYPE_1FONT_1DESCRIPTION
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
-	rc = (jintLong)PANGO_TYPE_FONT_DESCRIPTION;
-	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1PANGO_1TYPE_1FONT_1FACE
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1FACE)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1FACE_FUNC);
-	rc = (jintLong)PANGO_TYPE_FONT_FACE;
-	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1FACE_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1PANGO_1TYPE_1FONT_1FAMILY
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1FAMILY)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1FAMILY_FUNC);
-	rc = (jintLong)PANGO_TYPE_FONT_FAMILY;
-	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1FAMILY_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1PANGO_1TYPE_1LAYOUT
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1LAYOUT)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1LAYOUT_FUNC);
-	rc = (jintLong)PANGO_TYPE_LAYOUT;
-	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1LAYOUT_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XCheckIfEvent
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XCheckIfEvent_FUNC);
-	rc = (jboolean)XCheckIfEvent((Display *)arg0, (XEvent *)arg1, (Bool (*)())arg2, (XPointer)arg3);
-	OS_NATIVE_EXIT(env, that, _1XCheckIfEvent_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XDefaultRootWindow
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1XDefaultRootWindow)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XDefaultRootWindow_FUNC);
-	rc = (jintLong)XDefaultRootWindow((Display *)arg0);
-	OS_NATIVE_EXIT(env, that, _1XDefaultRootWindow_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XDefaultScreen
-JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XDefaultScreen_FUNC);
-	rc = (jint)XDefaultScreen((Display *)arg0);
-	OS_NATIVE_EXIT(env, that, _1XDefaultScreen_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XFlush
-JNIEXPORT void JNICALL OS_NATIVE(_1XFlush)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1XFlush_FUNC);
-	XFlush((Display *)arg0);
-	OS_NATIVE_EXIT(env, that, _1XFlush_FUNC);
-}
-#endif
-
-#ifndef NO__1XFree
-JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1XFree_FUNC);
-	XFree((void *)arg0);
-	OS_NATIVE_EXIT(env, that, _1XFree_FUNC);
-}
-#endif
-
-#ifndef NO__1XGetWindowProperty
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1XGetWindowProperty)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jboolean arg5, jintLong arg6, jintLongArray arg7, jintArray arg8, jintArray arg9, jintArray arg10, jintLongArray arg11)
-{
-	jintLong *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint *lparg9=NULL;
-	jint *lparg10=NULL;
-	jintLong *lparg11=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XGetWindowProperty_FUNC);
-	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail;
-	if (arg10) if ((lparg10 = (*env)->GetIntArrayElements(env, arg10, NULL)) == NULL) goto fail;
-	if (arg11) if ((lparg11 = (*env)->GetIntLongArrayElements(env, arg11, NULL)) == NULL) goto fail;
-	rc = (jintLong)XGetWindowProperty((Display *)arg0, (Window)arg1, (Atom)arg2, arg3, arg4, arg5, (Atom)arg6, (Atom*)lparg7, (int *)lparg8, (unsigned long *)lparg9, (unsigned long *)lparg10, (unsigned char **)lparg11);
-fail:
-	if (arg11 && lparg11) (*env)->ReleaseIntLongArrayElements(env, arg11, lparg11, 0);
-	if (arg10 && lparg10) (*env)->ReleaseIntArrayElements(env, arg10, lparg10, 0);
-	if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0);
-	if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
-	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
-	OS_NATIVE_EXIT(env, that, _1XGetWindowProperty_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XKeysymToKeycode
-JNIEXPORT jint JNICALL OS_NATIVE(_1XKeysymToKeycode)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XKeysymToKeycode_FUNC);
-	rc = (jint)XKeysymToKeycode((Display *)arg0, (KeySym)arg1);
-	OS_NATIVE_EXIT(env, that, _1XKeysymToKeycode_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XQueryPointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-{
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jint *lparg4=NULL;
-	jint *lparg5=NULL;
-	jint *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XQueryPointer_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(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;
-	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
-	rc = (jint)XQueryPointer((Display *)arg0, (Window)arg1, (Window *)lparg2, (Window *)lparg3, (int *)lparg4, (int *)lparg5, (int *)lparg6, (int *)lparg7, (unsigned int *)lparg8);
-fail:
-	if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
-	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
-	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)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1XQueryPointer_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XSetErrorHandler
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetErrorHandler)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XSetErrorHandler_FUNC);
-	rc = (jintLong)XSetErrorHandler((XErrorHandler)arg0);
-	OS_NATIVE_EXIT(env, that, _1XSetErrorHandler_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XSetIOErrorHandler
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetIOErrorHandler)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XSetIOErrorHandler_FUNC);
-	rc = (jintLong)XSetIOErrorHandler((XIOErrorHandler)arg0);
-	OS_NATIVE_EXIT(env, that, _1XSetIOErrorHandler_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XSetInputFocus
-JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XSetInputFocus_FUNC);
-	rc = (jint)XSetInputFocus((Display *)arg0, (Window)arg1, arg2, arg3);
-	OS_NATIVE_EXIT(env, that, _1XSetInputFocus_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XSetTransientForHint
-JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XSetTransientForHint_FUNC);
-	rc = (jint)XSetTransientForHint((Display *)arg0, (Window)arg1, (Window)arg2);
-	OS_NATIVE_EXIT(env, that, _1XSetTransientForHint_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XSynchronize
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSynchronize)
-	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1XSynchronize_FUNC);
-	rc = (jintLong)XSynchronize((Display *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1XSynchronize_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1XTestFakeKeyEvent
-JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeKeyEvent)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jintLong arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1XTestFakeKeyEvent_FUNC);
-	XTestFakeKeyEvent((Display *)arg0, arg1, (Bool)arg2, (unsigned long)arg3);
-	OS_NATIVE_EXIT(env, that, _1XTestFakeKeyEvent_FUNC);
-}
-#endif
-
-#ifndef NO__1access
-JNIEXPORT jint JNICALL OS_NATIVE(_1access)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1access_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)access((const char*)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1access_FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1call__IIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-#endif
-{
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1call__IIIII_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1call__JJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1call__IIIII_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1call__JJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1call__IIIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-#endif
-{
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1call__IIIIIII_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1call__JJJJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1call__IIIIIII_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1call__JJJJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1call__IIIIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
-#endif
-{
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1call__IIIIIIII_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1call__JJJJJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1call__IIIIIIII_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1call__JJJJJJJJ_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO__1dlopen
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlopen)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1dlopen_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)dlopen((const char *)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1dlopen_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1create_1from_1commandline
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1create_1from_1commandline)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1create_1from_1commandline_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_app_info_create_from_commandline((gchar *)lparg0, (gchar *)lparg1, (GAppInfoCreateFlags)arg2, (GError **)arg3);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1create_1from_1commandline_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1get_1all
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1all)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1all_FUNC);
-	rc = (jintLong)g_app_info_get_all();
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1all_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1get_1default_1for_1type
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1default_1for_1type)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1default_1for_1type_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_app_info_get_default_for_type((gchar *)lparg0, (gboolean)arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1default_1for_1type_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1get_1executable
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1executable)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1executable_FUNC);
-	rc = (jintLong)g_app_info_get_executable((GAppInfo *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1executable_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1get_1icon
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1icon)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1icon_FUNC);
-	rc = (jintLong)g_app_info_get_icon((GAppInfo *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1icon_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1get_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1name_FUNC);
-	rc = (jintLong)g_app_info_get_name((GAppInfo *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1launch
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1launch_FUNC);
-	rc = (jboolean)g_app_info_launch((GAppInfo *)arg0, (GList *)arg1, (GAppLaunchContext *)arg2, (GError **)arg3);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1launch_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1launch_1default_1for_1uri
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch_1default_1for_1uri)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1launch_1default_1for_1uri_FUNC);
-	rc = (jboolean)g_app_info_launch_default_for_uri((char *)arg0, (GAppLaunchContext *)arg1, (GError **)arg2);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1launch_1default_1for_1uri_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1should_1show
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1should_1show)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1should_1show_FUNC);
-	rc = (jboolean)g_app_info_should_show((GAppInfo *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1should_1show_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1app_1info_1supports_1uris
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1supports_1uris)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1supports_1uris_FUNC);
-	rc = (jboolean)g_app_info_supports_uris((GAppInfo *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1supports_1uris_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1bus_1own_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1bus_1own_1name)
-	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
-{
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1bus_1own_1name_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)g_bus_own_name((GBusType)arg0, (const gchar *)lparg1, (GBusNameOwnerFlags)arg2, (GBusAcquiredCallback)arg3, (GBusNameAcquiredCallback)arg4, (GBusNameLostCallback)arg5, (gpointer)arg6, (GDestroyNotify)arg7);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1bus_1own_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1bytes_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1bytes_1new)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1bytes_1new_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)g_bytes_new((gconstpointer)lparg0, (gsize)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_bytes_new)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gconstpointer, gsize))fp)((gconstpointer)lparg0, (gsize)arg1);
-		}
-	}
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1bytes_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1bytes_1unref
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1bytes_1unref)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1bytes_1unref_FUNC);
-/*
-	g_bytes_unref((GBytes *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_bytes_unref)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GBytes *))fp)((GBytes *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1g_1bytes_1unref_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1cclosure_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1cclosure_1new)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1cclosure_1new_FUNC);
-	rc = (jintLong)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2);
-	OS_NATIVE_EXIT(env, that, _1g_1cclosure_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1closure_1ref
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1closure_1ref)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1closure_1ref_FUNC);
-	rc = (jintLong)g_closure_ref((GClosure *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1closure_1ref_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1closure_1sink
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1sink)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1closure_1sink_FUNC);
-	g_closure_sink((GClosure *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1closure_1sink_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1closure_1unref
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1closure_1unref_FUNC);
-	g_closure_unref((GClosure *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1closure_1unref_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1content_1type_1equals
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1equals)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1content_1type_1equals_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)g_content_type_equals((gchar *)arg0, (gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1content_1type_1equals_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1content_1type_1is_1a
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1is_1a)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1content_1type_1is_1a_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)g_content_type_is_a((gchar *)arg0, (gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1content_1type_1is_1a_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1dbus_1connection_1register_1object
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1dbus_1connection_1register_1object)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLongArray arg3, jintLong arg4, jintLong arg5, jintLongArray arg6)
-{
-	jbyte *lparg1=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg6=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1dbus_1connection_1register_1object_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	rc = (jint)g_dbus_connection_register_object((GDBusConnection *)arg0, (const gchar *)lparg1, (GDBusInterfaceInfo *)arg2, (const GDBusInterfaceVTable *)lparg3, (gpointer)arg4, (GDestroyNotify)arg5, (GError **)lparg6);
-fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1dbus_1connection_1register_1object_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1dbus_1method_1invocation_1return_1value
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1dbus_1method_1invocation_1return_1value)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1dbus_1method_1invocation_1return_1value_FUNC);
-	g_dbus_method_invocation_return_value((GDBusMethodInvocation *)arg0, (GVariant *)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1dbus_1method_1invocation_1return_1value_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1dbus_1node_1info_1lookup_1interface
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1lookup_1interface)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1dbus_1node_1info_1lookup_1interface_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_dbus_node_info_lookup_interface((GDBusNodeInfo *)arg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1dbus_1node_1info_1lookup_1interface_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1dbus_1node_1info_1new_1for_1xml
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1new_1for_1xml)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1dbus_1node_1info_1new_1for_1xml_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_dbus_node_info_new_for_xml((const gchar *)lparg0, (GError **)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1dbus_1node_1info_1new_1for_1xml_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1error_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1error_1free)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1error_1free_FUNC);
-	g_error_free((GError *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1error_1free_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1error_1get_1message
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1error_1get_1message)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1error_1get_1message_FUNC);
-	rc = (jintLong)g_error_get_message((GError *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1error_1get_1message_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1file_1get_1uri
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1uri)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1file_1get_1uri_FUNC);
-	rc = (jintLong)g_file_get_uri((GFile *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1file_1get_1uri_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1file_1info_1get_1content_1type
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1info_1get_1content_1type)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1file_1info_1get_1content_1type_FUNC);
-	rc = (jintLong)g_file_info_get_content_type((GFileInfo *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1file_1info_1get_1content_1type_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1file_1new_1for_1commandline_1arg
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_file_new_for_commandline_arg((const char *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1file_1new_1for_1path
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1path_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_file_new_for_path((const char *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1path_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1file_1new_1for_1uri
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1uri)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1uri_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_file_new_for_uri((const char *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1uri_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1file_1query_1info
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1query_1info)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-{
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1file_1query_1info_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_file_query_info((GFile *)arg0, (const char *)lparg1, (GFileQueryInfoFlags)arg2, (GCancellable *)arg3, (GError **)arg4);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1file_1query_1info_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1file_1test
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1file_1test)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1file_1test_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jboolean)g_file_test((const gchar *)lparg0, (GFileTest)arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1file_1test_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1filename_1display_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1display_1name)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1filename_1display_1name_FUNC);
-	rc = (jintLong)g_filename_display_name((const gchar *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1filename_1display_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1filename_1from_1uri
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
-{
-	jintLong *lparg1=NULL;
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1uri_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1uri_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1filename_1from_1utf8
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-{
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1utf8_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1utf8_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1filename_1to_1uri
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
-{
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1uri_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1uri_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1filename_1to_1utf8
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-{
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1utf8_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1utf8_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1free)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1free_FUNC);
-	g_free((gpointer)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1free_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1hash_1table_1get_1values
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1hash_1table_1get_1values)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1hash_1table_1get_1values_FUNC);
-	rc = (jintLong)g_hash_table_get_values((GHashTable *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1hash_1table_1get_1values_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1icon_1new_1for_1string
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1new_1for_1string)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1icon_1new_1for_1string_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_icon_new_for_string((const gchar *)lparg0, (GError **)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1icon_1new_1for_1string_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1icon_1to_1string
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1to_1string)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1icon_1to_1string_FUNC);
-	rc = (jintLong)g_icon_to_string((GIcon *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1icon_1to_1string_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1idle_1add
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1idle_1add_FUNC);
-	rc = (jint)g_idle_add((GSourceFunc)arg0, (gpointer)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1idle_1add_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1append
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1append)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC);
-	rc = (jintLong)g_list_append((GList *)arg0, (gpointer)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1data
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1data)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1data_FUNC);
-	rc = (jintLong)g_list_data((GList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1data_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC);
-	g_list_free((GList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1free_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1list_1free_11
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1list_1free_11_FUNC);
-	g_list_free_1((GList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1free_11_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1list_1last
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1last)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1last_FUNC);
-	rc = (jintLong)g_list_last((GList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1last_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1length
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1length_FUNC);
-	rc = (jint)g_list_length((GList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1length_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1next
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1next)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC);
-	rc = (jintLong)g_list_next(arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1nth
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1nth_FUNC);
-	rc = (jintLong)g_list_nth((GList *)arg0, (guint)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1nth_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1nth_1data
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth_1data)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1nth_1data_FUNC);
-	rc = (jintLong)g_list_nth_data((GList *)arg0, (guint)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1nth_1data_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1prepend
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1prepend)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1prepend_FUNC);
-	rc = (jintLong)g_list_prepend((GList *)arg0, (gpointer)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1prepend_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1previous
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1previous)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1previous_FUNC);
-	rc = (jintLong)g_list_previous(arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1previous_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1remove_1link
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1remove_1link)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1list_1remove_1link_FUNC);
-	rc = (jintLong)g_list_remove_link((GList *)arg0, (GList *)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1remove_1link_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1list_1set_1next
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1list_1set_1next_FUNC);
-	g_list_set_next((GList *)arg0, (GList *)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1set_1next_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1list_1set_1previous
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1list_1set_1previous_FUNC);
-	g_list_set_previous((GList *)arg0, (GList *)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1list_1set_1previous_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1log_1default_1handler
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1default_1handler)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1log_1default_1handler_FUNC);
-	g_log_default_handler((gchar *)arg0, (GLogLevelFlags)arg1, (gchar *)arg2, (gpointer)arg3);
-	OS_NATIVE_EXIT(env, that, _1g_1log_1default_1handler_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1log_1remove_1handler
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1remove_1handler)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, _1g_1log_1remove_1handler_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	g_log_remove_handler((gchar *)lparg0, (gint)arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1g_1log_1remove_1handler_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1log_1set_1handler
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1log_1set_1handler)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLong arg2, jintLong arg3)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1log_1set_1handler_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)g_log_set_handler((gchar *)lparg0, (GLogLevelFlags)arg1, (GLogFunc)arg2, (gpointer)arg3);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1g_1log_1set_1handler_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1main_1context_1acquire
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1acquire_FUNC);
-	rc = (jboolean)g_main_context_acquire((GMainContext *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1acquire_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1main_1context_1check
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1check_FUNC);
-	rc = (jint)g_main_context_check((GMainContext *)arg0, arg1, (GPollFD *)arg2, arg3);
-	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1check_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1main_1context_1default
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1default)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1default_FUNC);
-	rc = (jintLong)g_main_context_default();
-	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1default_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1main_1context_1get_1poll_1func
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
-	rc = (jintLong)g_main_context_get_poll_func((GMainContext *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1main_1context_1iteration
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration)
-	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1iteration_FUNC);
-	rc = (jboolean)g_main_context_iteration((GMainContext *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1iteration_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1main_1context_1prepare
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1prepare)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
-{
-	jint *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1prepare_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)g_main_context_prepare((GMainContext *)arg0, (gint *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1prepare_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1main_1context_1query
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1query)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintLong arg3, jint arg4)
-{
-	jint *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1query_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)g_main_context_query((GMainContext *)arg0, arg1, (gint *)lparg2, (GPollFD *)arg3, arg4);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1query_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1main_1context_1release
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1release_FUNC);
-	g_main_context_release((GMainContext *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1release_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1malloc
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1malloc)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1malloc_FUNC);
-	rc = (jintLong)g_malloc((gulong)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1malloc_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1object_1class_1find_1property
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1class_1find_1property)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1object_1class_1find_1property_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_object_class_find_property((GObjectClass *)arg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1object_1class_1find_1property_FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1g_1object_1get__I_3B_3II) && !defined(JNI64)) || (!defined(NO__1g_1object_1get__J_3B_3IJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__J_3B_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-	jint *lparg2=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1get__I_3B_3II_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1get__J_3B_3IJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1get__I_3B_3II_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1get__J_3B_3IJ_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1object_1get__I_3B_3JI) && !defined(JNI64)) || (!defined(NO__1g_1object_1get__J_3B_3JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__I_3B_3JI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-	jlong *lparg2=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1get__I_3B_3JI_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1get__J_3B_3JJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1get__I_3B_3JI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1get__J_3B_3JJ_FUNC);
-#endif
-}
-#endif
-
-#ifndef NO__1g_1object_1get_1qdata
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1get_1qdata)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1object_1get_1qdata_FUNC);
-	rc = (jintLong)g_object_get_qdata((GObject *)arg0, (GQuark)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1object_1get_1qdata_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1object_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1new)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1object_1new_FUNC);
-	rc = (jintLong)g_object_new((GType)arg0, (const gchar *)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1object_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1object_1notify
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1notify)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1g_1object_1notify_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_object_notify((GObject *)arg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1object_1notify_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1object_1ref
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1object_1ref_FUNC);
-	rc = (jintLong)g_object_ref((gpointer)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1object_1ref_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1object_1ref_1sink
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref_1sink)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1object_1ref_1sink_FUNC);
-	rc = (jintLong)g_object_ref_sink((GObject *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1object_1ref_1sink_FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1g_1object_1set__I_3BFI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BFJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BFJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BFI_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BFJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BFI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BFJ_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1object_1set__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BIJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BIJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BII_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BIJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BII_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BIJ_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1object_1set__I_3BJI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BJI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BJI_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BJJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BJI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BJJ_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-	GdkColor _arg2, *lparg2=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-fail:
-	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-	GdkRGBA _arg2, *lparg2=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail;
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-fail:
-	if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1object_1set__I_3BZI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BZJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BZI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BZJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BZI_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BZJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BZI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BZJ_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1object_1set__I_3B_3BI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3B_3BJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3B_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-	jbyte *lparg2=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3B_3BI_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3B_3BJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3B_3BI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3B_3BJ_FUNC);
-#endif
-}
-#endif
-
-#ifndef NO__1g_1object_1set_1qdata
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1object_1set_1qdata_FUNC);
-	g_object_set_qdata((GObject *)arg0, (GQuark)arg1, (gpointer)arg2);
-	OS_NATIVE_EXIT(env, that, _1g_1object_1set_1qdata_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1object_1unref
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1unref)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC);
-	g_object_unref((gpointer)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1object_1unref_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1quark_1from_1string
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1quark_1from_1string)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1quark_1from_1string_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)g_quark_from_string((const gchar *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1g_1quark_1from_1string_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1set_1prgname
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1set_1prgname)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, _1g_1set_1prgname_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	g_set_prgname((const gchar *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1g_1set_1prgname_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1signal_1add_1emission_1hook
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
-	rc = (jintLong)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1signal_1connect
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
-{
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)g_signal_connect((gpointer)arg0, (const gchar *)lparg1, (GCallback)arg2, (gpointer)arg3);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1connect_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1signal_1connect_1closure
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jboolean arg3)
-{
-	jbyte *lparg1=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1closure_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jint)g_signal_connect_closure((gpointer)arg0, (const gchar *)lparg1, (GClosure *)arg2, (gboolean)arg3);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1connect_1closure_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1signal_1connect_1closure_1by_1id
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jboolean arg4)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1closure_1by_1id_FUNC);
-	rc = (jint)g_signal_connect_closure_by_id((gpointer)arg0, (guint)arg1, (GQuark)arg2, (GClosure *)arg3, (gboolean)arg4);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1connect_1closure_1by_1id_FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-#endif
-{
-	jbyte *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BI) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
-#endif
-{
-	jbyte *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
-#endif
-{
-	jbyte *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
-#endif
-{
-	jbyte *lparg1=NULL;
-	GdkRectangle _arg2, *lparg2=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = getGdkRectangleFields(env, arg2, &_arg2)) == NULL) goto fail;
-	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2);
-fail:
-	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC);
-#endif
-}
-#endif
-
-#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B_3B) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
-#endif
-{
-	jbyte *lparg1=NULL;
-	jbyte *lparg2=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
-#endif
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
-#endif
-}
-#endif
-
-#ifndef NO__1g_1signal_1handler_1disconnect
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1disconnect_FUNC);
-	g_signal_handler_disconnect((gpointer)arg0, (gulong)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1handler_1disconnect_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1signal_1handler_1find
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handler_1find)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1find_FUNC);
-	rc = (jint)g_signal_handler_find((gpointer)arg0, arg1, arg2, (GQuark)arg3, (GClosure *)arg4, (gpointer)arg5, (gpointer)arg6);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1handler_1find_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1signal_1handlers_1block_1matched
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1block_1matched_FUNC);
-	rc = (jint)g_signal_handlers_block_matched((gpointer)arg0, (GSignalMatchType)arg1, (guint)arg2, (GQuark)arg3, (GClosure *)arg4, (gpointer)arg5, (gpointer)arg6);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1handlers_1block_1matched_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1signal_1handlers_1unblock_1matched
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1unblock_1matched_FUNC);
-	rc = (jint)g_signal_handlers_unblock_matched((gpointer)arg0, (GSignalMatchType)arg1, (guint)arg2, (GQuark)arg3, (GClosure *)arg4, (gpointer)arg5, (gpointer)arg6);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1handlers_1unblock_1matched_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1signal_1lookup
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1lookup)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1lookup_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)g_signal_lookup((const gchar *)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1lookup_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1signal_1remove_1emission_1hook
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook)
-	(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1remove_1emission_1hook_FUNC);
-	g_signal_remove_emission_hook((guint)arg0, (gulong)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1remove_1emission_1hook_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1signal_1stop_1emission_1by_1name
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1stop_1emission_1by_1name)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1g_1signal_1stop_1emission_1by_1name_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	g_signal_stop_emission_by_name((gpointer)arg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1g_1signal_1stop_1emission_1by_1name_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1slist_1append
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1append)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1slist_1append_FUNC);
-	rc = (jintLong)g_slist_append((GSList *)arg0, (gpointer)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1slist_1append_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1slist_1data
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1data)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1slist_1data_FUNC);
-	rc = (jintLong)g_slist_data((GSList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1slist_1data_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1slist_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1slist_1free_FUNC);
-	g_slist_free((GSList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1slist_1free_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1slist_1length
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1slist_1length_FUNC);
-	rc = (jint)g_slist_length((GSList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1slist_1length_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1slist_1next
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1next)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1slist_1next_FUNC);
-	rc = (jintLong)g_slist_next((GSList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1slist_1next_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1source_1remove
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1source_1remove_FUNC);
-	rc = (jboolean)g_source_remove((guint)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1source_1remove_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1strfreev
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1strfreev_FUNC);
-	g_strfreev((gchar **)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1strfreev_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1string_1free
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1string_1free)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1string_1free_FUNC);
-	rc = (jintLong)g_string_free((GString *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1string_1free_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1string_1new_1len
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1string_1new_1len)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1string_1new_1len_FUNC);
-	rc = (jintLong)g_string_new_len((const gchar *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1string_1new_1len_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1strtod
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1strtod)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
-{
-	jintLong *lparg1=NULL;
-	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1strtod_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jdouble)g_strtod((const gchar *)arg0, (gchar **)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1strtod_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1thread_1init
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
-/*
-	g_thread_init(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, g_thread_init)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1thread_1supported
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported)
-	(JNIEnv *env, jclass that)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC);
-	rc = (jboolean)g_thread_supported();
-	OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1timeout_1add
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1timeout_1add)
-	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1timeout_1add_FUNC);
-	rc = (jint)g_timeout_add((guint32)arg0, (GSourceFunc)arg1, (gpointer)arg2);
-	OS_NATIVE_EXIT(env, that, _1g_1timeout_1add_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1add_1interface_1static
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1type_1add_1interface_1static_FUNC);
-	g_type_add_interface_static((GType)arg0, (GType)arg1, (const GInterfaceInfo *)arg2);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1add_1interface_1static_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1type_1class_1peek
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_FUNC);
-	rc = (jintLong)g_type_class_peek((GType)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1class_1peek_1parent
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_1parent_FUNC);
-	rc = (jintLong)g_type_class_peek_parent((gpointer)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_1parent_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1class_1ref
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1ref)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1ref_FUNC);
-	rc = (jintLong)g_type_class_ref((GType)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1ref_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1class_1unref
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1class_1unref)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1unref_FUNC);
-	g_type_class_unref((gpointer)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1unref_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1type_1from_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1from_1name)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1from_1name_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_type_from_name((const gchar *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1from_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1interface_1peek_1parent
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
-	rc = (jintLong)g_type_interface_peek_parent((gpointer)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1is_1a
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1is_1a_FUNC);
-	rc = (jboolean)g_type_is_a((GType)arg0, (GType)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1is_1a_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1name)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1name_FUNC);
-	rc = (jintLong)g_type_name((GType)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1parent
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1parent)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1parent_FUNC);
-	rc = (jintLong)g_type_parent((GType)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1parent_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1type_1query
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1g_1type_1query_FUNC);
-	g_type_query((GType)arg0, (GTypeQuery *)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1query_FUNC);
-}
-#endif
-
-#ifndef NO__1g_1type_1register_1static
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1register_1static)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3)
-{
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1type_1register_1static_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1type_1register_1static_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1utf16_1offset_1to_1pointer
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1offset_1to_1pointer)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1utf16_1offset_1to_1pointer_FUNC);
-	rc = (jintLong)g_utf16_offset_to_pointer((const gchar *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1utf16_1offset_1to_1pointer_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1utf16_1offset_1to_1utf8_1offset
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1offset_1to_1utf8_1offset)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1utf16_1offset_1to_1utf8_1offset_FUNC);
-	rc = (jintLong)g_utf16_offset_to_utf8_offset((const gchar *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1utf16_1offset_1to_1utf8_1offset_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1utf16_1pointer_1to_1offset
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1pointer_1to_1offset)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1utf16_1pointer_1to_1offset_FUNC);
-	rc = (jintLong)g_utf16_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1utf16_1pointer_1to_1offset_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1utf16_1strlen
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1strlen)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1utf16_1strlen_FUNC);
-	rc = (jintLong)g_utf16_strlen((const gchar *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1utf16_1strlen_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1utf16_1to_1utf8
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
-	(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-{
-	jchar *lparg0=NULL;
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1utf16_1to_1utf8_FUNC);
-		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
-fail:
-		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
-		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1g_1utf16_1to_1utf8_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1utf8_1offset_1to_1utf16_1offset
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1utf16_1offset)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1offset_1to_1utf16_1offset_FUNC);
-	rc = (jintLong)g_utf8_offset_to_utf16_offset((const gchar *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1offset_1to_1utf16_1offset_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1utf8_1pointer_1to_1offset
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
-	rc = (jintLong)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1utf8_1strlen
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1strlen)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1strlen_FUNC);
-	rc = (jintLong)g_utf8_strlen((const gchar *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1strlen_FUNC);
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1g_1utf8_1to_1utf16__II_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-#endif
-{
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
-#endif
-		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
-fail:
-		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#if (!defined(NO__1g_1utf8_1to_1utf16___3BI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-#endif
-{
-	jbyte *lparg0=NULL;
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
-#endif
-		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
-		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
-fail:
-		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
-		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
-		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
-		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1value_1peek_1pointer
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1value_1peek_1pointer)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1value_1peek_1pointer_FUNC);
-	rc = (jintLong)g_value_peek_pointer((const GValue *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1value_1peek_1pointer_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1get_1boolean
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1variant_1get_1boolean)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1boolean_FUNC);
-	rc = (jboolean)g_variant_get_boolean((GVariant *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1boolean_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1get_1byte
-JNIEXPORT jbyte JNICALL OS_NATIVE(_1g_1variant_1get_1byte)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jbyte rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1byte_FUNC);
-	rc = (jbyte)g_variant_get_byte((GVariant *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1byte_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1get_1child_1value
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1child_1value)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1child_1value_FUNC);
-	rc = (jintLong)g_variant_get_child_value((GVariant *)arg0, (gsize)arg1);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1child_1value_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1get_1double
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1variant_1get_1double)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1double_FUNC);
-	rc = (jdouble)g_variant_get_double((GVariant *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1double_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1get_1int32
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1variant_1get_1int32)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1int32_FUNC);
-	rc = (jint)g_variant_get_int32((GVariant *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1int32_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1get_1string
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1string)
-	(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1)
-{
-	jlong *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1string_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_variant_get_string((GVariant *)arg0, (gsize *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1string_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1get_1type
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1type)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1type_FUNC);
-	rc = (jintLong)g_variant_get_type((GVariant *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1type_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1get_1type_1string
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1type_1string)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1type_1string_FUNC);
-	rc = (jintLong)g_variant_get_type_string((GVariant *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1type_1string_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1is_1of_1type
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1variant_1is_1of_1type)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1is_1of_1type_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)g_variant_is_of_type((GVariant *)arg0, (const GVariantType *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1is_1of_1type_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1n_1children
-JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1n_1children)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1n_1children_FUNC);
-	rc = (jlong)g_variant_n_children((GVariant *)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1n_1children_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1new_1boolean
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1boolean)
-	(JNIEnv *env, jclass that, jboolean arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1boolean_FUNC);
-	rc = (jintLong)g_variant_new_boolean((gboolean)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1boolean_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1new_1byte
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1byte)
-	(JNIEnv *env, jclass that, jbyte arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1byte_FUNC);
-	rc = (jintLong)g_variant_new_byte((guchar)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1byte_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1new_1double
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1double)
-	(JNIEnv *env, jclass that, jdouble arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1double_FUNC);
-	rc = (jintLong)g_variant_new_double((gboolean)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1double_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1new_1int32
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1int32)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1int32_FUNC);
-	rc = (jintLong)g_variant_new_int32((gint32)arg0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1int32_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1new_1string
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1string)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1string_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_variant_new_string((const gchar *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1string_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1g_1variant_1new_1tuple
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1tuple)
-	(JNIEnv *env, jclass that, jintLongArray arg0, jlong arg1)
-{
-	jintLong *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1tuple_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)g_variant_new_tuple((GVariant * const *)lparg0, (gsize)arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1tuple_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1atom_1intern
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1intern)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1atom_1intern_FUNC);
-		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)gdk_atom_intern((const gchar *)lparg0, arg1);
-fail:
-		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1gdk_1atom_1intern_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1atom_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1name)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1atom_1name_FUNC);
-	rc = (jintLong)gdk_atom_name((GdkAtom)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1atom_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1beep
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1beep)
-	(JNIEnv *env, jclass that)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1beep_FUNC);
-	gdk_beep();
-	OS_NATIVE_EXIT(env, that, _1gdk_1beep_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1bitmap_1create_1from_1data
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
-{
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
-		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_bitmap_create_from_data)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, const gchar *, gint, gint))fp)((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
-		}
-	}
-fail:
-		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1create
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cairo_1create)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1create_FUNC);
-/*
-	rc = (jintLong)gdk_cairo_create(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_create)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1create_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1get_1clip_1rectangle
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1cairo_1get_1clip_1rectangle)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkRectangle _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1get_1clip_1rectangle_FUNC);
-	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
-	rc = (jboolean)gdk_cairo_get_clip_rectangle(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_get_clip_rectangle)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, GdkRectangle *))fp)(arg0, lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1get_1clip_1rectangle_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1region
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_FUNC);
-/*
-	gdk_cairo_region(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_region)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1region_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1region_1create_1from_1surface
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cairo_1region_1create_1from_1surface)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_1create_1from_1surface_FUNC);
-/*
-	rc = (jintLong)gdk_cairo_region_create_from_surface(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_region_create_from_surface)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1region_1create_1from_1surface_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1reset_1clip
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1reset_1clip)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1reset_1clip_FUNC);
-/*
-	gdk_cairo_reset_clip(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_reset_clip)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1reset_1clip_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1set_1source_1color
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkColor _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1color_FUNC);
-	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
-	gdk_cairo_set_source_color(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_color)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1color_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1set_1source_1pixbuf
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1pixbuf)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1pixbuf_FUNC);
-/*
-	gdk_cairo_set_source_pixbuf(arg0, (const GdkPixbuf *)arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_pixbuf)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, const GdkPixbuf *, jdouble, jdouble))fp)(arg0, (const GdkPixbuf *)arg1, arg2, arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1pixbuf_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1set_1source_1pixmap
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1pixmap)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1pixmap_FUNC);
-/*
-	gdk_cairo_set_source_pixmap(arg0, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_pixmap)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, jdouble, jdouble))fp)(arg0, arg1, arg2, arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1pixmap_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1set_1source_1rgba
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1rgba)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkRGBA _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1rgba_FUNC);
-	if (arg1) if ((lparg1 = getGdkRGBAFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
-	gdk_cairo_set_source_rgba(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_rgba)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, GdkRGBA *))fp)(arg0, lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) setGdkRGBAFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1rgba_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1cairo_1set_1source_1window
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1window)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1window_FUNC);
-/*
-	gdk_cairo_set_source_window(arg0, (GdkWindow *)arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_window)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, GdkWindow *, jint, jint))fp)(arg0, (GdkWindow *)arg1, arg2, arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1window_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1color_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1color_1free)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1color_1free_FUNC);
-/*
-	gdk_color_free((GdkColor *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_color_free)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkColor *))fp)((GdkColor *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1color_1free_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1color_1parse
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1color_1parse)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jobject arg1)
-{
-	jbyte *lparg0=NULL;
-	GdkColor _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1color_1parse_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
-/*
-	rc = (jboolean)gdk_color_parse((const gchar *)lparg0, (GdkColor *)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_color_parse)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(const gchar *, GdkColor *))fp)((const gchar *)lparg0, (GdkColor *)lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1color_1parse_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1color_1white
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1color_1white)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkColor _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1color_1white_FUNC);
-	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
-/*
-	rc = (jboolean)gdk_color_white(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_color_white)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1color_1white_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1colormap_1alloc_1color
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1colormap_1alloc_1color)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2, jboolean arg3)
-{
-	GdkColor _arg1, *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1alloc_1color_FUNC);
-	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
-	rc = (jboolean)gdk_colormap_alloc_color(arg0, (GdkColor *)lparg1, (gboolean)arg2, (gboolean)arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_colormap_alloc_color)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, GdkColor *, gboolean, gboolean))fp)(arg0, (GdkColor *)lparg1, (gboolean)arg2, (gboolean)arg3);
-		}
-	}
-fail:
-	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1alloc_1color_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1colormap_1free_1colors
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1colormap_1free_1colors)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-{
-	GdkColor _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1free_1colors_FUNC);
-	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
-	gdk_colormap_free_colors(arg0, (GdkColor *)lparg1, (gint)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_colormap_free_colors)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, GdkColor *, gint))fp)(arg0, (GdkColor *)lparg1, (gint)arg2);
-		}
-	}
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1free_1colors_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1colormap_1get_1system
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1get_1system_FUNC);
-/*
-	rc = (jintLong)gdk_colormap_get_system();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_colormap_get_system)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1get_1system_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cursor_1new_1for_1display
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1for_1display)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1for_1display_FUNC);
-	rc = (jintLong)gdk_cursor_new_for_display((GdkDisplay *)arg0, (GdkCursorType)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1for_1display_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cursor_1new_1from_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1name)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1name_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)gdk_cursor_new_from_name((GdkDisplay *)arg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cursor_1new_1from_1pixbuf
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
-/*
-	rc = (jintLong)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cursor_new_from_pixbuf)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cursor_1new_1from_1pixmap
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixmap)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jint arg4, jint arg5)
-{
-	GdkColor _arg2, *lparg2=NULL;
-	GdkColor _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
-	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_cursor_new_from_pixmap(arg0, arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cursor_new_from_pixmap)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, GdkColor *, GdkColor *, gint, gint))fp)(arg0, arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
-		}
-	}
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1cursor_1unref
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cursor_1unref)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1unref_FUNC);
-/*
-	gdk_cursor_unref(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_cursor_unref)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1unref_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1device_1get_1associated_1device
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1device_1get_1associated_1device)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1device_1get_1associated_1device_FUNC);
-/*
-	rc = (jintLong)gdk_device_get_associated_device((GdkDevice *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_device_get_associated_device)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDevice *))fp)((GdkDevice *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1device_1get_1associated_1device_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1device_1get_1window_1at_1position
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1device_1get_1window_1at_1position)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
-{
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1device_1get_1window_1at_1position_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_device_get_window_at_position(arg0, (gint *)lparg1, (gint *)lparg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_device_get_window_at_position)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint *, gint *))fp)(arg0, (gint *)lparg1, (gint *)lparg2);
-		}
-	}
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1device_1get_1window_1at_1position_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1device_1grab
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1device_1grab)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4, jintLong arg5, jint arg6)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1device_1grab_FUNC);
-/*
-	rc = (jint)gdk_device_grab((GdkDevice *)arg0, (GdkWindow *)arg1, arg2, (gboolean)arg3, (GdkEventMask)arg4, (GdkCursor *)arg5, (guint32)arg6);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_device_grab)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkDevice *, GdkWindow *, jint, gboolean, GdkEventMask, GdkCursor *, guint32))fp)((GdkDevice *)arg0, (GdkWindow *)arg1, arg2, (gboolean)arg3, (GdkEventMask)arg4, (GdkCursor *)arg5, (guint32)arg6);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1device_1grab_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1device_1manager_1get_1client_1pointer
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1device_1manager_1get_1client_1pointer)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1device_1manager_1get_1client_1pointer_FUNC);
-/*
-	rc = (jintLong)gdk_device_manager_get_client_pointer(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_device_manager_get_client_pointer)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1device_1manager_1get_1client_1pointer_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1device_1ungrab
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1device_1ungrab)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1device_1ungrab_FUNC);
-/*
-	gdk_device_ungrab((GdkDevice *)arg0, (guint32)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_device_ungrab)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkDevice *, guint32))fp)((GdkDevice *)arg0, (guint32)arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1device_1ungrab_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1device_1warp
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1device_1warp)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1device_1warp_FUNC);
-/*
-	gdk_device_warp(arg0, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_device_warp)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1device_1warp_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1display_1get_1default
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_FUNC);
-/*
-	rc = (jintLong)gdk_display_get_default();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_display_get_default)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1display_1get_1default_1seat
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1default_1seat)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_1seat_FUNC);
-/*
-	rc = (jintLong)gdk_display_get_default_seat(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_display_get_default_seat)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_1seat_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1display_1get_1device_1manager
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1device_1manager)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1device_1manager_FUNC);
-/*
-	rc = (jintLong)gdk_display_get_device_manager((GdkDisplay *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_display_get_device_manager)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDisplay *))fp)((GdkDisplay *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1device_1manager_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1display_1supports_1cursor_1color
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
-/*
-	rc = (jboolean)gdk_display_supports_cursor_color(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_display_supports_cursor_color)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1display_1warp_1pointer
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1display_1warp_1pointer)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1display_1warp_1pointer_FUNC);
-/*
-	gdk_display_warp_pointer(arg0, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_display_warp_pointer)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1display_1warp_1pointer_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1drag_1context_1get_1actions
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drag_1context_1get_1actions)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1actions_FUNC);
-/*
-	rc = (jint)gdk_drag_context_get_actions((GdkDragContext *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_drag_context_get_actions)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkDragContext *))fp)((GdkDragContext *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1get_1actions_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1drag_1context_1get_1dest_1window
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drag_1context_1get_1dest_1window)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1dest_1window_FUNC);
-/*
-	rc = (jintLong)gdk_drag_context_get_dest_window((GdkDragContext *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_drag_context_get_dest_window)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDragContext *))fp)((GdkDragContext *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1get_1dest_1window_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1drag_1context_1get_1selected_1action
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drag_1context_1get_1selected_1action)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1selected_1action_FUNC);
-/*
-	rc = (jint)gdk_drag_context_get_selected_action((GdkDragContext *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_drag_context_get_selected_action)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkDragContext *))fp)((GdkDragContext *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1get_1selected_1action_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1drag_1context_1list_1targets
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drag_1context_1list_1targets)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1list_1targets_FUNC);
-/*
-	rc = (jintLong)gdk_drag_context_list_targets((GdkDragContext *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_drag_context_list_targets)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDragContext *))fp)((GdkDragContext *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1list_1targets_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1drag_1status
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drag_1status)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1status_FUNC);
-	gdk_drag_status((GdkDragContext *)arg0, (GdkDragAction)arg1, (guint32)arg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1status_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1draw_1arc
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1arc)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1arc_FUNC);
-/*
-	gdk_draw_arc(arg0, arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_draw_arc)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, gint, gint, gint, gint, gint, gint, gint))fp)(arg0, arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1arc_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1draw_1image
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1image)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1image_FUNC);
-/*
-	gdk_draw_image(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_draw_image)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1image_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1draw_1pixbuf
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1pixbuf_FUNC);
-/*
-	gdk_draw_pixbuf(arg0, arg1, arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, arg9, (gint)arg10, (gint)arg11);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_draw_pixbuf)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, gint, gint, gint, gint, gint, gint, jint, gint, gint))fp)(arg0, arg1, arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, arg9, (gint)arg10, (gint)arg11);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1pixbuf_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1draw_1rectangle
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1rectangle)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1rectangle_FUNC);
-/*
-	gdk_draw_rectangle(arg0, arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_draw_rectangle)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, gint, gint, gint, gint, gint))fp)(arg0, arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1rectangle_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1drawable_1get_1depth
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1depth)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1depth_FUNC);
-/*
-	rc = (jint)gdk_drawable_get_depth(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_drawable_get_depth)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1depth_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1drawable_1get_1image
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1image_FUNC);
-/*
-	rc = (jintLong)gdk_drawable_get_image(arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_drawable_get_image)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint, gint, gint, gint))fp)(arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1image_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1drawable_1get_1visible_1region
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1visible_1region)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
-/*
-	rc = (jintLong)gdk_drawable_get_visible_region(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_drawable_get_visible_region)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1error_1trap_1pop
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1error_1trap_1pop)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1error_1trap_1pop_FUNC);
-	rc = (jint)gdk_error_trap_pop();
-	OS_NATIVE_EXIT(env, that, _1gdk_1error_1trap_1pop_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1error_1trap_1push
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1error_1trap_1push)
-	(JNIEnv *env, jclass that)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1error_1trap_1push_FUNC);
-	gdk_error_trap_push();
-	OS_NATIVE_EXIT(env, that, _1gdk_1error_1trap_1push_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1event_1copy
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1copy)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1copy_FUNC);
-	rc = (jintLong)gdk_event_copy((GdkEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1copy_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1free)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1free_FUNC);
-	gdk_event_free((GdkEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1free_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1event_1get
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1get)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_FUNC);
-	rc = (jintLong)gdk_event_get();
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1get_1coords
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1coords)
-	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
-{
-	jdouble *lparg1=NULL;
-	jdouble *lparg2=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1coords_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jboolean)gdk_event_get_coords((GdkEvent *)arg0, (gdouble *)lparg1, (gdouble *)lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1coords_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1get_1event_1type
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1event_1type)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1event_1type_FUNC);
-/*
-	rc = (jint)gdk_event_get_event_type((GdkEvent *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_event_get_event_type)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkEvent *))fp)((GdkEvent *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1event_1type_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1get_1scroll_1deltas
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1scroll_1deltas)
-	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
-{
-	jdouble *lparg1=NULL;
-	jdouble *lparg2=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1scroll_1deltas_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)gdk_event_get_scroll_deltas((GdkEvent *)arg0, lparg1, lparg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_event_get_scroll_deltas)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkEvent *, jdouble *, jdouble *))fp)((GdkEvent *)arg0, lparg1, lparg2);
-		}
-	}
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1scroll_1deltas_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1get_1seat
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1get_1seat)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1seat_FUNC);
-/*
-	rc = (jintLong)gdk_event_get_seat(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_event_get_seat)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1seat_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1get_1state
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1state)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
-{
-	jint *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1state_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)gdk_event_get_state((GdkEvent *)arg0, (GdkModifierType *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1state_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1get_1time
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1time)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1time_FUNC);
-	rc = (jint)gdk_event_get_time((GdkEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1time_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1handler_1set
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1handler_1set)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1handler_1set_FUNC);
-	gdk_event_handler_set((GdkEventFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1handler_1set_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1event_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1new)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1new_FUNC);
-	rc = (jintLong)gdk_event_new(arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1peek
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1peek)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1peek_FUNC);
-	rc = (jintLong)gdk_event_peek();
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1peek_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1event_1put
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1put)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1event_1put_FUNC);
-	gdk_event_put((GdkEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1event_1put_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1flush
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1flush)
-	(JNIEnv *env, jclass that)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1flush_FUNC);
-	gdk_flush();
-	OS_NATIVE_EXIT(env, that, _1gdk_1flush_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1gc_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1gc_1new)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1new_FUNC);
-/*
-	rc = (jintLong)gdk_gc_new(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_gc_new)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1gc_1set_1fill
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1fill)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1fill_FUNC);
-/*
-	gdk_gc_set_fill(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_gc_set_fill)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1fill_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1gc_1set_1foreground
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1foreground)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkColor _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1foreground_FUNC);
-	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
-/*
-	gdk_gc_set_foreground(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_gc_set_foreground)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
-		}
-	}
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1foreground_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1gc_1set_1function
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1function)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1function_FUNC);
-/*
-	gdk_gc_set_function(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_gc_set_function)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1function_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1gc_1set_1stipple
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1stipple)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1stipple_FUNC);
-/*
-	gdk_gc_set_stipple(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_gc_set_stipple)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1stipple_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1gc_1set_1subwindow
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1subwindow)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1subwindow_FUNC);
-/*
-	gdk_gc_set_subwindow(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_gc_set_subwindow)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1subwindow_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1get_1default_1root_1window
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1get_1default_1root_1window)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1get_1default_1root_1window_FUNC);
-	rc = (jintLong)gdk_get_default_root_window();
-	OS_NATIVE_EXIT(env, that, _1gdk_1get_1default_1root_1window_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1keyboard_1ungrab
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1keyboard_1ungrab)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1keyboard_1ungrab_FUNC);
-/*
-	gdk_keyboard_ungrab(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_keyboard_ungrab)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jint))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1keyboard_1ungrab_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1keymap_1get_1default
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1default_FUNC);
-	rc = (jintLong)gdk_keymap_get_default();
-	OS_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1default_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1keymap_1get_1entries_1for_1keyval
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1keymap_1get_1entries_1for_1keyval)
-	(JNIEnv *env, jclass that, jintLong arg0, jlong arg1, jintLongArray arg2, jintArray arg3)
-{
-	jintLong *lparg2=NULL;
-	jint *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1entries_1for_1keyval_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)gdk_keymap_get_entries_for_keyval((GdkKeymap*)arg0, (guint)arg1, (GdkKeymapKey**)lparg2, (gint*)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1entries_1for_1keyval_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1keyval_1to_1lower
-JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1keyval_1to_1lower)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1keyval_1to_1lower_FUNC);
-	rc = (jlong)gdk_keyval_to_lower(arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1keyval_1to_1lower_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1keyval_1to_1unicode
-JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1keyval_1to_1unicode)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1keyval_1to_1unicode_FUNC);
-	rc = (jlong)gdk_keyval_to_unicode(arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1keyval_1to_1unicode_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pango_1context_1get
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1get_FUNC);
-	rc = (jintLong)gdk_pango_context_get();
-	OS_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1get_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pango_1layout_1get_1clip_1region
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
-{
-	jint *lparg3=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jintLong)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, (gint *)lparg3, arg4);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1copy_1area
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1copy_1area)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1copy_1area_FUNC);
-	gdk_pixbuf_copy_area((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, (GdkPixbuf *)arg5, arg6, arg7);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1copy_1area_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1get_1from_1drawable
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
-/*
-	rc = (jintLong)gdk_pixbuf_get_from_drawable((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_pixbuf_get_from_drawable)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkPixbuf *, jintLong, jintLong, jint, jint, jint, jint, jint, jint))fp)((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1get_1from_1window
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1window)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1from_1window_FUNC);
-/*
-	rc = (jintLong)gdk_pixbuf_get_from_window((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_pixbuf_get_from_window)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, gint, gint, gint, gint))fp)((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1from_1window_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1get_1has_1alpha
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1has_1alpha_FUNC);
-	rc = (jboolean)gdk_pixbuf_get_has_alpha((const GdkPixbuf *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1has_1alpha_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1get_1height
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1height)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1height_FUNC);
-	rc = (jint)gdk_pixbuf_get_height((const GdkPixbuf *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1height_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1get_1pixels
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
-	rc = (jintLong)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1get_1rowstride
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1rowstride)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1rowstride_FUNC);
-	rc = (jint)gdk_pixbuf_get_rowstride((const GdkPixbuf *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1rowstride_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1get_1width
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1width)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1width_FUNC);
-	rc = (jint)gdk_pixbuf_get_width((const GdkPixbuf *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1width_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1loader_1close
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1close)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
-{
-	jintLong *lparg1=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jboolean)gdk_pixbuf_loader_close((GdkPixbufLoader *)arg0, (GError **)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1loader_1get_1pixbuf
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
-	rc = (jintLong)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1loader_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
-	rc = (jintLong)gdk_pixbuf_loader_new();
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1loader_1write
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1write)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3)
-{
-	jintLong *lparg3=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	rc = (jboolean)gdk_pixbuf_loader_write((GdkPixbufLoader *)arg0, (const guchar *)arg1, (gsize)arg2, (GError **)lparg3);
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new)
-	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_FUNC);
-	rc = (jintLong)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1new_1from_1file
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new_1from_1file)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
-{
-	jbyte *lparg0=NULL;
-	jintLong *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)gdk_pixbuf_new_from_file((const char *)lparg0, (GError**)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1save_1to_1bufferv
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1bufferv)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jbyteArray arg3, jintLongArray arg4, jintLongArray arg5, jintLongArray arg6)
-{
-	jintLong *lparg1=NULL;
-	jintLong *lparg2=NULL;
-	jbyte *lparg3=NULL;
-	jintLong *lparg4=NULL;
-	jintLong *lparg5=NULL;
-	jintLong *lparg6=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1save_1to_1bufferv_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)gdk_pixbuf_save_to_bufferv((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (char **)lparg4, (char **)lparg5, (GError **)lparg6);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_pixbuf_save_to_bufferv)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkPixbuf *, gchar **, gsize *, const char *, char **, char **, GError **))fp)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (char **)lparg4, (char **)lparg5, (GError **)lparg6);
-		}
-	}
-fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1save_1to_1bufferv_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixbuf_1scale_1simple
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
-	rc = (jintLong)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pixmap_1get_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixmap_1get_1size)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
-{
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1get_1size_FUNC);
-		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-/*
-	gdk_pixmap_get_size(arg0, (gint *)lparg1, (gint *)lparg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_pixmap_get_size)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, gint *, gint *))fp)(arg0, (gint *)lparg1, (gint *)lparg2);
-		}
-	}
-fail:
-		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
-		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1get_1size_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1pixmap_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1new_FUNC);
-/*
-	rc = (jintLong)gdk_pixmap_new((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_pixmap_new)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, gint, gint, gint))fp)((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pointer_1grab
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pointer_1grab)
-	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jint arg2, jintLong arg3, jintLong arg4, jint arg5)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1pointer_1grab_FUNC);
-/*
-	rc = (jint)gdk_pointer_grab((GdkWindow *)arg0, (gboolean)arg1, (GdkEventMask)arg2, (GdkWindow *)arg3, (GdkCursor *)arg4, (guint32)arg5);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_pointer_grab)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkWindow *, gboolean, GdkEventMask, GdkWindow *, GdkCursor *, guint32))fp)((GdkWindow *)arg0, (gboolean)arg1, (GdkEventMask)arg2, (GdkWindow *)arg3, (GdkCursor *)arg4, (guint32)arg5);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1pointer_1grab_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1pointer_1ungrab
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pointer_1ungrab)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1pointer_1ungrab_FUNC);
-/*
-	gdk_pointer_ungrab((guint32)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_pointer_ungrab)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(guint32))fp)((guint32)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1pointer_1ungrab_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1property_1get
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1property_1get)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jintLongArray arg6, jintArray arg7, jintArray arg8, jintLongArray arg9)
-{
-	jintLong *lparg6=NULL;
-	jint *lparg7=NULL;
-	jint *lparg8=NULL;
-	jintLong *lparg9=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1property_1get_FUNC);
-	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
-	if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = (*env)->GetIntLongArrayElements(env, arg9, NULL)) == NULL) goto fail;
-	rc = (jboolean)gdk_property_get((GdkWindow *)arg0, (GdkAtom)arg1, (GdkAtom)arg2, arg3, arg4, arg5, (GdkAtom *)lparg6, (gint *)lparg7, (gint *)lparg8, (guchar **)lparg9);
-fail:
-	if (arg9 && lparg9) (*env)->ReleaseIntLongArrayElements(env, arg9, lparg9, 0);
-	if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
-	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
-	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1property_1get_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1region_1destroy
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1destroy)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1destroy_FUNC);
-	gdk_region_destroy((GdkRegion *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1destroy_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1region_1empty
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1empty)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1empty_FUNC);
-	rc = (jboolean)gdk_region_empty((GdkRegion *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1empty_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1region_1get_1clipbox
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1clipbox)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkRectangle _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1clipbox_FUNC);
-	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
-	gdk_region_get_clipbox((GdkRegion *)arg0, (GdkRectangle *)lparg1);
-fail:
-	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1get_1clipbox_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1region_1get_1rectangles
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1rectangles)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
-{
-	jintLong *lparg1=NULL;
-	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1rectangles_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-/*
-	gdk_region_get_rectangles(arg0, lparg1, (gint *)lparg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_region_get_rectangles)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong *, gint *))fp)(arg0, lparg1, (gint *)lparg2);
-		}
-	}
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1get_1rectangles_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1region_1intersect
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1intersect)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1intersect_FUNC);
-	gdk_region_intersect((GdkRegion *)arg0, (GdkRegion *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1intersect_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1region_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1new)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1new_FUNC);
-	rc = (jintLong)gdk_region_new();
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1region_1offset
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1offset)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1offset_FUNC);
-	gdk_region_offset((GdkRegion *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1offset_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1region_1point_1in
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1point_1in)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1point_1in_FUNC);
-	rc = (jboolean)gdk_region_point_in((GdkRegion *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1point_1in_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1region_1polygon
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1polygon)
-	(JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
-{
-	jint *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1polygon_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_region_polygon(lparg0, arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_region_polygon)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jint *, jint, jint))fp)(lparg0, arg1, arg2);
-		}
-	}
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1polygon_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1region_1rect_1in
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1rect_1in)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkRectangle _arg1, *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1rect_1in_FUNC);
-	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jintLong)gdk_region_rect_in((GdkRegion *)arg0, (GdkRectangle *)lparg1);
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1rect_1in_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1region_1rectangle
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1rectangle)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	GdkRectangle _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1rectangle_FUNC);
-	if (arg0) if ((lparg0 = getGdkRectangleFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)gdk_region_rectangle(lparg0);
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1rectangle_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1region_1subtract
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1subtract)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1subtract_FUNC);
-	gdk_region_subtract((GdkRegion *)arg0, (GdkRegion *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1subtract_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1region_1union
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_FUNC);
-	gdk_region_union((GdkRegion *)arg0, (GdkRegion *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1union_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1region_1union_1with_1rect
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union_1with_1rect)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkRectangle _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_1with_1rect_FUNC);
-	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-	gdk_region_union_with_rect((GdkRegion *)arg0, (GdkRectangle *)lparg1);
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1region_1union_1with_1rect_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1rgba_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1rgba_1free)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1rgba_1free_FUNC);
-/*
-	gdk_rgba_free((GdkRGBA *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_rgba_free)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1rgba_1free_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1rgba_1hash
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1rgba_1hash)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	GdkRGBA _arg0, *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1rgba_1hash_FUNC);
-	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
-/*
-	rc = (jint)gdk_rgba_hash((GdkRGBA *)lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_rgba_hash)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)lparg0);
-		}
-	}
-fail:
-	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1rgba_1hash_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1rgba_1parse
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1rgba_1parse)
-	(JNIEnv *env, jclass that, jobject arg0, jbyteArray arg1)
-{
-	GdkRGBA _arg0, *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1rgba_1parse_FUNC);
-	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_rgba_parse((GdkRGBA *)lparg0, (const gchar *)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_rgba_parse)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkRGBA *, const gchar *))fp)((GdkRGBA *)lparg0, (const gchar *)lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1rgba_1parse_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1rgba_1to_1string
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1rgba_1to_1string)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	GdkRGBA _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1rgba_1to_1string_FUNC);
-	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_rgba_to_string((GdkRGBA *)lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_rgba_to_string)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)lparg0);
-		}
-	}
-fail:
-	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1rgba_1to_1string_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1active_1window
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1active_1window)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1active_1window_FUNC);
-	rc = (jintLong)gdk_screen_get_active_window((GdkScreen *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1active_1window_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1default
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1default_FUNC);
-/*
-	rc = (jintLong)gdk_screen_get_default();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_default)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1default_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1monitor_1at_1point
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
-/*
-	rc = (jint)gdk_screen_get_monitor_at_point((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_point)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, gint, gint))fp)((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1monitor_1at_1window
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
-/*
-	rc = (jint)gdk_screen_get_monitor_at_window((GdkScreen *)arg0, (GdkWindow *)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_window)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, GdkWindow *))fp)((GdkScreen *)arg0, (GdkWindow *)arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1monitor_1geometry
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-{
-	GdkRectangle _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1geometry_FUNC);
-	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-/*
-	gdk_screen_get_monitor_geometry((GdkScreen *)arg0, arg1, lparg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_geometry)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkScreen *, jint, GdkRectangle *))fp)((GdkScreen *)arg0, arg1, lparg2);
-		}
-	}
-fail:
-	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1geometry_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1monitor_1scale_1factor
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1scale_1factor)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1scale_1factor_FUNC);
-/*
-	rc = (jint)gdk_screen_get_monitor_scale_factor((GdkScreen *)arg0, (gint)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_scale_factor)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, gint))fp)((GdkScreen *)arg0, (gint)arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1scale_1factor_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1monitor_1width_1mm
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1width_1mm)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1width_1mm_FUNC);
-/*
-	rc = (jint)gdk_screen_get_monitor_width_mm((GdkScreen *)arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_width_mm)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, jint))fp)((GdkScreen *)arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1width_1mm_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1monitor_1workarea
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1workarea)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
-{
-	GdkRectangle _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1workarea_FUNC);
-	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
-/*
-	gdk_screen_get_monitor_workarea((GdkScreen *)arg0, arg1, lparg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_workarea)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkScreen *, jint, GdkRectangle *))fp)((GdkScreen *)arg0, arg1, lparg2);
-		}
-	}
-fail:
-	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1workarea_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1n_1monitors
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
-/*
-	rc = (jint)gdk_screen_get_n_monitors((GdkScreen *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_n_monitors)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1primary_1monitor
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1primary_1monitor)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1primary_1monitor_FUNC);
-/*
-	rc = (jint)gdk_screen_get_primary_monitor((GdkScreen *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_primary_monitor)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1primary_1monitor_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1get_1resolution
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gdk_1screen_1get_1resolution)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1resolution_FUNC);
-/*
-	rc = (jdouble)gdk_screen_get_resolution((GdkScreen *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_screen_get_resolution)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1resolution_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1height
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1height)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1height_FUNC);
-	rc = (jint)gdk_screen_height();
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1height_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1width
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1width)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1width_FUNC);
-	rc = (jint)gdk_screen_width();
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1width_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1screen_1width_1mm
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1width_1mm)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1width_1mm_FUNC);
-	rc = (jint)gdk_screen_width_mm();
-	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1width_1mm_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1seat_1get_1pointer
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1seat_1get_1pointer)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1seat_1get_1pointer_FUNC);
-/*
-	rc = (jintLong)gdk_seat_get_pointer(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_seat_get_pointer)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1seat_1get_1pointer_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1seat_1grab
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1seat_1grab)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1seat_1grab_FUNC);
-/*
-	rc = (jint)gdk_seat_grab(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_seat_grab)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jboolean, jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1seat_1grab_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1seat_1ungrab
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1seat_1ungrab)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1seat_1ungrab_FUNC);
-/*
-	gdk_seat_ungrab(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_seat_ungrab)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1seat_1ungrab_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1selection_1owner_1get
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1selection_1owner_1get)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1selection_1owner_1get_FUNC);
-	gdk_selection_owner_get((GdkAtom)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1selection_1owner_1get_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1selection_1owner_1set
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1selection_1owner_1set)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1selection_1owner_1set_FUNC);
-	gdk_selection_owner_set((GdkWindow *)arg0, (GdkAtom)arg1, (guint32)arg2, (gboolean)arg3);
-	OS_NATIVE_EXIT(env, that, _1gdk_1selection_1owner_1set_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1set_1program_1class
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1set_1program_1class)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1set_1program_1class_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	gdk_set_program_class((const char *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1set_1program_1class_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1test_1simulate_1button
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1test_1simulate_1button)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1test_1simulate_1button_FUNC);
-	rc = (jboolean)gdk_test_simulate_button((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (guint)arg3, (GdkModifierType)arg4, (GdkEventType)arg5);
-	OS_NATIVE_EXIT(env, that, _1gdk_1test_1simulate_1button_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1text_1property_1to_1utf8_1list_1for_1display
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1text_1property_1to_1utf8_1list_1for_1display)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLongArray arg5)
-{
-	jintLong *lparg5=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC);
-	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jint)gdk_text_property_to_utf8_list_for_display((GdkDisplay *)arg0, (GdkAtom)arg1, arg2, (guchar *)arg3, arg4, (gchar ***)lparg5);
-fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1unicode_1to_1keyval
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1unicode_1to_1keyval)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1unicode_1to_1keyval_FUNC);
-	rc = (jint)gdk_unicode_to_keyval(arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1unicode_1to_1keyval_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1utf8_1to_1string_1target
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1utf8_1to_1string_1target)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)gdk_utf8_to_string_target((const gchar *)lparg0);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1visual_1get_1depth
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1visual_1get_1depth)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1visual_1get_1depth_FUNC);
-/*
-	rc = (jint)gdk_visual_get_depth((GdkVisual *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_visual_get_depth)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkVisual *))fp)((GdkVisual *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1visual_1get_1depth_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1visual_1get_1system
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1visual_1get_1system_FUNC);
-	rc = (jintLong)gdk_visual_get_system();
-	OS_NATIVE_EXIT(env, that, _1gdk_1visual_1get_1system_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1add_1filter
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1add_1filter)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1add_1filter_FUNC);
-	gdk_window_add_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1add_1filter_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1at_1pointer
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1at_1pointer)
-	(JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
-{
-	jint *lparg0=NULL;
-	jint *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1at_1pointer_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_window_at_pointer((gint *)lparg0, (gint *)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_at_pointer)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gint *, gint *))fp)((gint *)lparg0, (gint *)lparg1);
-		}
-	}
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1at_1pointer_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1begin_1paint_1rect
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1begin_1paint_1rect)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkRectangle _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1begin_1paint_1rect_FUNC);
-	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-	gdk_window_begin_paint_rect((GdkWindow *)arg0, (GdkRectangle *)lparg1);
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1begin_1paint_1rect_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1create_1similar_1surface
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1create_1similar_1surface)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1create_1similar_1surface_FUNC);
-/*
-	rc = (jintLong)gdk_window_create_similar_surface((GdkWindow *)arg0, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_create_similar_surface)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, jint, jint, jint))fp)((GdkWindow *)arg0, arg1, arg2, arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1create_1similar_1surface_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1destroy
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1destroy)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1destroy_FUNC);
-	gdk_window_destroy((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1destroy_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1end_1paint
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1end_1paint)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1end_1paint_FUNC);
-	gdk_window_end_paint((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1end_1paint_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1focus
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1focus)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1focus_FUNC);
-	gdk_window_focus((GdkWindow *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1focus_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1children
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1children_FUNC);
-	rc = (jintLong)gdk_window_get_children((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1children_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1device_1position
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1device_1position)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-{
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jint *lparg4=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1device_1position_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_window_get_device_position((GdkWindow *)arg0, (GdkDevice *)arg1, (gint *)lparg2, (gint *)lparg3, (GdkModifierType *)lparg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_get_device_position)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, GdkDevice *, gint *, gint *, GdkModifierType *))fp)((GdkWindow *)arg0, (GdkDevice *)arg1, (gint *)lparg2, (gint *)lparg3, (GdkModifierType *)lparg4);
-		}
-	}
-fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1device_1position_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1display
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1display)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1display_FUNC);
-/*
-	rc = (jintLong)gdk_window_get_display((GdkWindow *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_get_display)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1display_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1events
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1events)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1events_FUNC);
-	rc = (jint)gdk_window_get_events((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1events_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1frame_1extents
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1frame_1extents)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
-{
-	GdkRectangle _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1frame_1extents_FUNC);
-	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
-	gdk_window_get_frame_extents((GdkWindow *)arg0, (GdkRectangle *)lparg1);
-fail:
-	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1frame_1extents_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1height
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1height)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1height_FUNC);
-/*
-	rc = (jint)gdk_window_get_height((GdkWindow *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_get_height)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1height_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1internal_1paint_1info
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1internal_1paint_1info)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2, jintArray arg3)
-{
-	jintLong *lparg1=NULL;
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-/*
-	gdk_window_get_internal_paint_info((GdkWindow *)arg0, lparg1, (gint *)lparg2, (gint *)lparg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_get_internal_paint_info)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkWindow *, jintLong *, gint *, gint *))fp)((GdkWindow *)arg0, lparg1, (gint *)lparg2, (gint *)lparg3);
-		}
-	}
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1origin
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1origin)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
-{
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1origin_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)gdk_window_get_origin((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1origin_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1parent
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1parent)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1parent_FUNC);
-	rc = (jintLong)gdk_window_get_parent((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1parent_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1pointer
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1pointer)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
-{
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1pointer_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-/*
-	rc = (jintLong)gdk_window_get_pointer((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_get_pointer)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, gint *, gint *, GdkModifierType *))fp)((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
-		}
-	}
-fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1pointer_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1position
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1position)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
-{
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1position_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	gdk_window_get_position((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1position_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1root_1origin
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1root_1origin)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
-{
-	jint *lparg1=NULL;
-	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1root_1origin_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	gdk_window_get_root_origin((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1root_1origin_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1user_1data
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1user_1data)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
-{
-	jintLong *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1user_1data_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	gdk_window_get_user_data((GdkWindow *)arg0, (gpointer *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1user_1data_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1visible_1region
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1visible_1region)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1visible_1region_FUNC);
-/*
-	rc = (jintLong)gdk_window_get_visible_region((GdkWindow *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_get_visible_region)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1visible_1region_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1get_1width
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1width)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1width_FUNC);
-/*
-	rc = (jint)gdk_window_get_width((GdkWindow *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_get_width)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1width_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1hide
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1hide)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1hide_FUNC);
-	gdk_window_hide((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1hide_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1invalidate_1rect
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1rect)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2)
-{
-	GdkRectangle _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1rect_FUNC);
-	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-	gdk_window_invalidate_rect((GdkWindow *)arg0, (GdkRectangle *)lparg1, (gboolean)arg2);
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1invalidate_1rect_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1invalidate_1region
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1region)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1region_FUNC);
-/*
-	gdk_window_invalidate_region((GdkWindow *)arg0, arg1, (gboolean)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_invalidate_region)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkWindow *, jintLong, gboolean))fp)((GdkWindow *)arg0, arg1, (gboolean)arg2);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1invalidate_1region_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1is_1visible
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1window_1is_1visible)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1is_1visible_FUNC);
-	rc = (jboolean)gdk_window_is_visible((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1is_1visible_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1lower
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1lower)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1lower_FUNC);
-	gdk_window_lower((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1lower_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1move
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1move_FUNC);
-	gdk_window_move((GdkWindow *)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1move_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1move_1resize
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move_1resize)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1move_1resize_FUNC);
-	gdk_window_move_resize((GdkWindow *)arg0, arg1, arg2, arg3, arg4);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1move_1resize_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1new)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
-{
-	GdkWindowAttr _arg1, *lparg1=NULL;
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1new_FUNC);
-	if (arg1) if ((lparg1 = getGdkWindowAttrFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jintLong)gdk_window_new((GdkWindow *)arg0, lparg1, arg2);
-fail:
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1new_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1window_1process_1all_1updates
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1all_1updates)
-	(JNIEnv *env, jclass that)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1process_1all_1updates_FUNC);
-/*
-	gdk_window_process_all_updates();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_process_all_updates)
-		if (fp) {
-			((void (CALLING_CONVENTION*)())fp)();
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1process_1all_1updates_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1process_1updates
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1updates)
-	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1process_1updates_FUNC);
-/*
-	gdk_window_process_updates((GdkWindow *)arg0, (gboolean)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_process_updates)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1process_1updates_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1raise
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1raise)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1raise_FUNC);
-	gdk_window_raise((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1raise_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1remove_1filter
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1remove_1filter)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1remove_1filter_FUNC);
-	gdk_window_remove_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1remove_1filter_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1resize
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1resize)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1resize_FUNC);
-	gdk_window_resize((GdkWindow *)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1resize_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1restack
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1restack)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1restack_FUNC);
-/*
-	gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_restack)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkWindow *, GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1restack_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1set_1back_1pixmap
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1back_1pixmap)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1back_1pixmap_FUNC);
-/*
-	gdk_window_set_back_pixmap((GdkWindow *)arg0, arg1, (gboolean)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_set_back_pixmap)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkWindow *, jintLong, gboolean))fp)((GdkWindow *)arg0, arg1, (gboolean)arg2);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1back_1pixmap_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1set_1background_1pattern
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1background_1pattern)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1background_1pattern_FUNC);
-/*
-	gdk_window_set_background_pattern(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_set_background_pattern)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1background_1pattern_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1set_1cursor
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1cursor)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1cursor_FUNC);
-	gdk_window_set_cursor((GdkWindow *)arg0, (GdkCursor *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1cursor_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1set_1decorations
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1decorations)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1decorations_FUNC);
-	gdk_window_set_decorations((GdkWindow *)arg0, (GdkWMDecoration)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1decorations_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1set_1events
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1events)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1events_FUNC);
-	gdk_window_set_events((GdkWindow *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1events_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1set_1functions
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1functions)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1functions_FUNC);
-	gdk_window_set_functions((GdkWindow *)arg0, (GdkWMFunction)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1functions_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1set_1override_1redirect
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1override_1redirect)
-	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1override_1redirect_FUNC);
-	gdk_window_set_override_redirect((GdkWindow *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1override_1redirect_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1set_1user_1data
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1user_1data)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1user_1data_FUNC);
-	gdk_window_set_user_data((GdkWindow *)arg0, (gpointer)arg1);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1user_1data_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1shape_1combine_1region
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1shape_1combine_1region)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1shape_1combine_1region_FUNC);
-/*
-	gdk_window_shape_combine_region((GdkWindow *)arg0, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_window_shape_combine_region)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GdkWindow *, jintLong, jint, jint))fp)((GdkWindow *)arg0, arg1, arg2, arg3);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1shape_1combine_1region_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1show
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_FUNC);
-	gdk_window_show((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1show_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1window_1show_1unraised
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show_1unraised)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_1unraised_FUNC);
-	gdk_window_show_unraised((GdkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1window_1show_1unraised_FUNC);
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1atom_1to_1xatom
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
-	rc = (jintLong)gdk_x11_atom_to_xatom((GdkAtom)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1display_1get_1xdisplay
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1display_1get_1xdisplay)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1get_1xdisplay_FUNC);
-	rc = (jintLong)gdk_x11_display_get_xdisplay((GdkDisplay *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1display_1get_1xdisplay_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1display_1utf8_1to_1compound_1text
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1x11_1display_1utf8_1to_1compound_1text)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLongArray arg2, jintArray arg3, jintLongArray arg4, jintArray arg5)
-{
-	jbyte *lparg1=NULL;
-	jintLong *lparg2=NULL;
-	jint *lparg3=NULL;
-	jintLong *lparg4=NULL;
-	jint *lparg5=NULL;
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-/*
-	rc = (jboolean)gdk_x11_display_utf8_to_compound_text((GdkDisplay *)arg0, lparg1, lparg2, lparg3, lparg4, lparg5);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_x11_display_utf8_to_compound_text)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkDisplay *, jbyte *, jintLong *, jint *, jintLong *, jint *))fp)((GdkDisplay *)arg0, lparg1, lparg2, lparg3, lparg4, lparg5);
-		}
-	}
-fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1drawable_1get_1xid
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xid)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
-/*
-	rc = (jintLong)gdk_x11_drawable_get_xid(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_x11_drawable_get_xid)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1get_1default_1xdisplay
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1get_1default_1xdisplay)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1get_1default_1xdisplay_FUNC);
-	rc = (jintLong)gdk_x11_get_default_xdisplay();
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1get_1default_1xdisplay_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1screen_1get_1window_1manager_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
-/*
-	rc = (jintLong)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1screen_1lookup_1visual
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
-/*
-	rc = (jintLong)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *, VisualID))fp)((GdkScreen *)arg0, (VisualID)arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1visual_1get_1xvisual
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1visual_1get_1xvisual)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
-	rc = (jintLong)gdk_x11_visual_get_xvisual((GdkVisual *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1window_1get_1xid
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1window_1get_1xid)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1window_1get_1xid_FUNC);
-/*
-	rc = (jintLong)gdk_x11_window_get_xid((GdkWindow *)arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_x11_window_get_xid)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1window_1get_1xid_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gdk_1x11_1window_1lookup_1for_1display
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1window_1lookup_1for_1display)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1window_1lookup_1for_1display_FUNC);
-/*
-	rc = (jintLong)gdk_x11_window_lookup_for_display((GdkDisplay *)arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_x11_window_lookup_for_display)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDisplay *, jintLong))fp)((GdkDisplay *)arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1window_1lookup_1for_1display_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1getpid
-JNIEXPORT jint JNICALL OS_NATIVE(_1getpid)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1getpid_FUNC);
-	rc = (jint)getpid();
-	OS_NATIVE_EXIT(env, that, _1getpid_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1glib_1major_1version
-JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1major_1version)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1glib_1major_1version_FUNC);
-	rc = (jint)glib_major_version;
-	OS_NATIVE_EXIT(env, that, _1glib_1major_1version_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1glib_1micro_1version
-JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1micro_1version)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1glib_1micro_1version_FUNC);
-	rc = (jint)glib_micro_version;
-	OS_NATIVE_EXIT(env, that, _1glib_1micro_1version_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1glib_1minor_1version
-JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1minor_1version)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1glib_1minor_1version_FUNC);
-	rc = (jint)glib_minor_version;
-	OS_NATIVE_EXIT(env, that, _1glib_1minor_1version_FUNC);
-	return rc;
+	GTK_NATIVE_EXIT(env, that, _1GTK_1WIDGET_1UNSET_1FLAGS_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1accel_1group_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1accel_1group_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1accel_1group_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1accel_1group_1new_FUNC);
 	rc = (jintLong)gtk_accel_group_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1accel_1group_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1accel_1group_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1accel_1label_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1accel_1label_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1accel_1label_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_accel_label_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1accel_1label_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1accel_1label_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1accel_1label_1set_1accel
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accel_1label_1set_1accel)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1accel_1label_1set_1accel)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_FUNC);
 /*
 	gtk_accel_label_set_accel((GtkAccelLabel *)arg0, (guint)arg1, (GdkModifierType)arg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_accel_label_set_accel)
+		GTK_LOAD_FUNCTION(fp, gtk_accel_label_set_accel)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkAccelLabel *, guint, GdkModifierType))fp)((GtkAccelLabel *)arg0, (guint)arg1, (GdkModifierType)arg2);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1accel_1label_1set_1accel_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1accel_1label_1set_1accel_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1accel_1label_1set_1accel_1widget
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_1widget_FUNC);
 	gtk_accel_label_set_accel_widget((GtkAccelLabel *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1accel_1label_1set_1accel_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1accel_1label_1set_1accel_1widget_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1accelerator_1get_1default_1mod_1mask
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1accelerator_1get_1default_1mod_1mask)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1accelerator_1get_1default_1mod_1mask)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1accelerator_1get_1default_1mod_1mask_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1accelerator_1get_1default_1mod_1mask_FUNC);
 	rc = (jint)gtk_accelerator_get_default_mod_mask();
-	OS_NATIVE_EXIT(env, that, _1gtk_1accelerator_1get_1default_1mod_1mask_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1accelerator_1get_1default_1mod_1mask_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1accelerator_1parse
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accelerator_1parse)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1accelerator_1parse)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1accelerator_1parse_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1accelerator_1parse_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_accelerator_parse((const gchar *)arg0, (guint *)lparg1, (GdkModifierType *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1accelerator_1parse_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1accelerator_1parse_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1accessible_1get_1widget
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1accessible_1get_1widget)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1accessible_1get_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1accessible_1get_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1accessible_1get_1widget_FUNC);
 	rc = (jintLong)gtk_accessible_get_widget((GtkAccessible *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1accessible_1get_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1accessible_1get_1widget_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1configure
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1configure)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1configure)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1configure_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1configure_FUNC);
 	gtk_adjustment_configure((GtkAdjustment *)arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1configure_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1configure_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1get_1lower
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1lower)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1lower)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1lower_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1lower_FUNC);
 	rc = (jdouble)gtk_adjustment_get_lower((GtkAdjustment *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1lower_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1lower_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1get_1page_1increment
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1page_1increment)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1page_1increment)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1page_1increment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1page_1increment_FUNC);
 	rc = (jdouble)gtk_adjustment_get_page_increment((GtkAdjustment *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1page_1increment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1page_1increment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1get_1page_1size
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1page_1size)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1page_1size)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1page_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1page_1size_FUNC);
 	rc = (jdouble)gtk_adjustment_get_page_size((GtkAdjustment *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1page_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1page_1size_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1get_1step_1increment
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1step_1increment)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1step_1increment)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1step_1increment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1step_1increment_FUNC);
 	rc = (jdouble)gtk_adjustment_get_step_increment((GtkAdjustment *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1step_1increment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1step_1increment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1get_1upper
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1upper)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1upper)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1upper_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1upper_FUNC);
 	rc = (jdouble)gtk_adjustment_get_upper((GtkAdjustment *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1upper_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1upper_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1get_1value
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1adjustment_1get_1value)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1adjustment_1get_1value)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1value_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1get_1value_FUNC);
 	rc = (jdouble)gtk_adjustment_get_value((GtkAdjustment *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1value_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1get_1value_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1adjustment_1new)
 	(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1new_FUNC);
 	rc = (jintLong)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, arg5);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1set_1page_1increment
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1page_1increment)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1page_1increment)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1page_1increment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1page_1increment_FUNC);
 	gtk_adjustment_set_page_increment((GtkAdjustment *)arg0, (gdouble)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1set_1page_1increment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1set_1page_1increment_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1set_1step_1increment
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1step_1increment)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1step_1increment)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1step_1increment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1step_1increment_FUNC);
 	gtk_adjustment_set_step_increment((GtkAdjustment *)arg0, (gdouble)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1set_1step_1increment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1set_1step_1increment_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1set_1value
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1value)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1set_1value)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1value_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1value_FUNC);
 	gtk_adjustment_set_value((GtkAdjustment *)arg0, (gdouble)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1set_1value_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1set_1value_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1adjustment_1value_1changed
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1value_1changed)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1adjustment_1value_1changed)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1value_1changed_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1adjustment_1value_1changed_FUNC);
 /*
 	gtk_adjustment_value_changed((GtkAdjustment *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_adjustment_value_changed)
+		GTK_LOAD_FUNCTION(fp, gtk_adjustment_value_changed)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1value_1changed_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1adjustment_1value_1changed_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1arrow_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1arrow_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1arrow_1new)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1arrow_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1arrow_1new_FUNC);
 /*
 	rc = (jintLong)gtk_arrow_new((GtkArrowType)arg0, (GtkShadowType)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_arrow_new)
+		GTK_LOAD_FUNCTION(fp, gtk_arrow_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkArrowType, GtkShadowType))fp)((GtkArrowType)arg0, (GtkShadowType)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1arrow_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1arrow_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1arrow_1set
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1arrow_1set)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1arrow_1set)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1arrow_1set_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1arrow_1set_FUNC);
 /*
 	gtk_arrow_set((GtkArrow *)arg0, (GtkArrowType)arg1, (GtkShadowType)arg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_arrow_set)
+		GTK_LOAD_FUNCTION(fp, gtk_arrow_set)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkArrow *, GtkArrowType, GtkShadowType))fp)((GtkArrow *)arg0, (GtkArrowType)arg1, (GtkShadowType)arg2);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1arrow_1set_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1arrow_1set_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1bin_1get_1child
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1bin_1get_1child)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1bin_1get_1child)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1bin_1get_1child_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1bin_1get_1child_FUNC);
 	rc = (jintLong)gtk_bin_get_child((GtkBin *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1bin_1get_1child_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1bin_1get_1child_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1border_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1border_1free)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1border_1free)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1border_1free_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1border_1free_FUNC);
 	gtk_border_free((GtkBorder *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1border_1free_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1border_1free_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1box_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1box_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1box_1new)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1box_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1box_1new_FUNC);
 /*
 	rc = (jintLong)gtk_box_new((GtkOrientation)arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_box_new)
+		GTK_LOAD_FUNCTION(fp, gtk_box_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkOrientation, jint))fp)((GtkOrientation)arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1box_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1box_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1box_1pack_1end
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1pack_1end)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1pack_1end)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jboolean arg3, jint arg4)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1box_1pack_1end_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1box_1pack_1end_FUNC);
 	gtk_box_pack_end((GtkBox *)arg0, (GtkWidget *)arg1, (gboolean)arg2, (gboolean)arg3, (guint)arg4);
-	OS_NATIVE_EXIT(env, that, _1gtk_1box_1pack_1end_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1box_1pack_1end_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1box_1reorder_1child
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1reorder_1child)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1reorder_1child)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1box_1reorder_1child_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1box_1reorder_1child_FUNC);
 	gtk_box_reorder_child((GtkBox *)arg0, (GtkWidget *)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1box_1reorder_1child_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1box_1reorder_1child_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1box_1set_1child_1packing
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1child_1packing)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1child_1packing)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing_FUNC);
 	gtk_box_set_child_packing((GtkBox *)arg0, (GtkWidget *)arg1, arg2, arg3, arg4, arg5);
-	OS_NATIVE_EXIT(env, that, _1gtk_1box_1set_1child_1packing_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1box_1set_1child_1packing_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1box_1set_1homogeneous
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1homogeneous)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1homogeneous)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1homogeneous_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1homogeneous_FUNC);
 	gtk_box_set_homogeneous((GtkBox *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1box_1set_1homogeneous_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1box_1set_1homogeneous_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1box_1set_1spacing
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1spacing)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1box_1set_1spacing)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1spacing_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1box_1set_1spacing_FUNC);
 	gtk_box_set_spacing((GtkBox *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1box_1set_1spacing_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1box_1set_1spacing_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1button_1clicked
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1clicked)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1button_1clicked)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1button_1clicked_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1button_1clicked_FUNC);
 	gtk_button_clicked((GtkButton *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1button_1clicked_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1button_1clicked_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1button_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1button_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1button_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1button_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1button_1new_FUNC);
 	rc = (jintLong)gtk_button_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1button_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1button_1set_1image
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1set_1image)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1button_1set_1image)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1button_1set_1image_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1button_1set_1image_FUNC);
 	gtk_button_set_image((GtkButton *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1button_1set_1image_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1button_1set_1image_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1calendar_1clear_1marks
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1clear_1marks)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1clear_1marks)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1clear_1marks_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1clear_1marks_FUNC);
 	gtk_calendar_clear_marks((GtkCalendar *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1clear_1marks_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1calendar_1clear_1marks_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1calendar_1get_1date
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1get_1date)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1get_1date_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1get_1date_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
@@ -7829,139 +985,139 @@ fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1get_1date_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1calendar_1get_1date_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1calendar_1mark_1day
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1mark_1day)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1mark_1day)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1mark_1day_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1mark_1day_FUNC);
 	gtk_calendar_mark_day((GtkCalendar *)arg0, (guint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1mark_1day_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1calendar_1mark_1day_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1calendar_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1calendar_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1calendar_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1new_FUNC);
 	rc = (jintLong)gtk_calendar_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1calendar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1calendar_1select_1day
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1day)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1select_1day)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1day_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1day_FUNC);
 	gtk_calendar_select_day((GtkCalendar *)arg0, (guint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1select_1day_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1calendar_1select_1day_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1calendar_1select_1month
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1select_1month)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1month_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1month_FUNC);
 	gtk_calendar_select_month((GtkCalendar *)arg0, (guint)arg1, (guint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1select_1month_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1calendar_1select_1month_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1calendar_1set_1display_1options
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1set_1display_1options)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1calendar_1set_1display_1options)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
 	gtk_calendar_set_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1layout_1clear
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1clear)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1clear)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1clear_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1clear_FUNC);
 	gtk_cell_layout_clear((GtkCellLayout *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1clear_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1clear_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1layout_1get_1cells
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1layout_1get_1cells)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1get_1cells)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1get_1cells_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1get_1cells_FUNC);
 	rc = (jintLong)gtk_cell_layout_get_cells((GtkCellLayout *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1get_1cells_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1get_1cells_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1layout_1pack_1start
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1pack_1start)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1pack_1start)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
 	gtk_cell_layout_pack_start((GtkCellLayout *)arg0, (GtkCellRenderer *)arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1layout_1set_1attributes
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintLong arg4)
 {
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1set_1attributes_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1set_1attributes_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_cell_layout_set_attributes((GtkCellLayout *)arg0, (GtkCellRenderer *)arg1, lparg2, arg3, (const gchar *)NULL);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1set_1attributes_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1set_1attributes_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1get_1fixed_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1fixed_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1get_1fixed_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1get_1fixed_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1get_1fixed_1size_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_cell_renderer_get_fixed_size((GtkCellRenderer *)arg0, (gint *)lparg1, (gint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1get_1fixed_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1get_1fixed_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4)
 {
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width_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;
 /*
 	gtk_cell_renderer_get_preferred_height_for_width((GtkCellRenderer *)arg0, arg1, arg2, lparg3, lparg4);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_cell_renderer_get_preferred_height_for_width)
+		GTK_LOAD_FUNCTION(fp, gtk_cell_renderer_get_preferred_height_for_width)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkCellRenderer *, jintLong, jint, jint *, jint *))fp)((GtkCellRenderer *)arg0, arg1, arg2, lparg3, lparg4);
 		}
@@ -7969,24 +1125,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1preferred_1height_1
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1get_1preferred_1height_1for_1width_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1get_1preferred_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1preferred_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1get_1preferred_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
 {
 	GtkRequisition _arg2, *lparg2=NULL;
 	GtkRequisition _arg3, *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1get_1preferred_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1get_1preferred_1size_FUNC);
 	if (arg2) if ((lparg2 = getGtkRequisitionFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getGtkRequisitionFields(env, arg3, &_arg3)) == NULL) goto fail;
 /*
 	gtk_cell_renderer_get_preferred_size((GtkCellRenderer *)arg0, (GtkWidget *)arg1, (GtkRequisition *)lparg2, (GtkRequisition *)lparg3);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_cell_renderer_get_preferred_size)
+		GTK_LOAD_FUNCTION(fp, gtk_cell_renderer_get_preferred_size)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkCellRenderer *, GtkWidget *, GtkRequisition *, GtkRequisition *))fp)((GtkCellRenderer *)arg0, (GtkWidget *)arg1, (GtkRequisition *)lparg2, (GtkRequisition *)lparg3);
 		}
@@ -7994,12 +1150,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1preferred_1size)
 fail:
 	if (arg3 && lparg3) setGtkRequisitionFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setGtkRequisitionFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1get_1preferred_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1get_1preferred_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1get_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1get_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
 {
 	GdkRectangle _arg2, *lparg2=NULL;
@@ -8007,7 +1163,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1size)
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1get_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1get_1size_FUNC);
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
@@ -8017,7 +1173,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1size)
 	gtk_cell_renderer_get_size((GtkCellRenderer *)arg0, (GtkWidget *)arg1, (GdkRectangle *)lparg2, (gint *)lparg3, (gint *)lparg4, (gint *)lparg5, (gint *)lparg6);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_cell_renderer_get_size)
+		GTK_LOAD_FUNCTION(fp, gtk_cell_renderer_get_size)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkCellRenderer *, GtkWidget *, GdkRectangle *, gint *, gint *, gint *, gint *))fp)((GtkCellRenderer *)arg0, (GtkWidget *)arg1, (GdkRectangle *)lparg2, (gint *)lparg3, (gint *)lparg4, (gint *)lparg5, (gint *)lparg6);
 		}
@@ -8028,543 +1184,543 @@ fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1get_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1get_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1pixbuf_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
 	rc = (jintLong)gtk_cell_renderer_pixbuf_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1set_1fixed_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1set_1fixed_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1set_1fixed_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1set_1fixed_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1set_1fixed_1size_FUNC);
 	gtk_cell_renderer_set_fixed_size((GtkCellRenderer *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1set_1fixed_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1set_1fixed_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1text_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1text_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1text_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
 	rc = (jintLong)gtk_cell_renderer_text_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1cell_1renderer_1toggle_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1toggle_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1cell_1renderer_1toggle_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
 	rc = (jintLong)gtk_cell_renderer_toggle_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1check_1button_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1button_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1check_1button_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1check_1button_1new_FUNC);
 	rc = (jintLong)gtk_check_button_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1check_1button_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1check_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1check_1menu_1item_1get_1active
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1get_1active)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1get_1active)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1get_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1get_1active_FUNC);
 	rc = (jboolean)gtk_check_menu_item_get_active((GtkCheckMenuItem *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1get_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1get_1active_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1check_1menu_1item_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1new_FUNC);
 	rc = (jintLong)gtk_check_menu_item_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1check_1menu_1item_1new_1with_1label
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1new_1with_1label)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_check_menu_item_new_with_label((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1check_1menu_1item_1set_1active
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1set_1active)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1check_1menu_1item_1set_1active)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1set_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1set_1active_FUNC);
 	gtk_check_menu_item_set_active((GtkCheckMenuItem *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1set_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1set_1active_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1check_1version
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1version)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1check_1version)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1check_1version_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1check_1version_FUNC);
 	rc = (jintLong)gtk_check_version(arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1check_1version_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1check_1version_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1clipboard_1clear
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1clear)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1clear)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1clear_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1clear_FUNC);
 	gtk_clipboard_clear((GtkClipboard *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1clear_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1clipboard_1clear_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1clipboard_1get
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1clipboard_1get)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1get_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1get_FUNC);
 	rc = (jintLong)gtk_clipboard_get((GdkAtom)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1get_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1clipboard_1get_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1clipboard_1set_1can_1store
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1can_1store)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1set_1can_1store)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1can_1store_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1can_1store_FUNC);
 	gtk_clipboard_set_can_store((GtkClipboard *)arg0, (const GtkTargetEntry *)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1set_1can_1store_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1clipboard_1set_1can_1store_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1clipboard_1set_1with_1owner
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1with_1owner)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1clipboard_1set_1with_1owner)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1with_1owner_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1with_1owner_FUNC);
 	rc = (jboolean)gtk_clipboard_set_with_owner((GtkClipboard *)arg0, (const GtkTargetEntry *)arg1, (guint)arg2, (GtkClipboardGetFunc)arg3, (GtkClipboardClearFunc)arg4, (GObject *)arg5);
-	OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1set_1with_1owner_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1clipboard_1set_1with_1owner_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1clipboard_1store
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1store)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1clipboard_1store)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1store_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1store_FUNC);
 	gtk_clipboard_store((GtkClipboard *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1store_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1clipboard_1store_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1clipboard_1wait_1for_1contents
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1clipboard_1wait_1for_1contents)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1clipboard_1wait_1for_1contents)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
 	rc = (jintLong)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1color_1chooser_1add_1palette
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1color_1chooser_1add_1palette)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1add_1palette)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1add_1palette_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1add_1palette_FUNC);
 /*
 	rc = (jintLong)gtk_color_chooser_add_palette((GtkColorChooser *)arg0, (GtkOrientation)arg1, arg2, arg3, (GdkRGBA *)arg4);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_chooser_add_palette)
+		GTK_LOAD_FUNCTION(fp, gtk_color_chooser_add_palette)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkColorChooser *, GtkOrientation, jint, jint, GdkRGBA *))fp)((GtkColorChooser *)arg0, (GtkOrientation)arg1, arg2, arg3, (GdkRGBA *)arg4);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1add_1palette_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1add_1palette_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1color_1chooser_1dialog_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1color_1chooser_1dialog_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1dialog_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1dialog_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
 	rc = (jintLong)gtk_color_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_chooser_dialog_new)
+		GTK_LOAD_FUNCTION(fp, gtk_color_chooser_dialog_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, GtkWindow *))fp)((const gchar *)lparg0, (GtkWindow *)arg1);
 		}
 	}
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1dialog_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1dialog_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1color_1chooser_1get_1rgba
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1chooser_1get_1rgba)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1get_1rgba)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRGBA _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1get_1rgba_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1get_1rgba_FUNC);
 	if (arg1) if ((lparg1 = getGdkRGBAFields(env, arg1, &_arg1)) == NULL) goto fail;
 /*
 	gtk_color_chooser_get_rgba(arg0, lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_chooser_get_rgba)
+		GTK_LOAD_FUNCTION(fp, gtk_color_chooser_get_rgba)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, GdkRGBA *))fp)(arg0, lparg1);
 		}
 	}
 fail:
 	if (arg1 && lparg1) setGdkRGBAFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1get_1rgba_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1get_1rgba_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1color_1chooser_1get_1use_1alpha
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1color_1chooser_1get_1use_1alpha)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1get_1use_1alpha)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1get_1use_1alpha_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1get_1use_1alpha_FUNC);
 /*
 	rc = (jboolean)gtk_color_chooser_get_use_alpha(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_chooser_get_use_alpha)
+		GTK_LOAD_FUNCTION(fp, gtk_color_chooser_get_use_alpha)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1get_1use_1alpha_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1get_1use_1alpha_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1color_1chooser_1set_1rgba
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1chooser_1set_1rgba)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1set_1rgba)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRGBA _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1set_1rgba_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1set_1rgba_FUNC);
 	if (arg1) if ((lparg1 = getGdkRGBAFields(env, arg1, &_arg1)) == NULL) goto fail;
 /*
 	gtk_color_chooser_set_rgba(arg0, lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_chooser_set_rgba)
+		GTK_LOAD_FUNCTION(fp, gtk_color_chooser_set_rgba)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, GdkRGBA *))fp)(arg0, lparg1);
 		}
 	}
 fail:
 	if (arg1 && lparg1) setGdkRGBAFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1set_1rgba_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1set_1rgba_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1color_1chooser_1set_1use_1alpha
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1chooser_1set_1use_1alpha)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1chooser_1set_1use_1alpha)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1set_1use_1alpha_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1chooser_1set_1use_1alpha_FUNC);
 /*
 	gtk_color_chooser_set_use_alpha(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_chooser_set_use_alpha)
+		GTK_LOAD_FUNCTION(fp, gtk_color_chooser_set_use_alpha)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1set_1use_1alpha_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1chooser_1set_1use_1alpha_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1color_1selection_1dialog_1get_1color_1selection
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1color_1selection_1dialog_1get_1color_1selection)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1color_1selection_1dialog_1get_1color_1selection)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1dialog_1get_1color_1selection_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1dialog_1get_1color_1selection_FUNC);
 /*
 	rc = (jintLong)gtk_color_selection_dialog_get_color_selection((GtkColorSelectionDialog *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_selection_dialog_get_color_selection)
+		GTK_LOAD_FUNCTION(fp, gtk_color_selection_dialog_get_color_selection)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkColorSelectionDialog *))fp)((GtkColorSelectionDialog *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1dialog_1get_1color_1selection_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1dialog_1get_1color_1selection_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1color_1selection_1dialog_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1color_1selection_1dialog_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1color_1selection_1dialog_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
 	rc = (jintLong)gtk_color_selection_dialog_new((const gchar *)lparg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_selection_dialog_new)
+		GTK_LOAD_FUNCTION(fp, gtk_color_selection_dialog_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0);
 		}
 	}
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1color_1selection_1get_1current_1color
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1get_1current_1color)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1selection_1get_1current_1color)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1get_1current_1color_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1get_1current_1color_FUNC);
 	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
 /*
 	gtk_color_selection_get_current_color(arg0, lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_selection_get_current_color)
+		GTK_LOAD_FUNCTION(fp, gtk_color_selection_get_current_color)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
 		}
 	}
 fail:
 	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1get_1current_1color_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1get_1current_1color_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1color_1selection_1palette_1to_1string
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1color_1selection_1palette_1to_1string)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1color_1selection_1palette_1to_1string)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1palette_1to_1string_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1palette_1to_1string_FUNC);
 /*
 	rc = (jintLong)gtk_color_selection_palette_to_string(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_selection_palette_to_string)
+		GTK_LOAD_FUNCTION(fp, gtk_color_selection_palette_to_string)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1palette_1to_1string_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1palette_1to_1string_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1color_1selection_1set_1current_1color
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1current_1color)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1selection_1set_1current_1color)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1current_1color_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1current_1color_FUNC);
 	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
 /*
 	gtk_color_selection_set_current_color(arg0, lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_selection_set_current_color)
+		GTK_LOAD_FUNCTION(fp, gtk_color_selection_set_current_color)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
 		}
 	}
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1set_1current_1color_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1set_1current_1color_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1color_1selection_1set_1has_1palette
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1has_1palette)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1color_1selection_1set_1has_1palette)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1has_1palette_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1has_1palette_FUNC);
 /*
 	gtk_color_selection_set_has_palette(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_color_selection_set_has_palette)
+		GTK_LOAD_FUNCTION(fp, gtk_color_selection_set_has_palette)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1set_1has_1palette_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1set_1has_1palette_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1get_1active
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1active)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
 	rc = (jint)gtk_combo_box_get_active((GtkComboBox *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1get_1model
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1get_1model)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
 	rc = (jintLong)gtk_combo_box_get_model((GtkComboBox *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1popdown
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popdown)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1popdown)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popdown_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popdown_FUNC);
 	gtk_combo_box_popdown((GtkComboBox *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1popdown_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1popdown_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1popup
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popup)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1popup)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popup_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popup_FUNC);
 	gtk_combo_box_popup((GtkComboBox *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1popup_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1popup_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1set_1active
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1active)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1active)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
 	gtk_combo_box_set_active((GtkComboBox *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1set_1focus_1on_1click
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
 /*
 	gtk_combo_box_set_focus_on_click((GtkComboBox *)arg0, (gboolean)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_combo_box_set_focus_on_click)
+		GTK_LOAD_FUNCTION(fp, gtk_combo_box_set_focus_on_click)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkComboBox *, gboolean))fp)((GtkComboBox *)arg0, (gboolean)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1set_1wrap_1width
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1wrap_1width)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1set_1wrap_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
 	gtk_combo_box_set_wrap_width((GtkComboBox *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1text_1insert
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1insert)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1insert)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
 {
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1insert_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1insert_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	gtk_combo_box_text_insert(arg0, arg1, lparg2, lparg3);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_combo_box_text_insert)
+		GTK_LOAD_FUNCTION(fp, gtk_combo_box_text_insert)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, jbyte *, jbyte *))fp)(arg0, arg1, lparg2, lparg3);
 		}
@@ -8572,155 +1728,155 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1insert)
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1insert_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1insert_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1text_1insert_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1insert_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1insert_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2)
 {
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1insert_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1insert_1text_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_combo_box_text_insert_text((GtkComboBoxText *)arg0, (gint)arg1, (const gchar *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1insert_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1insert_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1text_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1new_FUNC);
 	rc = (jintLong)gtk_combo_box_text_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1text_1new_1with_1entry
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1new_1with_1entry)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1new_1with_1entry)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1new_1with_1entry_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1new_1with_1entry_FUNC);
 	rc = (jintLong)gtk_combo_box_text_new_with_entry();
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1new_1with_1entry_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1new_1with_1entry_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1text_1remove
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1remove)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1remove)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1remove_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1remove_FUNC);
 	gtk_combo_box_text_remove((GtkComboBoxText *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1remove_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1remove_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1combo_1box_1text_1remove_1all
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1remove_1all)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1combo_1box_1text_1remove_1all)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1remove_1all_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1text_1remove_1all_FUNC);
 /*
 	gtk_combo_box_text_remove_all(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_combo_box_text_remove_all)
+		GTK_LOAD_FUNCTION(fp, gtk_combo_box_text_remove_all)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1remove_1all_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1text_1remove_1all_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1container_1add
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1add)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1container_1add_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1container_1add_FUNC);
 	gtk_container_add((GtkContainer *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1container_1add_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1container_1add_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1container_1forall
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1forall)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1forall)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1container_1forall_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1container_1forall_FUNC);
 	gtk_container_forall((GtkContainer *)arg0, (GtkCallback)arg1, (gpointer)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1container_1forall_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1container_1forall_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1container_1get_1border_1width
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1border_1width)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1container_1get_1border_1width)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1container_1get_1border_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1container_1get_1border_1width_FUNC);
 	rc = (jint)gtk_container_get_border_width((GtkContainer *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1container_1get_1border_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1container_1get_1border_1width_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1container_1get_1children
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1container_1get_1children)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1container_1get_1children_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1container_1get_1children_FUNC);
 	rc = (jintLong)gtk_container_get_children((GtkContainer *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1container_1get_1children_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1container_1get_1children_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1container_1remove
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1remove)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1remove)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1container_1remove_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1container_1remove_FUNC);
 	gtk_container_remove((GtkContainer *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1container_1remove_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1container_1remove_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1container_1set_1border_1width
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1set_1border_1width)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1container_1set_1border_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1container_1set_1border_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1container_1set_1border_1width_FUNC);
 	gtk_container_set_border_width((GtkContainer *)arg0, (guint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1container_1set_1border_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1container_1set_1border_1width_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1css_1provider_1get_1named
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1css_1provider_1get_1named)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1get_1named)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1get_1named_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1get_1named_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
 	rc = (jintLong)gtk_css_provider_get_named((const gchar *)lparg0, (const gchar *)lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_css_provider_get_named)
+		GTK_LOAD_FUNCTION(fp, gtk_css_provider_get_named)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, const gchar *))fp)((const gchar *)lparg0, (const gchar *)lparg1);
 		}
@@ -8728,26 +1884,26 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1css_1provider_1get_1named)
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1get_1named_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1get_1named_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1css_1provider_1load_1from_1data
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1css_1provider_1load_1from_1data)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1css_1provider_1load_1from_1data)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLongArray arg3)
 {
 	jbyte *lparg1=NULL;
 	jintLong *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1load_1from_1data_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1load_1from_1data_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)gtk_css_provider_load_from_data(arg0, (const gchar *)lparg1, (gssize)arg2, (GError **)lparg3);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_css_provider_load_from_data)
+		GTK_LOAD_FUNCTION(fp, gtk_css_provider_load_from_data)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, const gchar *, gssize, GError **))fp)(arg0, (const gchar *)lparg1, (gssize)arg2, (GError **)lparg3);
 		}
@@ -8755,754 +1911,754 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1css_1provider_1load_1from_1data)
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1load_1from_1data_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1load_1from_1data_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1css_1provider_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1css_1provider_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1new_FUNC);
 /*
 	rc = (jintLong)gtk_css_provider_new();
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_css_provider_new)
+		GTK_LOAD_FUNCTION(fp, gtk_css_provider_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1css_1provider_1to_1string
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1css_1provider_1to_1string)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1css_1provider_1to_1string)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1to_1string_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1css_1provider_1to_1string_FUNC);
 /*
 	rc = (jintLong)gtk_css_provider_to_string(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_css_provider_to_string)
+		GTK_LOAD_FUNCTION(fp, gtk_css_provider_to_string)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1to_1string_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1css_1provider_1to_1string_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1dialog_1add_1button
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1dialog_1add_1button)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1dialog_1add_1button)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1dialog_1add_1button_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1dialog_1add_1button_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1dialog_1add_1button_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1dialog_1add_1button_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1dialog_1run
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1run)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1dialog_1run)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1dialog_1run_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1dialog_1run_FUNC);
 	rc = (jint)gtk_dialog_run((GtkDialog *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1dialog_1run_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1dialog_1run_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1begin
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drag_1begin)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1begin)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_FUNC);
 /*
 	rc = (jintLong)gtk_drag_begin((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_drag_begin)
+		GTK_LOAD_FUNCTION(fp, gtk_drag_begin)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *, GtkTargetList *, GdkDragAction, gint, GdkEvent *))fp)((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1begin_1with_1coordinates
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drag_1begin_1with_1coordinates)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1begin_1with_1coordinates)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4, jint arg5, jint arg6)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_1with_1coordinates_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_1with_1coordinates_FUNC);
 /*
 	rc = (jintLong)gtk_drag_begin_with_coordinates((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4, (gint)arg5, (gint)arg6);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_drag_begin_with_coordinates)
+		GTK_LOAD_FUNCTION(fp, gtk_drag_begin_with_coordinates)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *, GtkTargetList *, GdkDragAction, gint, GdkEvent *, gint, gint))fp)((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4, (gint)arg5, (gint)arg6);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_1with_1coordinates_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_1with_1coordinates_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1check_1threshold
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1drag_1check_1threshold)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1drag_1check_1threshold)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1check_1threshold_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1check_1threshold_FUNC);
 	rc = (jboolean)gtk_drag_check_threshold((GtkWidget *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1check_1threshold_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1check_1threshold_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1dest_1find_1target
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1find_1target)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
 	rc = (jintLong)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1dest_1set
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1set)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1set)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3, jint arg4)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1set_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1set_FUNC);
 	gtk_drag_dest_set((GtkWidget *)arg0, (GtkDestDefaults)arg1, (const GtkTargetEntry *)arg2, (gint)arg3, (GdkDragAction)arg4);
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1set_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1set_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1dest_1unset
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1unset)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1dest_1unset)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1unset_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1unset_FUNC);
 	gtk_drag_dest_unset((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1unset_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1unset_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1finish
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1finish)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1finish)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jboolean arg2, jint arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1finish_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1finish_FUNC);
 	gtk_drag_finish((GdkDragContext *)arg0, (gboolean)arg1, (gboolean)arg2, (guint32)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1finish_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1finish_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1get_1data
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1get_1data)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1get_1data)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data_FUNC);
 	gtk_drag_get_data((GtkWidget *)arg0, (GdkDragContext *)arg1, (GdkAtom)arg2, (guint32)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1get_1data_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1get_1data_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1set_1icon_1pixbuf
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1set_1icon_1pixbuf)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1set_1icon_1pixbuf)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1set_1icon_1pixbuf_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1set_1icon_1pixbuf_FUNC);
 	gtk_drag_set_icon_pixbuf((GdkDragContext *)arg0, (GdkPixbuf *)arg1, arg2, arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1set_1icon_1pixbuf_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1set_1icon_1pixbuf_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1drag_1set_1icon_1surface
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1set_1icon_1surface)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1drag_1set_1icon_1surface)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1drag_1set_1icon_1surface_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1drag_1set_1icon_1surface_FUNC);
 /*
 	gtk_drag_set_icon_surface(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_drag_set_icon_surface)
+		GTK_LOAD_FUNCTION(fp, gtk_drag_set_icon_surface)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1drag_1set_1icon_1surface_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1drag_1set_1icon_1surface_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1copy_1clipboard
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1copy_1clipboard)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1copy_1clipboard)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1copy_1clipboard_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1copy_1clipboard_FUNC);
 	gtk_editable_copy_clipboard((GtkEditable *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1copy_1clipboard_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1copy_1clipboard_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1cut_1clipboard
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1cut_1clipboard)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1cut_1clipboard)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1cut_1clipboard_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1cut_1clipboard_FUNC);
 	gtk_editable_cut_clipboard((GtkEditable *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1cut_1clipboard_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1cut_1clipboard_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1delete_1selection
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1selection)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1delete_1selection)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1selection_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1selection_FUNC);
 	gtk_editable_delete_selection((GtkEditable *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1delete_1selection_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1delete_1selection_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1delete_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1delete_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1text_FUNC);
 	gtk_editable_delete_text((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1delete_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1delete_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1get_1editable
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1editable)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1editable_1get_1editable)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1editable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1editable_FUNC);
 	rc = (jboolean)gtk_editable_get_editable((GtkEditable *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1editable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1editable_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1get_1position
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1position)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1editable_1get_1position)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1position_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1position_FUNC);
 	rc = (jint)gtk_editable_get_position((GtkEditable *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1position_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1position_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1get_1selection_1bounds
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1selection_1bounds)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1editable_1get_1selection_1bounds)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1selection_1bounds_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1selection_1bounds_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_editable_get_selection_bounds((GtkEditable *)arg0, (gint *)lparg1, (gint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1selection_1bounds_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1selection_1bounds_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1insert_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1insert_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1insert_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintArray arg3)
 {
 	jbyte *lparg1=NULL;
 	jint *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1insert_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1insert_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_editable_insert_text((GtkEditable *)arg0, (gchar *)lparg1, (gint)arg2, (gint *)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1insert_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1insert_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1paste_1clipboard
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1paste_1clipboard)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1paste_1clipboard)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1paste_1clipboard_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1paste_1clipboard_FUNC);
 	gtk_editable_paste_clipboard((GtkEditable *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1paste_1clipboard_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1paste_1clipboard_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1select_1region
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1select_1region)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1select_1region)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1select_1region_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1select_1region_FUNC);
 	gtk_editable_select_region((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1select_1region_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1select_1region_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1set_1editable
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1editable)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1set_1editable)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1editable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1editable_FUNC);
 	gtk_editable_set_editable((GtkEditable *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1set_1editable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1set_1editable_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1editable_1set_1position
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1position)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1editable_1set_1position)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1position_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1position_FUNC);
 	gtk_editable_set_position((GtkEditable *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1editable_1set_1position_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1editable_1set_1position_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1icon_1area
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1icon_1area)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1entry_1get_1icon_1area)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkRectangle _arg2, *lparg2=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1icon_1area_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1icon_1area_FUNC);
 	if (arg2) if ((lparg2 = getGdkRectangleFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	rc = (jint)gtk_entry_get_icon_area((GtkEntry *)arg0, arg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_entry_get_icon_area)
+		GTK_LOAD_FUNCTION(fp, gtk_entry_get_icon_area)
 		if (fp) {
 			rc = (jint)((jint (CALLING_CONVENTION*)(GtkEntry *, jint, GdkRectangle *))fp)((GtkEntry *)arg0, arg1, lparg2);
 		}
 	}
 fail:
 	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1icon_1area_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1icon_1area_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1inner_1border
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1inner_1border)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1inner_1border)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1inner_1border_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1inner_1border_FUNC);
 /*
 	rc = (jintLong)gtk_entry_get_inner_border(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_entry_get_inner_border)
+		GTK_LOAD_FUNCTION(fp, gtk_entry_get_inner_border)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1inner_1border_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1inner_1border_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1invisible_1char
-JNIEXPORT jchar JNICALL OS_NATIVE(_1gtk_1entry_1get_1invisible_1char)
+JNIEXPORT jchar JNICALL GTK_NATIVE(_1gtk_1entry_1get_1invisible_1char)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jchar rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1invisible_1char_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1invisible_1char_FUNC);
 	rc = (jchar)gtk_entry_get_invisible_char((GtkEntry *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1invisible_1char_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1invisible_1char_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1layout
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1layout)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1layout_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1layout_FUNC);
 	rc = (jintLong)gtk_entry_get_layout((GtkEntry *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1layout_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1layout_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1layout_1offsets
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout_1offsets)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1get_1layout_1offsets)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1layout_1offsets_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1layout_1offsets_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_entry_get_layout_offsets((GtkEntry *)arg0, (gint *)lparg1, (gint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1layout_1offsets_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1layout_1offsets_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1max_1length
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1max_1length)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1entry_1get_1max_1length)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1max_1length_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1max_1length_FUNC);
 	rc = (jint)gtk_entry_get_max_length((GtkEntry *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1max_1length_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1max_1length_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1text
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1get_1text)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1text_FUNC);
 	rc = (jintLong)gtk_entry_get_text((GtkEntry *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1text_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1get_1visibility
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1entry_1get_1visibility)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1entry_1get_1visibility)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1visibility_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1visibility_FUNC);
 	rc = (jboolean)gtk_entry_get_visibility((GtkEntry *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1visibility_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1visibility_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1entry_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1new_FUNC);
 	rc = (jintLong)gtk_entry_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1alignment
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1alignment)
 	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1alignment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1alignment_FUNC);
 	gtk_entry_set_alignment((GtkEntry *)arg0, (gfloat)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1alignment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1alignment_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1has_1frame
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1has_1frame)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1has_1frame)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1has_1frame_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1has_1frame_FUNC);
 	gtk_entry_set_has_frame((GtkEntry *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1has_1frame_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1has_1frame_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1icon_1from_1icon_1name
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1icon_1from_1icon_1name)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1icon_1from_1icon_1name)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2)
 {
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1icon_1from_1icon_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1icon_1from_1icon_1name_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_entry_set_icon_from_icon_name((GtkEntry *)arg0, (gint)arg1, (const gchar *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1icon_1from_1icon_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1icon_1from_1icon_1name_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1icon_1sensitive
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1icon_1sensitive)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1icon_1sensitive)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1icon_1sensitive_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1icon_1sensitive_FUNC);
 	gtk_entry_set_icon_sensitive((GtkEntry *)arg0, (GtkEntryIconPosition)arg1, (gboolean)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1icon_1sensitive_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1icon_1sensitive_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1invisible_1char
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1invisible_1char)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1invisible_1char)
 	(JNIEnv *env, jclass that, jintLong arg0, jchar arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1invisible_1char_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1invisible_1char_FUNC);
 	gtk_entry_set_invisible_char((GtkEntry *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1invisible_1char_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1invisible_1char_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1max_1length
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1max_1length)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1max_1length)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1max_1length_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1max_1length_FUNC);
 	gtk_entry_set_max_length((GtkEntry *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1max_1length_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1max_1length_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1placeholder_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1placeholder_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1placeholder_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1placeholder_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1placeholder_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
 	gtk_entry_set_placeholder_text((GtkEntry *)arg0, (const gchar *)lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_entry_set_placeholder_text)
+		GTK_LOAD_FUNCTION(fp, gtk_entry_set_placeholder_text)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkEntry *, const gchar *))fp)((GtkEntry *)arg0, (const gchar *)lparg1);
 		}
 	}
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1placeholder_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1placeholder_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_entry_set_text((GtkEntry *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1visibility
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1visibility)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1visibility)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1visibility_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1visibility_FUNC);
 	gtk_entry_set_visibility((GtkEntry *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1visibility_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1visibility_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1set_1width_1chars
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1width_1chars)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1entry_1set_1width_1chars)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1width_1chars_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1width_1chars_FUNC);
 	gtk_entry_set_width_chars((GtkEntry *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1width_1chars_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1width_1chars_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1entry_1text_1index_1to_1layout_1index
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
 	rc = (jint)gtk_entry_text_index_to_layout_index((GtkEntry *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1enumerate_1printers
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1enumerate_1printers)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1enumerate_1printers)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1enumerate_1printers_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1enumerate_1printers_FUNC);
 	gtk_enumerate_printers((GtkPrinterFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1enumerate_1printers_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1enumerate_1printers_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1event_1box_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1event_1box_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1event_1box_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1event_1box_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1event_1box_1new_FUNC);
 	rc = (jintLong)gtk_event_box_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1event_1box_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1event_1box_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1event_1controller_1handle_1event
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1event_1controller_1handle_1event)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1event_1controller_1handle_1event)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1handle_1event_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1handle_1event_FUNC);
 /*
 	gtk_event_controller_handle_event(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_event_controller_handle_event)
+		GTK_LOAD_FUNCTION(fp, gtk_event_controller_handle_event)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1handle_1event_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1handle_1event_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1event_1controller_1set_1propagation_1phase
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1event_1controller_1set_1propagation_1phase)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1event_1controller_1set_1propagation_1phase)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1set_1propagation_1phase_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1event_1controller_1set_1propagation_1phase_FUNC);
 /*
 	gtk_event_controller_set_propagation_phase(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_event_controller_set_propagation_phase)
+		GTK_LOAD_FUNCTION(fp, gtk_event_controller_set_propagation_phase)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1set_1propagation_1phase_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1event_1controller_1set_1propagation_1phase_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1expander_1get_1expanded
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1expander_1get_1expanded)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1expanded_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1expanded_FUNC);
 	rc = (jboolean)gtk_expander_get_expanded((GtkExpander *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1expander_1get_1expanded_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1expander_1get_1expanded_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1expander_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1expander_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1expander_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_expander_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1expander_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1expander_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1expander_1set_1expanded
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1expander_1set_1expanded)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1expanded_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1expanded_FUNC);
 	gtk_expander_set_expanded((GtkExpander *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1expanded_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1expanded_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1expander_1set_1label_1widget
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1expander_1set_1label_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
 	gtk_expander_set_label_widget((GtkExpander *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1add_1filter
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1add_1filter)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
 	gtk_file_chooser_add_filter((GtkFileChooser *)arg0, (GtkFileFilter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
 }
 #endif
 
 #if (!defined(NO__1gtk_1file_1chooser_1dialog_1new___3BIIIIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BIIIIIII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLong arg5, jint arg6, jintLong arg7)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BIIIIIII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLong arg5, jint arg6, jintLong arg7)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLong arg5, jint arg6, jintLong arg7)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLong arg5, jint arg6, jintLong arg7)
 #endif
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BIIIIIII_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BIIIIIII_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC);
 #endif
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_file_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)arg3, arg4, arg5, arg6, (const gchar *)NULL);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BIIIIIII_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BIIIIIII_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC);
 #endif
 	return rc;
 }
@@ -9510,9 +2666,9 @@ fail:
 
 #if (!defined(NO__1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII) && !defined(JNI64)) || (!defined(NO__1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLong arg7)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLong arg7)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLong arg7)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLong arg7)
 #endif
 {
 	jbyte *lparg0=NULL;
@@ -9520,9 +2676,9 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new___3BJI_3B
 	jbyte *lparg5=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC);
 #endif
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
@@ -9533,456 +2689,456 @@ fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, JNI_ABORT);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BII_3BI_3BII_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC);
 #endif
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1filename
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filename)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
 	rc = (jintLong)gtk_file_chooser_get_filename((GtkFileChooser *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1filenames
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
 	rc = (jintLong)gtk_file_chooser_get_filenames((GtkFileChooser *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1filter
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1filter)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
 	rc = (jintLong)gtk_file_chooser_get_filter((GtkFileChooser *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1uri
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1uri)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1uri)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1uri_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1uri_FUNC);
 	rc = (jintLong)gtk_file_chooser_get_uri((GtkFileChooser *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1uri_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1uri_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1get_1uris
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1uris)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1get_1uris)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1uris_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1uris_FUNC);
 	rc = (jintLong)gtk_file_chooser_get_uris((GtkFileChooser *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1uris_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1uris_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1current_1folder
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
 	gtk_file_chooser_set_current_folder((GtkFileChooser *)arg0, (const gchar *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1current_1folder_1uri
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder_1uri)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder_1uri)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_file_chooser_set_current_folder_uri((GtkFileChooser *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1current_1name
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1name)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1current_1name)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_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);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1name_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
 	gtk_file_chooser_set_do_overwrite_confirmation((GtkFileChooser *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1extra_1widget
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
 	gtk_file_chooser_set_extra_widget((GtkFileChooser *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1filename
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filename)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1filename)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
 	gtk_file_chooser_set_filename((GtkFileChooser *)arg0, (const gchar *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1filter
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filter)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1filter)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
 	gtk_file_chooser_set_filter((GtkFileChooser *)arg0, (GtkFileFilter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1local_1only
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1local_1only)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1local_1only)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1local_1only_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1local_1only_FUNC);
 	gtk_file_chooser_set_local_only((GtkFileChooser *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1local_1only_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1local_1only_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1select_1multiple
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
 	gtk_file_chooser_set_select_multiple((GtkFileChooser *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1chooser_1set_1uri
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1uri)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1chooser_1set_1uri)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1uri_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1uri_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_file_chooser_set_uri((GtkFileChooser *)arg0, (const char *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1uri_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1uri_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1filter_1add_1pattern
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1add_1pattern)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1filter_1add_1pattern)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1add_1pattern_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1add_1pattern_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_file_filter_add_pattern((GtkFileFilter *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1add_1pattern_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1add_1pattern_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1file_1filter_1get_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1filter_1get_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
 	rc = (jintLong)gtk_file_filter_get_name((GtkFileFilter *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1filter_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1file_1filter_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1new_FUNC);
 	rc = (jintLong)gtk_file_filter_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1file_1filter_1set_1name
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1set_1name)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1file_1filter_1set_1name)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1set_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1set_1name_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_file_filter_set_name((GtkFileFilter *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1set_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1set_1name_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1fixed_1move
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1move)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1fixed_1move)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1move_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1fixed_1move_FUNC);
 	gtk_fixed_move((GtkFixed *)arg0, (GtkWidget *)arg1, (gint)arg2, (gint)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1fixed_1move_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1fixed_1move_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1fixed_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1fixed_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1fixed_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1fixed_1new_FUNC);
 	rc = (jintLong)gtk_fixed_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1fixed_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1fixed_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1font_1chooser_1dialog_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1font_1chooser_1dialog_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1dialog_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1dialog_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
 	rc = (jintLong)gtk_font_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_font_chooser_dialog_new)
+		GTK_LOAD_FUNCTION(fp, gtk_font_chooser_dialog_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, GtkWindow *))fp)((const gchar *)lparg0, (GtkWindow *)arg1);
 		}
 	}
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1font_1chooser_1dialog_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1font_1chooser_1dialog_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1font_1chooser_1get_1font
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1font_1chooser_1get_1font)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1get_1font)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1get_1font_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1get_1font_FUNC);
 /*
 	rc = (jintLong)gtk_font_chooser_get_font(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_font_chooser_get_font)
+		GTK_LOAD_FUNCTION(fp, gtk_font_chooser_get_font)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1font_1chooser_1get_1font_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1font_1chooser_1get_1font_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1font_1chooser_1set_1font
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1font_1chooser_1set_1font)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1font_1chooser_1set_1font)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1set_1font_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1font_1chooser_1set_1font_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
 	gtk_font_chooser_set_font(arg0, (const gchar *)lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_font_chooser_set_font)
+		GTK_LOAD_FUNCTION(fp, gtk_font_chooser_set_font)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1);
 		}
 	}
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1font_1chooser_1set_1font_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1font_1chooser_1set_1font_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1font_1selection_1dialog_1get_1font_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1get_1font_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1font_1selection_1dialog_1get_1font_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
 /*
 	rc = (jintLong)gtk_font_selection_dialog_get_font_name(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_font_selection_dialog_get_font_name)
+		GTK_LOAD_FUNCTION(fp, gtk_font_selection_dialog_get_font_name)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1font_1selection_1dialog_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1font_1selection_1dialog_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
 	rc = (jintLong)gtk_font_selection_dialog_new((const gchar *)lparg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_font_selection_dialog_new)
+		GTK_LOAD_FUNCTION(fp, gtk_font_selection_dialog_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0);
 		}
 	}
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1font_1selection_1dialog_1set_1font_1name
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1set_1font_1name)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1font_1selection_1dialog_1set_1font_1name)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1set_1font_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1set_1font_1name_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)gtk_font_selection_dialog_set_font_name(arg0, (const gchar *)lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_font_selection_dialog_set_font_name)
+		GTK_LOAD_FUNCTION(fp, gtk_font_selection_dialog_set_font_name)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1);
 		}
 	}
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1set_1font_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1set_1font_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1frame_1get_1label_1widget
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1frame_1get_1label_1widget)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1frame_1get_1label_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
 	rc = (jintLong)gtk_frame_get_label_widget((GtkFrame *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1frame_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1frame_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1frame_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1frame_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_frame_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1frame_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1frame_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1frame_1set_1label_1widget
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label_1widget)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1frame_1set_1label_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_1widget_FUNC);
 	gtk_frame_set_label_widget((GtkFrame *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1frame_1set_1label_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1frame_1set_1label_1widget_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1frame_1set_1shadow_1type
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1shadow_1type)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1frame_1set_1shadow_1type)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1shadow_1type_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1shadow_1type_FUNC);
 	gtk_frame_set_shadow_type((GtkFrame *)arg0, (GtkShadowType)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1frame_1set_1shadow_1type_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1frame_1set_1shadow_1type_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1drag_1get_1offset
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1gesture_1drag_1get_1offset)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1get_1offset)
 	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1get_1offset_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1get_1offset_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
 	gtk_gesture_drag_get_offset(arg0, lparg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_drag_get_offset)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_drag_get_offset)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2);
 		}
@@ -9990,25 +3146,25 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1gesture_1drag_1get_1offset)
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1get_1offset_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1get_1offset_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1drag_1get_1start_1point
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1gesture_1drag_1get_1start_1point)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1get_1start_1point)
 	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1get_1start_1point_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1get_1start_1point_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)gtk_gesture_drag_get_start_point(arg0, lparg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_drag_get_start_point)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_drag_get_start_point)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2);
 		}
@@ -10016,86 +3172,86 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1gesture_1drag_1get_1start_1point)
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1get_1start_1point_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1get_1start_1point_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1drag_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1drag_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1drag_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1drag_1new_FUNC);
 /*
 	rc = (jintLong)gtk_gesture_drag_new((GtkWidget *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_drag_new)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_drag_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1drag_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1get_1last_1event
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1get_1last_1event)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1last_1event)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1last_1event_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1last_1event_FUNC);
 /*
 	rc = (jintLong)gtk_gesture_get_last_event(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_get_last_event)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_get_last_event)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1last_1event_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1last_1event_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1get_1last_1updated_1sequence
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1get_1last_1updated_1sequence)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1last_1updated_1sequence)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1last_1updated_1sequence_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1last_1updated_1sequence_FUNC);
 /*
 	rc = (jintLong)gtk_gesture_get_last_updated_sequence(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_get_last_updated_sequence)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_get_last_updated_sequence)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1last_1updated_1sequence_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1last_1updated_1sequence_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1get_1point
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1gesture_1get_1point)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1point)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdoubleArray arg2, jdoubleArray arg3)
 {
 	jdouble *lparg2=NULL;
 	jdouble *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1point_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1point_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)gtk_gesture_get_point(arg0, arg1, lparg2, lparg3);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_get_point)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_get_point)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, jdouble *, jdouble *))fp)(arg0, arg1, lparg2, lparg3);
 		}
@@ -10103,198 +3259,198 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1gesture_1get_1point)
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseDoubleArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1point_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1point_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1get_1sequences
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1get_1sequences)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1get_1sequences)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1sequences_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1get_1sequences_FUNC);
 /*
 	rc = (jintLong)gtk_gesture_get_sequences(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_get_sequences)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_get_sequences)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1sequences_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1get_1sequences_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1group
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1gesture_1group)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1group)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1group_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1group_FUNC);
 /*
 	gtk_gesture_group(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_group)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_group)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1group_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1group_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1is_1recognized
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1gesture_1is_1recognized)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1is_1recognized)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1is_1recognized_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1is_1recognized_FUNC);
 /*
 	rc = (jboolean)gtk_gesture_is_recognized(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_is_recognized)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_is_recognized)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1is_1recognized_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1is_1recognized_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1pan_1get_1orientation
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1pan_1get_1orientation)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1get_1orientation)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1get_1orientation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1get_1orientation_FUNC);
 /*
 	rc = (jintLong)gtk_gesture_pan_get_orientation(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_pan_get_orientation)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_get_orientation)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1get_1orientation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1get_1orientation_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1pan_1new
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1gesture_1pan_1new)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1new)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1new_FUNC);
 /*
 	gtk_gesture_pan_new(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_pan_new)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_new)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1new_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1pan_1set_1orientation
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1gesture_1pan_1set_1orientation)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1pan_1set_1orientation)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1set_1orientation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1pan_1set_1orientation_FUNC);
 /*
 	gtk_gesture_pan_set_orientation(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_pan_set_orientation)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_set_orientation)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1set_1orientation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1pan_1set_1orientation_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1rotate_1get_1angle_1delta
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1gesture_1rotate_1get_1angle_1delta)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1gesture_1rotate_1get_1angle_1delta)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1rotate_1get_1angle_1delta_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1rotate_1get_1angle_1delta_FUNC);
 /*
 	rc = (jdouble)gtk_gesture_rotate_get_angle_delta(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_rotate_get_angle_delta)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_rotate_get_angle_delta)
 		if (fp) {
 			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1rotate_1get_1angle_1delta_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1rotate_1get_1angle_1delta_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1rotate_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1rotate_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1rotate_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1rotate_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1rotate_1new_FUNC);
 /*
 	rc = (jintLong)gtk_gesture_rotate_new(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_rotate_new)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_rotate_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1rotate_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1rotate_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1single_1set_1button
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1gesture_1single_1set_1button)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1gesture_1single_1set_1button)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1single_1set_1button_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1single_1set_1button_FUNC);
 /*
 	gtk_gesture_single_set_button(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_single_set_button)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_single_set_button)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1single_1set_1button_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1single_1set_1button_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1swipe_1get_1velocity
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1gesture_1swipe_1get_1velocity)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1gesture_1swipe_1get_1velocity)
 	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
 {
 	jdouble *lparg1=NULL;
 	jdouble *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1swipe_1get_1velocity_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1swipe_1get_1velocity_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)gtk_gesture_swipe_get_velocity(arg0, lparg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_swipe_get_velocity)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_swipe_get_velocity)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jdouble *, jdouble *))fp)(arg0, lparg1, lparg2);
 		}
@@ -10302,243 +3458,243 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1gesture_1swipe_1get_1velocity)
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1swipe_1get_1velocity_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1swipe_1get_1velocity_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1swipe_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1swipe_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1swipe_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1swipe_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1swipe_1new_FUNC);
 /*
 	rc = (jintLong)gtk_gesture_swipe_new(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_swipe_new)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_swipe_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1swipe_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1swipe_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1zoom_1get_1scale_1delta
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1gesture_1zoom_1get_1scale_1delta)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1gesture_1zoom_1get_1scale_1delta)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1zoom_1get_1scale_1delta_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1zoom_1get_1scale_1delta_FUNC);
 /*
 	rc = (jdouble)gtk_gesture_zoom_get_scale_delta(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_zoom_get_scale_delta)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_zoom_get_scale_delta)
 		if (fp) {
 			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1zoom_1get_1scale_1delta_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1zoom_1get_1scale_1delta_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1gesture_1zoom_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1gesture_1zoom_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1gesture_1zoom_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1gesture_1zoom_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1gesture_1zoom_1new_FUNC);
 /*
 	rc = (jintLong)gtk_gesture_zoom_new(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_gesture_zoom_new)
+		GTK_LOAD_FUNCTION(fp, gtk_gesture_zoom_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1gesture_1zoom_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1gesture_1zoom_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1get_1current_1event
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1current_1event)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1get_1current_1event)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_FUNC);
 	rc = (jintLong)gtk_get_current_event();
-	OS_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1get_1current_1event_1state
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1get_1current_1event_1state)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1get_1current_1event_1state)
 	(JNIEnv *env, jclass that, jintArray arg0)
 {
 	jint *lparg0=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_1state_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_1state_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_get_current_event_state((GdkModifierType*)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_1state_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_1state_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1get_1default_1language
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1default_1language)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1get_1default_1language)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1get_1default_1language_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1get_1default_1language_FUNC);
 	rc = (jintLong)gtk_get_default_language();
-	OS_NATIVE_EXIT(env, that, _1gtk_1get_1default_1language_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1get_1default_1language_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1get_1event_1widget
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1get_1event_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1get_1event_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1get_1event_1widget_FUNC);
 	rc = (jintLong)gtk_get_event_widget((GdkEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1get_1event_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1get_1event_1widget_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1grab_1add
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1add)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1grab_1add)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1grab_1add_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1grab_1add_FUNC);
 	gtk_grab_add((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1grab_1add_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1grab_1add_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1grab_1get_1current
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1grab_1get_1current)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1grab_1get_1current_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1grab_1get_1current_FUNC);
 	rc = (jintLong)gtk_grab_get_current();
-	OS_NATIVE_EXIT(env, that, _1gtk_1grab_1get_1current_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1grab_1get_1current_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1grab_1remove
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1remove)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1grab_1remove)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1grab_1remove_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1grab_1remove_FUNC);
 	gtk_grab_remove((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1grab_1remove_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1grab_1remove_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1hbox_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hbox_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1hbox_1new)
 	(JNIEnv *env, jclass that, jboolean arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1hbox_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1hbox_1new_FUNC);
 /*
 	rc = (jintLong)gtk_hbox_new((gboolean)arg0, (gint)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_hbox_new)
+		GTK_LOAD_FUNCTION(fp, gtk_hbox_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gboolean, gint))fp)((gboolean)arg0, (gint)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1hbox_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1hbox_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1hscale_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hscale_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1hscale_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1hscale_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1hscale_1new_FUNC);
 /*
 	rc = (jintLong)gtk_hscale_new((GtkAdjustment *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_hscale_new)
+		GTK_LOAD_FUNCTION(fp, gtk_hscale_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1hscale_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1hscale_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1hscrollbar_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hscrollbar_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1hscrollbar_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1hscrollbar_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1hscrollbar_1new_FUNC);
 /*
 	rc = (jintLong)gtk_hscrollbar_new((GtkAdjustment *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_hscrollbar_new)
+		GTK_LOAD_FUNCTION(fp, gtk_hscrollbar_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1hscrollbar_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1hscrollbar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1hseparator_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hseparator_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1hseparator_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1hseparator_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1hseparator_1new_FUNC);
 /*
 	rc = (jintLong)gtk_hseparator_new();
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_hseparator_new)
+		GTK_LOAD_FUNCTION(fp, gtk_hseparator_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1hseparator_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1hseparator_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1hsv_1to_1rgb
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1hsv_1to_1rgb)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1hsv_1to_1rgb)
 	(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdoubleArray arg3, jdoubleArray arg4, jdoubleArray arg5)
 {
 	jdouble *lparg3=NULL;
 	jdouble *lparg4=NULL;
 	jdouble *lparg5=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1hsv_1to_1rgb_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1hsv_1to_1rgb_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetDoubleArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetDoubleArrayElements(env, arg5, NULL)) == NULL) goto fail;
@@ -10547,124 +3703,124 @@ fail:
 	if (arg5 && lparg5) (*env)->ReleaseDoubleArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseDoubleArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseDoubleArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1hsv_1to_1rgb_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1hsv_1to_1rgb_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1icon_1info_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1info_1free)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1icon_1info_1free)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1info_1free_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1info_1free_FUNC);
 /*
 	gtk_icon_info_free(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_icon_info_free)
+		GTK_LOAD_FUNCTION(fp, gtk_icon_info_free)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1info_1free_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1info_1free_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1icon_1info_1load_1icon
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1info_1load_1icon)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1info_1load_1icon)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
 	jintLong *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1info_1load_1icon_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1info_1load_1icon_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_icon_info_load_icon((GtkIconInfo *)arg0, (GError **)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1info_1load_1icon_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1info_1load_1icon_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1icon_1theme_1get_1default
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1theme_1get_1default)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1get_1default)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1get_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1get_1default_FUNC);
 	rc = (jintLong)gtk_icon_theme_get_default();
-	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1get_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1get_1default_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1icon_1theme_1load_1icon
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1theme_1load_1icon)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1load_1icon)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3, jintLong arg4)
 {
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1load_1icon_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1load_1icon_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_icon_theme_load_icon((GtkIconTheme *)arg0, (const gchar *)lparg1, (gint)arg2, (GtkIconLookupFlags)arg3, (GError **)arg4);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1load_1icon_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1load_1icon_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1icon_1theme_1lookup_1by_1gicon
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1theme_1lookup_1by_1gicon)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1icon_1theme_1lookup_1by_1gicon)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1lookup_1by_1gicon_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1icon_1theme_1lookup_1by_1gicon_FUNC);
 	rc = (jintLong)gtk_icon_theme_lookup_by_gicon((GtkIconTheme *)arg0, (GIcon *)arg1, (gint)arg2, (GtkIconLookupFlags)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1lookup_1by_1gicon_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1icon_1theme_1lookup_1by_1gicon_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1filter_1keypress
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1im_1context_1filter_1keypress)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1im_1context_1filter_1keypress)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1filter_1keypress_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1filter_1keypress_FUNC);
 	rc = (jboolean)gtk_im_context_filter_keypress((GtkIMContext *)arg0, (GdkEventKey *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1filter_1keypress_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1filter_1keypress_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1focus_1in
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1in)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1focus_1in)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1in_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1in_FUNC);
 	gtk_im_context_focus_in((GtkIMContext *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1focus_1in_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1focus_1in_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1focus_1out
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1out)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1focus_1out)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1out_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1out_FUNC);
 	gtk_im_context_focus_out((GtkIMContext *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1focus_1out_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1focus_1out_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1get_1preedit_1string
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1preedit_1string)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1get_1preedit_1string)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jintArray arg3)
 {
 	jintLong *lparg1=NULL;
 	jintLong *lparg2=NULL;
 	jint *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
@@ -10673,1205 +3829,1205 @@ fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1get_1type
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1im_1context_1get_1type)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1type_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1type_FUNC);
 	rc = (jintLong)gtk_im_context_get_type();
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1type_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1type_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1reset
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1reset)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1reset)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1reset_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1reset_FUNC);
 	gtk_im_context_reset((GtkIMContext *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1reset_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1reset_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1set_1client_1window
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1client_1window)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1set_1client_1window)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1client_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1client_1window_FUNC);
 	gtk_im_context_set_client_window((GtkIMContext *)arg0, (GdkWindow *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1set_1client_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1set_1client_1window_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1im_1context_1set_1cursor_1location
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1cursor_1location)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1set_1cursor_1location)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1cursor_1location_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1cursor_1location_FUNC);
 	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
 	gtk_im_context_set_cursor_location((GtkIMContext *)arg0, (GdkRectangle *)lparg1);
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1set_1cursor_1location_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1set_1cursor_1location_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1im_1multicontext_1append_1menuitems
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC);
 /*
 	gtk_im_multicontext_append_menuitems((GtkIMMulticontext *)arg0, (GtkMenuShell *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_im_multicontext_append_menuitems)
+		GTK_LOAD_FUNCTION(fp, gtk_im_multicontext_append_menuitems)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkIMMulticontext *, GtkMenuShell *))fp)((GtkIMMulticontext *)arg0, (GtkMenuShell *)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1im_1multicontext_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1im_1multicontext_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1new_FUNC);
 	rc = (jintLong)gtk_im_multicontext_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1image_1menu_1item_1new_1with_1label
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1image_1menu_1item_1new_1with_1label)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
 	rc = (jintLong)gtk_image_menu_item_new_with_label((const gchar *)lparg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_image_menu_item_new_with_label)
+		GTK_LOAD_FUNCTION(fp, gtk_image_menu_item_new_with_label)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0);
 		}
 	}
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1image_1menu_1item_1set_1image
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1set_1image)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1menu_1item_1set_1image)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1set_1image_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1set_1image_FUNC);
 /*
 	gtk_image_menu_item_set_image((GtkImageMenuItem *)arg0, (GtkWidget *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_image_menu_item_set_image)
+		GTK_LOAD_FUNCTION(fp, gtk_image_menu_item_set_image)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkImageMenuItem *, GtkWidget *))fp)((GtkImageMenuItem *)arg0, (GtkWidget *)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1menu_1item_1set_1image_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1menu_1item_1set_1image_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1image_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1image_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1new_FUNC);
 	rc = (jintLong)gtk_image_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1image_1new_1from_1icon_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1icon_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1image_1new_1from_1icon_1name)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1icon_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1icon_1name_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_image_new_from_icon_name((const gchar *)lparg0, (GtkIconSize)arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1icon_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1icon_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1image_1new_1from_1pixbuf
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
 	rc = (jintLong)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1image_1set_1from_1gicon
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1gicon)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1gicon)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon_FUNC);
 	gtk_image_set_from_gicon((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1image_1set_1from_1icon_1name
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1icon_1name)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1icon_1name)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1icon_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1icon_1name_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_image_set_from_icon_name((GtkImage *)arg0, (const gchar *)lparg1, (GtkIconSize)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1icon_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1icon_1name_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1image_1set_1from_1pixbuf
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixbuf_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixbuf_FUNC);
 	gtk_image_set_from_pixbuf((GtkImage *)arg0, (GdkPixbuf *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1pixbuf_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1pixbuf_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1image_1set_1pixel_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1pixel_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1image_1set_1pixel_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1pixel_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1image_1set_1pixel_1size_FUNC);
 	gtk_image_set_pixel_size((GtkImage *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1image_1set_1pixel_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1image_1set_1pixel_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1init_1check
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1init_1check)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1init_1check)
 	(JNIEnv *env, jclass that, jintLongArray arg0, jintLongArray arg1)
 {
 	jintLong *lparg0=NULL;
 	jintLong *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1init_1check_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1init_1check_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_init_check((int *)lparg0, (char ***)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1init_1check_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1init_1check_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1label_1get_1layout
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1label_1get_1layout)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1layout_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1get_1layout_FUNC);
 	rc = (jintLong)gtk_label_get_layout((GtkLabel *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1get_1layout_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1get_1layout_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1label_1get_1mnemonic_1keyval
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1mnemonic_1keyval_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1get_1mnemonic_1keyval_FUNC);
 	rc = (jint)gtk_label_get_mnemonic_keyval((GtkLabel *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1get_1mnemonic_1keyval_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1get_1mnemonic_1keyval_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1label_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1label_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_label_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1label_1new_1with_1mnemonic
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1new_1with_1mnemonic)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1label_1new_1with_1mnemonic)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_label_new_with_mnemonic((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1label_1set_1attributes
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1attributes)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1attributes)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1attributes_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1attributes_FUNC);
 	gtk_label_set_attributes((GtkLabel *)arg0, (PangoAttrList *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1attributes_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1attributes_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1label_1set_1justify
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1justify)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1justify)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1justify_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1justify_FUNC);
 	gtk_label_set_justify((GtkLabel *)arg0, (GtkJustification)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1justify_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1justify_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1label_1set_1line_1wrap
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1line_1wrap)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_FUNC);
 	gtk_label_set_line_wrap((GtkLabel *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1line_1wrap_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1line_1wrap_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1label_1set_1line_1wrap_1mode
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
 	gtk_label_set_line_wrap_mode((GtkLabel *)arg0, (PangoWrapMode)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
 }
 #endif
 
 #if (!defined(NO__1gtk_1label_1set_1text__II) && !defined(JNI64)) || (!defined(NO__1gtk_1label_1set_1text__JJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 #endif
 {
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__II_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
 #endif
 	gtk_label_set_text((GtkLabel *)arg0, (const gchar *)arg1);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__II_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1label_1set_1text__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1label_1set_1text__J_3B) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 #endif
 {
 	jbyte *lparg1=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_label_set_text((GtkLabel *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
 #endif
 }
 #endif
 
 #ifndef NO__1gtk_1label_1set_1text_1with_1mnemonic
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text_1with_1mnemonic)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1text_1with_1mnemonic)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text_1with_1mnemonic_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text_1with_1mnemonic_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_label_set_text_with_mnemonic((GtkLabel *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text_1with_1mnemonic_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text_1with_1mnemonic_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1label_1set_1xalign
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1xalign)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1xalign)
 	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1xalign_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1xalign_FUNC);
 /*
 	gtk_label_set_xalign((GtkLabel *)arg0, (gfloat)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_label_set_xalign)
+		GTK_LOAD_FUNCTION(fp, gtk_label_set_xalign)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkLabel *, gfloat))fp)((GtkLabel *)arg0, (gfloat)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1xalign_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1xalign_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1label_1set_1yalign
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1yalign)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1label_1set_1yalign)
 	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1yalign_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1label_1set_1yalign_FUNC);
 /*
 	gtk_label_set_yalign((GtkLabel *)arg0, (gfloat)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_label_set_yalign)
+		GTK_LOAD_FUNCTION(fp, gtk_label_set_yalign)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkLabel *, gfloat))fp)((GtkLabel *)arg0, (gfloat)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1yalign_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1label_1set_1yalign_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1list_1store_1append
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1append)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1append)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1append_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1append_FUNC);
 	gtk_list_store_append((GtkListStore *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1append_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1append_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1list_1store_1clear
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1clear)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1clear)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1clear_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1clear_FUNC);
 	gtk_list_store_clear((GtkListStore *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1clear_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1clear_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1list_1store_1insert
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1insert)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1insert)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1insert_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1insert_FUNC);
 	gtk_list_store_insert((GtkListStore *)arg0, (GtkTreeIter *)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1insert_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1insert_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1list_1store_1newv
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1list_1store_1newv)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1list_1store_1newv)
 	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
 {
 	jintLong *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1newv_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1newv_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_list_store_newv((gint)arg0, (GType *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1newv_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1newv_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1list_1store_1remove
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1remove)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1remove)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1remove_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1remove_FUNC);
 	gtk_list_store_remove((GtkListStore *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1remove_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1remove_FUNC);
 }
 #endif
 
 #if (!defined(NO__1gtk_1list_1store_1set__IIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIII) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
 #endif
 {
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIII_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIII_FUNC);
 #endif
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIII_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIII_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1list_1store_1set__IIIJI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIJI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4)
 #endif
 {
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIJI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIJI_FUNC);
 #endif
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIJI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIJI_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
 #endif
 {
 	GdkColor _arg3, *lparg3=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
 #endif
 {
 	GdkRGBA _arg3, *lparg3=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getGdkRGBAFields(env, arg3, &_arg3)) == NULL) goto fail;
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1list_1store_1set__IIIZI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIZI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4)
 #endif
 {
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIZI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIZI_FUNC);
 #endif
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIZI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIZI_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1list_1store_1set__III_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJI_3BI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1set__JJI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
 #endif
 {
 	jbyte *lparg3=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJI_3BI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJI_3BI_FUNC);
 #endif
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJI_3BI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJI_3BI_FUNC);
 #endif
 }
 #endif
 
 #ifndef NO__1gtk_1main
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1main)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1main)
 	(JNIEnv *env, jclass that)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1main_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1main_FUNC);
 	gtk_main();
-	OS_NATIVE_EXIT(env, that, _1gtk_1main_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1main_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1main_1do_1event
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1main_1do_1event)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1main_1do_1event)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1main_1do_1event_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1main_1do_1event_FUNC);
 	gtk_main_do_event((GdkEvent *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1main_1do_1event_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1main_1do_1event_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1major_1version
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1major_1version)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1major_1version)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1major_1version_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1major_1version_FUNC);
 	rc = (jint)gtk_major_version;
-	OS_NATIVE_EXIT(env, that, _1gtk_1major_1version_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1major_1version_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1bar_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1bar_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1bar_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1bar_1new_FUNC);
 	rc = (jintLong)gtk_menu_bar_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1item_1get_1submenu
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1item_1get_1submenu)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
 	rc = (jintLong)gtk_menu_item_get_submenu((GtkMenuItem *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1item_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1item_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1item_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1new_FUNC);
 	rc = (jintLong)gtk_menu_item_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1item_1new_1with_1label
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1item_1new_1with_1label)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1new_1with_1label_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1new_1with_1label_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_menu_item_new_with_label((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1new_1with_1label_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1new_1with_1label_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1item_1set_1submenu
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1set_1submenu)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1item_1set_1submenu)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1set_1submenu_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1set_1submenu_FUNC);
 	gtk_menu_item_set_submenu((GtkMenuItem *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1set_1submenu_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1set_1submenu_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1new_FUNC);
 	rc = (jintLong)gtk_menu_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1popdown
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popdown)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popdown)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popdown_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1popdown_FUNC);
 	gtk_menu_popdown((GtkMenu *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1popdown_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1popdown_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1popup
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popup)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_FUNC);
 /*
 	gtk_menu_popup((GtkMenu *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (GtkMenuPositionFunc)arg3, (gpointer)arg4, (guint)arg5, (guint32)arg6);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_menu_popup)
+		GTK_LOAD_FUNCTION(fp, gtk_menu_popup)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkMenu *, GtkWidget *, GtkWidget *, GtkMenuPositionFunc, gpointer, guint, guint32))fp)((GtkMenu *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (GtkMenuPositionFunc)arg3, (gpointer)arg4, (guint)arg5, (guint32)arg6);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1popup_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1popup_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1popup_1at_1pointer
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popup_1at_1pointer)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1popup_1at_1pointer)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_1at_1pointer_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_1at_1pointer_FUNC);
 /*
 	gtk_menu_popup_at_pointer(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_menu_popup_at_pointer)
+		GTK_LOAD_FUNCTION(fp, gtk_menu_popup_at_pointer)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1popup_1at_1pointer_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1popup_1at_1pointer_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1shell_1deactivate
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1deactivate)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1deactivate)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1deactivate_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1deactivate_FUNC);
 	gtk_menu_shell_deactivate((GtkMenuShell *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1deactivate_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1deactivate_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1shell_1insert
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1insert)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1insert)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1insert_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1insert_FUNC);
 	gtk_menu_shell_insert((GtkMenuShell *)arg0, (GtkWidget *)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1insert_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1insert_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1shell_1set_1take_1focus
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
 	gtk_menu_shell_set_take_focus((GtkMenuShell *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1menu_1tool_1button_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1tool_1button_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1menu_1tool_1button_1new)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1menu_1tool_1button_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1menu_1tool_1button_1new_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_menu_tool_button_new((GtkWidget *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1tool_1button_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1menu_1tool_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1message_1dialog_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1message_1dialog_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1message_1dialog_1new)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5)
 {
 	jbyte *lparg4=NULL;
 	jbyte *lparg5=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1message_1dialog_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1message_1dialog_1new_FUNC);
 	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4, (const gchar *)lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1message_1dialog_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1message_1dialog_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1micro_1version
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1micro_1version)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1micro_1version)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1micro_1version_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1micro_1version_FUNC);
 	rc = (jint)gtk_micro_version;
-	OS_NATIVE_EXIT(env, that, _1gtk_1micro_1version_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1micro_1version_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1minor_1version
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1minor_1version)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1minor_1version)
 	(JNIEnv *env, jclass that)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1minor_1version_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1minor_1version_FUNC);
 	rc = (jint)gtk_minor_version;
-	OS_NATIVE_EXIT(env, that, _1gtk_1minor_1version_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1minor_1version_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1misc_1set_1alignment
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1misc_1set_1alignment)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1misc_1set_1alignment)
 	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1misc_1set_1alignment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1misc_1set_1alignment_FUNC);
 /*
 	gtk_misc_set_alignment((GtkMisc *)arg0, (gfloat)arg1, (gfloat)arg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_misc_set_alignment)
+		GTK_LOAD_FUNCTION(fp, gtk_misc_set_alignment)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkMisc *, gfloat, gfloat))fp)((GtkMisc *)arg0, (gfloat)arg1, (gfloat)arg2);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1misc_1set_1alignment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1misc_1set_1alignment_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1get_1current_1page
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1get_1current_1page)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1notebook_1get_1current_1page)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1current_1page_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1current_1page_FUNC);
 	rc = (jint)gtk_notebook_get_current_page((GtkNotebook *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1get_1current_1page_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1get_1current_1page_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1get_1scrollable
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1notebook_1get_1scrollable)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1notebook_1get_1scrollable)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1scrollable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1scrollable_FUNC);
 	rc = (jboolean)gtk_notebook_get_scrollable((GtkNotebook *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1get_1scrollable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1get_1scrollable_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1insert_1page
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1insert_1page)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1insert_1page)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1insert_1page_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1insert_1page_FUNC);
 	gtk_notebook_insert_page((GtkNotebook *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (gint)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1insert_1page_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1insert_1page_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1notebook_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1notebook_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1new_FUNC);
 	rc = (jintLong)gtk_notebook_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1next_1page
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1next_1page)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1next_1page)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1next_1page_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1next_1page_FUNC);
 	gtk_notebook_next_page((GtkNotebook *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1next_1page_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1next_1page_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1prev_1page
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1prev_1page)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1prev_1page)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1prev_1page_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1prev_1page_FUNC);
 	gtk_notebook_prev_page((GtkNotebook *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1prev_1page_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1prev_1page_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1remove_1page
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1remove_1page)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1remove_1page)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1remove_1page_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1remove_1page_FUNC);
 	gtk_notebook_remove_page((GtkNotebook *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1remove_1page_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1remove_1page_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1set_1current_1page
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1current_1page)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1current_1page)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1current_1page_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1current_1page_FUNC);
 	gtk_notebook_set_current_page((GtkNotebook *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1set_1current_1page_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1set_1current_1page_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1set_1scrollable
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1scrollable)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1scrollable)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1scrollable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1scrollable_FUNC);
 	gtk_notebook_set_scrollable((GtkNotebook *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1set_1scrollable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1set_1scrollable_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1set_1show_1tabs
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1show_1tabs)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1show_1tabs)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1show_1tabs_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1show_1tabs_FUNC);
 	gtk_notebook_set_show_tabs((GtkNotebook *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1set_1show_1tabs_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1set_1show_1tabs_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1notebook_1set_1tab_1pos
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1tab_1pos)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1notebook_1set_1tab_1pos)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1tab_1pos_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1tab_1pos_FUNC);
 	gtk_notebook_set_tab_pos((GtkNotebook *)arg0, (GtkPositionType)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1set_1tab_1pos_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1notebook_1set_1tab_1pos_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1orientable_1set_1orientation
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1orientable_1set_1orientation)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1orientable_1set_1orientation)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1orientable_1set_1orientation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1orientable_1set_1orientation_FUNC);
 	gtk_orientable_set_orientation((GtkOrientable *)arg0, (GtkOrientation)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1orientable_1set_1orientation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1orientable_1set_1orientation_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1bottom_1margin
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
 	rc = (jdouble)gtk_page_setup_get_bottom_margin((GtkPageSetup *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1left_1margin
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
 	rc = (jdouble)gtk_page_setup_get_left_margin((GtkPageSetup *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1orientation
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1orientation)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
 	rc = (jint)gtk_page_setup_get_orientation((GtkPageSetup *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1page_1height
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
 	rc = (jdouble)gtk_page_setup_get_page_height((GtkPageSetup *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1page_1width
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
 	rc = (jdouble)gtk_page_setup_get_page_width((GtkPageSetup *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1paper_1height
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
 	rc = (jdouble)gtk_page_setup_get_paper_height((GtkPageSetup *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1paper_1size
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
 	rc = (jintLong)gtk_page_setup_get_paper_size((GtkPageSetup *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1paper_1width
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
 	rc = (jdouble)gtk_page_setup_get_paper_width((GtkPageSetup *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1right_1margin
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
 	rc = (jdouble)gtk_page_setup_get_right_margin((GtkPageSetup *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1get_1top_1margin
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
 	rc = (jdouble)gtk_page_setup_get_top_margin((GtkPageSetup *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1page_1setup_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1new_FUNC);
 	rc = (jintLong)gtk_page_setup_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1set_1bottom_1margin
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
 	gtk_page_setup_set_bottom_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1set_1left_1margin
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1left_1margin)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1left_1margin)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
 	gtk_page_setup_set_left_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1set_1orientation
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1orientation)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1orientation)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
 	gtk_page_setup_set_orientation((GtkPageSetup *)arg0, (GtkPageOrientation)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1set_1paper_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1paper_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1paper_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
 	gtk_page_setup_set_paper_size((GtkPageSetup *)arg0, (GtkPaperSize *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1set_1right_1margin
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1right_1margin)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1right_1margin)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
 	gtk_page_setup_set_right_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1page_1setup_1set_1top_1margin
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1top_1margin)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1page_1setup_1set_1top_1margin)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
 	gtk_page_setup_set_top_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1paint_1box
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1box)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1paint_1box)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paint_1box_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paint_1box_FUNC);
 	if (arg4) if ((lparg4 = getGdkRectangleFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
 /*
 	gtk_paint_box(arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_paint_box)
+		GTK_LOAD_FUNCTION(fp, gtk_paint_box)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, GdkWindow *, jint, jint, GdkRectangle *, GtkWidget *, const gchar *, jint, jint, jint, jint))fp)(arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10);
 		}
@@ -11879,24 +5035,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1box)
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0);
 	if (arg4 && lparg4) setGdkRectangleFields(env, arg4, lparg4);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paint_1box_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paint_1box_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1paint_1flat_1box
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1flat_1box)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1paint_1flat_1box)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paint_1flat_1box_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paint_1flat_1box_FUNC);
 	if (arg4) if ((lparg4 = getGdkRectangleFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
 /*
 	gtk_paint_flat_box(arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_paint_flat_box)
+		GTK_LOAD_FUNCTION(fp, gtk_paint_flat_box)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, GdkWindow *, jint, jint, GdkRectangle *, GtkWidget *, const gchar *, jint, jint, jint, jint))fp)(arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10);
 		}
@@ -11904,989 +5060,989 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1flat_1box)
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0);
 	if (arg4 && lparg4) setGdkRectangleFields(env, arg4, lparg4);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paint_1flat_1box_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paint_1flat_1box_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1paint_1handle
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1handle)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1paint_1handle)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
 {
 	GdkRectangle _arg4, *lparg4=NULL;
 	jbyte *lparg6=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paint_1handle_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paint_1handle_FUNC);
 	if (arg4) if ((lparg4 = getGdkRectangleFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
 /*
 	gtk_paint_handle(arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10, arg11);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_paint_handle)
+		GTK_LOAD_FUNCTION(fp, gtk_paint_handle)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, GdkWindow *, jint, jint, GdkRectangle *, GtkWidget *, const gchar *, jint, jint, jint, jint, jint))fp)(arg0, (GdkWindow *)arg1, arg2, arg3, lparg4, (GtkWidget *)arg5, (const gchar *)lparg6, arg7, arg8, arg9, arg10, arg11);
 		}
 	}
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paint_1handle_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paint_1handle_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1paper_1size_1free)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1free_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1free_FUNC);
 	gtk_paper_size_free((GtkPaperSize *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1free_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1free_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1get_1display_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
 	rc = (jintLong)gtk_paper_size_get_display_name((GtkPaperSize *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1get_1height
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1height)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
 	rc = (jdouble)gtk_paper_size_get_height((GtkPaperSize *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1get_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
 	rc = (jintLong)gtk_paper_size_get_name((GtkPaperSize *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1get_1ppd_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
 	rc = (jintLong)gtk_paper_size_get_ppd_name((GtkPaperSize *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1get_1width
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1paper_1size_1get_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
 	rc = (jdouble)gtk_paper_size_get_width((GtkPaperSize *)arg0, (GtkUnit)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1is_1custom
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1paper_1size_1is_1custom)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
 	rc = (jboolean)gtk_paper_size_is_custom((GtkPaperSize *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_paper_size_new((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1new_1custom
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new_1custom)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3, jint arg4)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1custom_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1custom_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_paper_size_new_custom((const gchar *)lparg0, (const gchar *)lparg1, (gdouble)arg2, (gdouble)arg3, (GtkUnit)arg4);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1new_1custom_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1new_1custom_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1paper_1size_1new_1from_1ppd
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1from_1ppd_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1from_1ppd_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_paper_size_new_from_ppd((const gchar *)lparg0, (const gchar *)lparg1, (gdouble)arg2, (gdouble)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1new_1from_1ppd_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1new_1from_1ppd_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1plug_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1plug_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1plug_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1plug_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1plug_1new_FUNC);
 	rc = (jintLong)gtk_plug_new(arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1plug_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1plug_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1job_1get_1surface
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1job_1get_1surface)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
 	jintLong *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_print_job_get_surface((GtkPrintJob *)arg0, (GError **)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1job_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1job_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1job_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_print_job_new((const gchar *)lparg0, (GtkPrinter *)arg1, (GtkPrintSettings *)arg2, (GtkPageSetup *)arg3);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1job_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1job_1send
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1job_1send)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1job_1send)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1send_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1job_1send_FUNC);
 	gtk_print_job_send((GtkPrintJob *)arg0, (GtkPrintJobCompleteFunc)arg1, (gpointer)arg2, (GDestroyNotify)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1send_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1job_1send_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1foreach
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1foreach)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1foreach)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1foreach_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1foreach_FUNC);
 	gtk_print_settings_foreach((GtkPrintSettings *)arg0, (GtkPrintSettingsFunc)arg1, (gpointer)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1foreach_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1foreach_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_print_settings_get((GtkPrintSettings *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get_1collate
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1collate)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
 	rc = (jboolean)gtk_print_settings_get_collate((GtkPrintSettings *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get_1duplex
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1duplex)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1duplex)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1duplex_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1duplex_FUNC);
 	rc = (jint)gtk_print_settings_get_duplex((GtkPrintSettings *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1duplex_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1duplex_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get_1n_1copies
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
 	rc = (jint)gtk_print_settings_get_n_copies((GtkPrintSettings *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get_1page_1ranges
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
 {
 	jint *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_print_settings_get_page_ranges((GtkPrintSettings *)arg0, (gint *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get_1print_1pages
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
 	rc = (jint)gtk_print_settings_get_print_pages((GtkPrintSettings *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1get_1resolution
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1settings_1get_1resolution)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
 	rc = (jint)gtk_print_settings_get_resolution((GtkPrintSettings *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1settings_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1new_FUNC);
 	rc = (jintLong)gtk_print_settings_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1set
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_print_settings_set((GtkPrintSettings *)arg0, (const gchar *)lparg1, (const gchar *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1set_1collate
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1collate)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1collate)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
 	gtk_print_settings_set_collate((GtkPrintSettings *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1set_1duplex
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1duplex)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1duplex)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1duplex_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1duplex_FUNC);
 	gtk_print_settings_set_duplex((GtkPrintSettings *)arg0, (GtkPrintDuplex)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1duplex_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1duplex_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1set_1n_1copies
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1n_1copies)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1n_1copies)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
 	gtk_print_settings_set_n_copies((GtkPrintSettings *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1set_1orientation
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1orientation)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1orientation)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
 	gtk_print_settings_set_orientation((GtkPrintSettings *)arg0, (GtkPageOrientation)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1set_1page_1ranges
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
 {
 	jint *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1page_1ranges_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1page_1ranges_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_print_settings_set_page_ranges((GtkPrintSettings *)arg0, (GtkPageRange *)lparg1, (gint)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1page_1ranges_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1page_1ranges_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1set_1print_1pages
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1print_1pages)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1print_1pages)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
 	gtk_print_settings_set_print_pages((GtkPrintSettings *)arg0, (GtkPrintPages)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1settings_1set_1printer
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1printer)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1settings_1set_1printer)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1printer_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1printer_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_print_settings_set_printer((GtkPrintSettings *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1printer_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1printer_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1get_1current_1page
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
 	rc = (jint)gtk_print_unix_dialog_get_current_page((GtkPrintUnixDialog *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1get_1page_1setup
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
 	rc = (jintLong)gtk_print_unix_dialog_get_page_setup((GtkPrintUnixDialog *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1get_1selected_1printer
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
 	rc = (jintLong)gtk_print_unix_dialog_get_selected_printer((GtkPrintUnixDialog *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1get_1settings
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
 	rc = (jintLong)gtk_print_unix_dialog_get_settings((GtkPrintUnixDialog *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1current_1page
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
 	gtk_print_unix_dialog_set_current_page((GtkPrintUnixDialog *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup_FUNC);
 	gtk_print_unix_dialog_set_embed_page_setup((GtkPrintUnixDialog *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1embed_1page_1setup_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1manual_1capabilities
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabilities)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabilities)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
 	gtk_print_unix_dialog_set_manual_capabilities((GtkPrintUnixDialog *)arg0, (GtkPrintCapabilities)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1page_1setup
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
 	gtk_print_unix_dialog_set_page_setup((GtkPrintUnixDialog *)arg0, (GtkPageSetup *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1print_1unix_1dialog_1set_1settings
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
 	gtk_print_unix_dialog_set_settings((GtkPrintUnixDialog *)arg0, (GtkPrintSettings *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1printer_1get_1backend
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1printer_1get_1backend)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1backend_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1backend_FUNC);
 	rc = (jintLong)gtk_printer_get_backend((GtkPrinter *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1backend_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1backend_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1printer_1get_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1printer_1get_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1name_FUNC);
 	rc = (jintLong)gtk_printer_get_name((GtkPrinter *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1printer_1is_1default
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1printer_1is_1default)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1is_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1printer_1is_1default_FUNC);
 	rc = (jboolean)gtk_printer_is_default((GtkPrinter *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1is_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1printer_1is_1default_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1printer_1option_1widget_1get_1type
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1option_1widget_1get_1type)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1printer_1option_1widget_1get_1type)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1option_1widget_1get_1type_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1printer_1option_1widget_1get_1type_FUNC);
 /*
 	rc = (jintLong)gtk_printer_option_widget_get_type();
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_printer_option_widget_get_type)
+		GTK_LOAD_FUNCTION(fp, gtk_printer_option_widget_get_type)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1option_1widget_1get_1type_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1printer_1option_1widget_1get_1type_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1progress_1bar_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1new_FUNC);
 	rc = (jintLong)gtk_progress_bar_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1progress_1bar_1pulse
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1pulse)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1pulse)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1pulse_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1pulse_FUNC);
 	gtk_progress_bar_pulse((GtkProgressBar *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1pulse_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1pulse_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1progress_1bar_1set_1fraction
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1fraction)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1set_1fraction)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1fraction_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1fraction_FUNC);
 	gtk_progress_bar_set_fraction((GtkProgressBar *)arg0, (gdouble)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1set_1fraction_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1set_1fraction_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1progress_1bar_1set_1inverted
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1inverted)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1set_1inverted)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1inverted_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1inverted_FUNC);
 /*
 	gtk_progress_bar_set_inverted((GtkProgressBar *)arg0, (gboolean)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_progress_bar_set_inverted)
+		GTK_LOAD_FUNCTION(fp, gtk_progress_bar_set_inverted)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkProgressBar *, gboolean))fp)((GtkProgressBar *)arg0, (gboolean)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1set_1inverted_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1set_1inverted_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1progress_1bar_1set_1orientation
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1orientation)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1progress_1bar_1set_1orientation)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1orientation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1orientation_FUNC);
 /*
 	gtk_progress_bar_set_orientation((GtkProgressBar *)arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_progress_bar_set_orientation)
+		GTK_LOAD_FUNCTION(fp, gtk_progress_bar_set_orientation)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkProgressBar *, jint))fp)((GtkProgressBar *)arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1set_1orientation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1set_1orientation_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1button_1get_1group
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1button_1get_1group)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1button_1get_1group)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
 	rc = (jintLong)gtk_radio_button_get_group((GtkRadioButton *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1button_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1button_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1button_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1new_FUNC);
 	rc = (jintLong)gtk_radio_button_new((GSList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1menu_1item_1get_1group
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1get_1group)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1menu_1item_1get_1group)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
 	rc = (jintLong)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1menu_1item_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1menu_1item_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
 	rc = (jintLong)gtk_radio_menu_item_new((GSList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1radio_1menu_1item_1new_1with_1label
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1radio_1menu_1item_1new_1with_1label)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_radio_menu_item_new_with_label((GSList *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1range_1get_1adjustment
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1range_1get_1adjustment)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1range_1get_1adjustment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1range_1get_1adjustment_FUNC);
 	rc = (jintLong)gtk_range_get_adjustment((GtkRange *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1range_1get_1adjustment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1range_1get_1adjustment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1range_1get_1slider_1range
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1get_1slider_1range)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1get_1slider_1range)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1range_1get_1slider_1range_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1range_1get_1slider_1range_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_range_get_slider_range((GtkRange *)arg0, (gint *)lparg1, (gint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1range_1get_1slider_1range_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1range_1get_1slider_1range_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1range_1set_1increments
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1increments)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1increments)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1increments_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1range_1set_1increments_FUNC);
 	gtk_range_set_increments((GtkRange *)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1range_1set_1increments_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1range_1set_1increments_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1range_1set_1inverted
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1inverted)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1inverted)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1inverted_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1range_1set_1inverted_FUNC);
 	gtk_range_set_inverted((GtkRange *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1range_1set_1inverted_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1range_1set_1inverted_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1range_1set_1range
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1range)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1range)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1range_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1range_1set_1range_FUNC);
 	gtk_range_set_range((GtkRange *)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1range_1set_1range_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1range_1set_1range_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1range_1set_1value
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1value)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1value)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1value_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1range_1set_1value_FUNC);
 	gtk_range_set_value((GtkRange *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1range_1set_1value_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1range_1set_1value_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1rc_1parse_1string
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1parse_1string)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rc_1parse_1string)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1parse_1string_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1parse_1string_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 /*
 	gtk_rc_parse_string((const gchar *)lparg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_rc_parse_string)
+		GTK_LOAD_FUNCTION(fp, gtk_rc_parse_string)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0);
 		}
 	}
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1parse_1string_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1parse_1string_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1rc_1style_1get_1bg_1pixmap_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
 	rc = (jintLong)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1rc_1style_1get_1color_1flags
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1color_1flags)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1rc_1style_1get_1color_1flags)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
 	rc = (jint)gtk_rc_style_get_color_flags((GtkRcStyle *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1rc_1style_1set_1bg
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rc_1style_1set_1bg)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_FUNC);
 	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
 	gtk_rc_style_set_bg((GtkRcStyle *)arg0, arg1, lparg2);
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1bg_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1bg_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1rc_1style_1set_1bg_1pixmap_1name
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg_1pixmap_1name)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rc_1style_1set_1bg_1pixmap_1name)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
 	gtk_rc_style_set_bg_pixmap_name((GtkRcStyle *)arg0, arg1, (char *)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1rc_1style_1set_1color_1flags
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1color_1flags)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rc_1style_1set_1color_1flags)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
 	gtk_rc_style_set_color_flags((GtkRcStyle *)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1rc_1style_1set_1fg
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1fg)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rc_1style_1set_1fg)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1fg_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1fg_FUNC);
 	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
 	gtk_rc_style_set_fg((GtkRcStyle *)arg0, arg1, lparg2);
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1fg_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1fg_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1rc_1style_1set_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rc_1style_1set_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1text_FUNC);
 	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
 	gtk_rc_style_set_text((GtkRcStyle *)arg0, arg1, lparg2);
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1render_1background
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1background)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1background)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1render_1background_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1render_1background_FUNC);
 /*
 	gtk_render_background(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_render_background)
+		GTK_LOAD_FUNCTION(fp, gtk_render_background)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong, gdouble, gdouble, gdouble, gdouble))fp)(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1render_1background_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1render_1background_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1render_1focus
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1focus)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1render_1focus_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1render_1focus_FUNC);
 /*
 	gtk_render_focus(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_render_focus)
+		GTK_LOAD_FUNCTION(fp, gtk_render_focus)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong, gdouble, gdouble, gdouble, gdouble))fp)(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1render_1focus_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1render_1focus_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1render_1frame
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1frame)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1frame)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1render_1frame_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1render_1frame_FUNC);
 /*
 	gtk_render_frame(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_render_frame)
+		GTK_LOAD_FUNCTION(fp, gtk_render_frame)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong, gdouble, gdouble, gdouble, gdouble))fp)(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1render_1frame_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1render_1frame_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1render_1handle
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1handle)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1handle)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1render_1handle_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1render_1handle_FUNC);
 /*
 	gtk_render_handle(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_render_handle)
+		GTK_LOAD_FUNCTION(fp, gtk_render_handle)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong, gdouble, gdouble, gdouble, gdouble))fp)(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1render_1handle_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1render_1handle_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1rgb_1to_1hsv
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rgb_1to_1hsv)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rgb_1to_1hsv)
 	(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdoubleArray arg3, jdoubleArray arg4, jdoubleArray arg5)
 {
 	jdouble *lparg3=NULL;
 	jdouble *lparg4=NULL;
 	jdouble *lparg5=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1rgb_1to_1hsv_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1rgb_1to_1hsv_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetDoubleArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetDoubleArrayElements(env, arg5, NULL)) == NULL) goto fail;
@@ -12895,391 +6051,391 @@ fail:
 	if (arg5 && lparg5) (*env)->ReleaseDoubleArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseDoubleArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseDoubleArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1rgb_1to_1hsv_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1rgb_1to_1hsv_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1scale_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scale_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scale_1new)
 	(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scale_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scale_1new_FUNC);
 /*
 	rc = (jintLong)gtk_scale_new((GtkOrientation)arg0, (GtkAdjustment *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_scale_new)
+		GTK_LOAD_FUNCTION(fp, gtk_scale_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkOrientation, GtkAdjustment *))fp)((GtkOrientation)arg0, (GtkAdjustment *)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1scale_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scale_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scale_1set_1digits
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1digits)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scale_1set_1digits)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1digits_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1digits_FUNC);
 	gtk_scale_set_digits((GtkScale *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scale_1set_1digits_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scale_1set_1digits_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1scale_1set_1draw_1value
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1draw_1value)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scale_1set_1draw_1value)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1draw_1value_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1draw_1value_FUNC);
 	gtk_scale_set_draw_value((GtkScale *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scale_1set_1draw_1value_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scale_1set_1draw_1value_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1scrollable_1get_1vadjustment
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrollable_1get_1vadjustment)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrollable_1get_1vadjustment)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrollable_1get_1vadjustment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrollable_1get_1vadjustment_FUNC);
 /*
 	rc = (jintLong)gtk_scrollable_get_vadjustment((GtkScrollable *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_scrollable_get_vadjustment)
+		GTK_LOAD_FUNCTION(fp, gtk_scrollable_get_vadjustment)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkScrollable *))fp)((GtkScrollable *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrollable_1get_1vadjustment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrollable_1get_1vadjustment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrollbar_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrollbar_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrollbar_1new)
 	(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrollbar_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrollbar_1new_FUNC);
 /*
 	rc = (jintLong)gtk_scrollbar_new((GtkOrientation)arg0, (GtkAdjustment *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_scrollbar_new)
+		GTK_LOAD_FUNCTION(fp, gtk_scrollbar_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkOrientation, GtkAdjustment *))fp)((GtkOrientation)arg0, (GtkAdjustment *)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrollbar_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrollbar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1add_1with_1viewport
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1add_1with_1viewport)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1add_1with_1viewport)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1add_1with_1viewport_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1add_1with_1viewport_FUNC);
 /*
 	gtk_scrolled_window_add_with_viewport((GtkScrolledWindow *)arg0, (GtkWidget *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_scrolled_window_add_with_viewport)
+		GTK_LOAD_FUNCTION(fp, gtk_scrolled_window_add_with_viewport)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkScrolledWindow *, GtkWidget *))fp)((GtkScrolledWindow *)arg0, (GtkWidget *)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1add_1with_1viewport_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1add_1with_1viewport_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1hadjustment
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
 	rc = (jintLong)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1hscrollbar
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hscrollbar)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1hscrollbar)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hscrollbar_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hscrollbar_FUNC);
 	rc = (jintLong)gtk_scrolled_window_get_hscrollbar((GtkScrolledWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hscrollbar_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hscrollbar_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1overlay_1scrolling
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1overlay_1scrolling)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1overlay_1scrolling)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1overlay_1scrolling_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1overlay_1scrolling_FUNC);
 /*
 	rc = (jboolean)gtk_scrolled_window_get_overlay_scrolling((GtkScrolledWindow *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_scrolled_window_get_overlay_scrolling)
+		GTK_LOAD_FUNCTION(fp, gtk_scrolled_window_get_overlay_scrolling)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkScrolledWindow *))fp)((GtkScrolledWindow *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1overlay_1scrolling_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1overlay_1scrolling_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1policy
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1policy)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1policy)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1policy_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1policy_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_scrolled_window_get_policy((GtkScrolledWindow *)arg0, (GtkPolicyType *)lparg1, (GtkPolicyType *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1policy_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1policy_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1shadow_1type
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1shadow_1type_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1shadow_1type_FUNC);
 	rc = (jint)gtk_scrolled_window_get_shadow_type((GtkScrolledWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1shadow_1type_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1shadow_1type_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1vadjustment
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
 	rc = (jintLong)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1get_1vscrollbar
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1vscrollbar)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1get_1vscrollbar)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vscrollbar_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vscrollbar_FUNC);
 	rc = (jintLong)gtk_scrolled_window_get_vscrollbar((GtkScrolledWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vscrollbar_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vscrollbar_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1new)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1new_FUNC);
 	rc = (jintLong)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1set_1policy
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1policy)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1set_1policy)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1policy_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1policy_FUNC);
 	gtk_scrolled_window_set_policy((GtkScrolledWindow *)arg0, (GtkPolicyType)arg1, (GtkPolicyType)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1set_1policy_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1set_1policy_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1scrolled_1window_1set_1shadow_1type
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1shadow_1type_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1shadow_1type_FUNC);
 	gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)arg0, (GtkShadowType)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1set_1shadow_1type_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1set_1shadow_1type_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1selection_1data_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1free)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1selection_1data_1free)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1free_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1free_FUNC);
 	gtk_selection_data_free((GtkSelectionData *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1free_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1free_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1selection_1data_1get_1data
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1selection_1data_1get_1data)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1data)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1data_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1data_FUNC);
 	rc = (jintLong)gtk_selection_data_get_data((GtkSelectionData *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1data_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1data_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1selection_1data_1get_1data_1type
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1selection_1data_1get_1data_1type)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1data_1type)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1data_1type_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1data_1type_FUNC);
 	rc = (jintLong)gtk_selection_data_get_data_type((GtkSelectionData *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1data_1type_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1data_1type_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1selection_1data_1get_1format
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1selection_1data_1get_1format)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1format)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1format_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1format_FUNC);
 	rc = (jint)gtk_selection_data_get_format((GtkSelectionData *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1format_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1format_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1selection_1data_1get_1length
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1selection_1data_1get_1length)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1length)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1length_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1length_FUNC);
 	rc = (jint)gtk_selection_data_get_length((GtkSelectionData *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1length_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1length_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1selection_1data_1get_1target
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1selection_1data_1get_1target)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1selection_1data_1get_1target)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1target_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1get_1target_FUNC);
 	rc = (jintLong)gtk_selection_data_get_target((GtkSelectionData *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1target_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1get_1target_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1selection_1data_1set
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1set)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1selection_1data_1set)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1set_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1set_FUNC);
 	gtk_selection_data_set((GtkSelectionData *)arg0, (GdkAtom)arg1, (gint)arg2, (const guchar *)arg3, (gint)arg4);
-	OS_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1set_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1selection_1data_1set_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1separator_1menu_1item_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1separator_1menu_1item_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1separator_1menu_1item_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
 	rc = (jintLong)gtk_separator_menu_item_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1separator_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1separator_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1separator_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1separator_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1separator_1new_FUNC);
 /*
 	rc = (jintLong)gtk_separator_new((GtkOrientation)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_separator_new)
+		GTK_LOAD_FUNCTION(fp, gtk_separator_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkOrientation))fp)((GtkOrientation)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1separator_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1separator_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1separator_1tool_1item_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1separator_1tool_1item_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1separator_1tool_1item_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1separator_1tool_1item_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1separator_1tool_1item_1new_FUNC);
 	rc = (jintLong)gtk_separator_tool_item_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1separator_1tool_1item_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1separator_1tool_1item_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1separator_1tool_1item_1set_1draw
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1separator_1tool_1item_1set_1draw)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1separator_1tool_1item_1set_1draw)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1separator_1tool_1item_1set_1draw_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1separator_1tool_1item_1set_1draw_FUNC);
 	gtk_separator_tool_item_set_draw((GtkSeparatorToolItem *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1separator_1tool_1item_1set_1draw_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1separator_1tool_1item_1set_1draw_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1settings_1get_1default
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1settings_1get_1default)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1settings_1get_1default)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1settings_1get_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1settings_1get_1default_FUNC);
 	rc = (jintLong)gtk_settings_get_default();
-	OS_NATIVE_EXIT(env, that, _1gtk_1settings_1get_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1settings_1get_1default_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1settings_1set_1string_1property
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1settings_1set_1string_1property)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1settings_1set_1string_1property)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jbyteArray arg3)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
 	jbyte *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1settings_1set_1string_1property_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1settings_1set_1string_1property_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
@@ -13287,7 +6443,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1settings_1set_1string_1property)
 	gtk_settings_set_string_property((GtkSettings *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_settings_set_string_property)
+		GTK_LOAD_FUNCTION(fp, gtk_settings_set_string_property)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkSettings *, const gchar *, const gchar *, const gchar *))fp)((GtkSettings *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3);
 		}
@@ -13296,308 +6452,308 @@ fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1settings_1set_1string_1property_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1settings_1set_1string_1property_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1socket_1get_1id
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1socket_1get_1id)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1socket_1get_1id)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1socket_1get_1id_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1socket_1get_1id_FUNC);
 	rc = (jintLong)gtk_socket_get_id((GtkSocket *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1socket_1get_1id_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1socket_1get_1id_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1socket_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1socket_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1socket_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1socket_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1socket_1new_FUNC);
 	rc = (jintLong)gtk_socket_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1socket_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1socket_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1configure
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1configure)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1configure)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jint arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1configure_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1configure_FUNC);
 	gtk_spin_button_configure((GtkSpinButton*)arg0, (GtkAdjustment *)arg1, arg2, arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1configure_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1configure_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1get_1adjustment
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
 	rc = (jintLong)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1get_1digits
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1digits)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1spin_1button_1get_1digits)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1digits_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1digits_FUNC);
 	rc = (jint)gtk_spin_button_get_digits((GtkSpinButton*)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1get_1digits_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1get_1digits_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1spin_1button_1new)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1new_FUNC);
 	rc = (jintLong)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1set_1digits
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1digits)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1digits)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1digits_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1digits_FUNC);
 	gtk_spin_button_set_digits((GtkSpinButton*)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1digits_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1digits_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1set_1increments
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1increments)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1increments)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1increments_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1increments_FUNC);
 	gtk_spin_button_set_increments((GtkSpinButton*)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1increments_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1increments_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1set_1numeric
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1numeric)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1numeric)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1numeric_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1numeric_FUNC);
 	gtk_spin_button_set_numeric((GtkSpinButton*)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1numeric_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1numeric_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1set_1range
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1range)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1range)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1range_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1range_FUNC);
 	gtk_spin_button_set_range((GtkSpinButton*)arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1range_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1range_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1set_1value
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1value)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1value)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1value_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1value_FUNC);
 	gtk_spin_button_set_value((GtkSpinButton*)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1value_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1value_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1set_1wrap
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1wrap)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1set_1wrap)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1wrap_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1wrap_FUNC);
 	gtk_spin_button_set_wrap((GtkSpinButton*)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1wrap_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1set_1wrap_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1spin_1button_1update
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1update)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1spin_1button_1update)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1update_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1update_FUNC);
 	gtk_spin_button_update((GtkSpinButton*)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1update_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1update_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1status_1icon_1get_1geometry
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1status_1icon_1get_1geometry)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1status_1icon_1get_1geometry)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
 {
 	GdkRectangle _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1get_1geometry_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1get_1geometry_FUNC);
 	if (arg2) if ((lparg2 = getGdkRectangleFields(env, arg2, &_arg2)) == NULL) goto fail;
 	rc = (jboolean)gtk_status_icon_get_geometry((GtkStatusIcon*)arg0, (GdkScreen**)arg1, (GdkRectangle*)lparg2, (GtkOrientation*)arg3);
 fail:
 	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1get_1geometry_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1get_1geometry_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1status_1icon_1get_1visible
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1status_1icon_1get_1visible)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1status_1icon_1get_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1get_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1get_1visible_FUNC);
 	rc = (jboolean)gtk_status_icon_get_visible((GtkStatusIcon*)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1get_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1get_1visible_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1status_1icon_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1status_1icon_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1status_1icon_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1new_FUNC);
 	rc = (jintLong)gtk_status_icon_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1status_1icon_1position_1menu_1func
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1status_1icon_1position_1menu_1func)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1status_1icon_1position_1menu_1func)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1position_1menu_1func_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1position_1menu_1func_FUNC);
 	rc = (jintLong)gtk_status_icon_position_menu_func();
-	OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1position_1menu_1func_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1position_1menu_1func_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1status_1icon_1set_1from_1pixbuf
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1from_1pixbuf)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1status_1icon_1set_1from_1pixbuf)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1from_1pixbuf_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1from_1pixbuf_FUNC);
 	gtk_status_icon_set_from_pixbuf((GtkStatusIcon*)arg0, (GdkPixbuf*)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1from_1pixbuf_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1from_1pixbuf_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1status_1icon_1set_1tooltip_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1tooltip_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1status_1icon_1set_1tooltip_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1tooltip_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1tooltip_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_status_icon_set_tooltip_text((GtkStatusIcon *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1tooltip_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1tooltip_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1status_1icon_1set_1visible
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1visible)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1status_1icon_1set_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1visible_FUNC);
 	gtk_status_icon_set_visible((GtkStatusIcon*)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1visible_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1add_1class
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1add_1class)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1class)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1class_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1class_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
 	gtk_style_context_add_class(arg0, lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_add_class)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_add_class)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
 		}
 	}
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1add_1class_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1add_1class_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1add_1provider
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1add_1provider)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1provider)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1provider_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1provider_FUNC);
 /*
 	gtk_style_context_add_provider(arg0, arg1, (guint)arg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_add_provider)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_add_provider)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong, guint))fp)(arg0, arg1, (guint)arg2);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1add_1provider_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1add_1provider_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1add_1provider_1for_1screen
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1add_1provider_1for_1screen)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1add_1provider_1for_1screen)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1provider_1for_1screen_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1add_1provider_1for_1screen_FUNC);
 /*
 	gtk_style_context_add_provider_for_screen((GdkScreen *)arg0, arg1, (guint)arg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_add_provider_for_screen)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_add_provider_for_screen)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GdkScreen *, jintLong, guint))fp)((GdkScreen *)arg0, arg1, (guint)arg2);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1add_1provider_1for_1screen_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1add_1provider_1for_1screen_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1get
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1get)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jintLongArray arg3, jintLong arg4)
 {
 	jbyte *lparg2=NULL;
 	jintLong *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	gtk_style_context_get(arg0, arg1, (const gchar *)lparg2, lparg3, (const gchar *)NULL);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_get)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_get)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, const gchar *, jintLong *, const gchar *))fp)(arg0, arg1, (const gchar *)lparg2, lparg3, (const gchar *)NULL);
 		}
@@ -13605,587 +6761,587 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1get)
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, JNI_ABORT);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1get_1background_1color
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1get_1background_1color)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1background_1color)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkRGBA _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1background_1color_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1background_1color_FUNC);
 	if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_style_context_get_background_color(arg0, arg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_get_background_color)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_get_background_color)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
 	if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1background_1color_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1background_1color_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1get_1border
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1get_1border)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1border)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GtkBorder _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1border_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1border_FUNC);
 	if (arg2) if ((lparg2 = getGtkBorderFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_style_context_get_border(arg0, arg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_get_border)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_get_border)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, GtkBorder *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
 	if (arg2 && lparg2) setGtkBorderFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1border_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1border_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1get_1color
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1get_1color)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1color)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkRGBA _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1color_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1color_FUNC);
 	if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_style_context_get_color(arg0, arg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_get_color)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_get_color)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
 	if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1color_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1color_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1get_1font
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1style_1context_1get_1font)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1font)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1font_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1font_FUNC);
 /*
 	rc = (jintLong)gtk_style_context_get_font(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_get_font)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_get_font)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1font_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1font_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1get_1padding
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1get_1padding)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1get_1padding)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GtkBorder _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1padding_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1get_1padding_FUNC);
 	if (arg2) if ((lparg2 = getGtkBorderFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_style_context_get_padding(arg0, arg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_get_padding)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_get_padding)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, GtkBorder *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
 	if (arg2 && lparg2) setGtkBorderFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1padding_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1get_1padding_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1invalidate
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1invalidate)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1invalidate)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1invalidate_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1invalidate_FUNC);
 /*
 	gtk_style_context_invalidate(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_invalidate)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_invalidate)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1invalidate_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1invalidate_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1restore
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1restore)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1restore)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1restore_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1restore_FUNC);
 /*
 	gtk_style_context_restore(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_restore)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_restore)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1restore_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1restore_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1save
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1save)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1save)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1save_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1save_FUNC);
 /*
 	gtk_style_context_save(arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_save)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_save)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1save_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1save_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1context_1set_1state
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1context_1set_1state)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1context_1set_1state)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1context_1set_1state_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1context_1set_1state_FUNC);
 /*
 	gtk_style_context_set_state(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_style_context_set_state)
+		GTK_LOAD_FUNCTION(fp, gtk_style_context_set_state)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1context_1set_1state_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1context_1set_1state_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1base
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1base)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1get_1base)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1base_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1base_FUNC);
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	gtk_style_get_base((GtkStyle *)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1base_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1base_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1bg
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1bg)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1get_1bg)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1bg_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1bg_FUNC);
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	gtk_style_get_bg((GtkStyle *)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1bg_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1bg_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1black
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1black)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1get_1black)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkColor _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1black_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1black_FUNC);
 	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
 	gtk_style_get_black((GtkStyle *)arg0, lparg1);
 fail:
 	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1black_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1black_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1dark
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1dark)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1get_1dark)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1dark_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1dark_FUNC);
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	gtk_style_get_dark((GtkStyle *)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1dark_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1dark_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1fg
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1fg)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1get_1fg)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1fg_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1fg_FUNC);
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	gtk_style_get_fg((GtkStyle *)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1fg_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1fg_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1font_1desc
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1style_1get_1font_1desc)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
 	rc = (jintLong)gtk_style_get_font_desc((GtkStyle *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1light
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1light)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1get_1light)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1light_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1light_FUNC);
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	gtk_style_get_light((GtkStyle *)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1light_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1light_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1style_1get_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_FUNC);
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	gtk_style_get_text((GtkStyle *)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1xthickness
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1xthickness)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1style_1get_1xthickness)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1xthickness_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1xthickness_FUNC);
 	rc = (jint)gtk_style_get_xthickness((GtkStyle *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1xthickness_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1xthickness_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1style_1get_1ythickness
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1ythickness)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1style_1get_1ythickness)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1ythickness_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1style_1get_1ythickness_FUNC);
 	rc = (jint)gtk_style_get_ythickness((GtkStyle *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1ythickness_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1style_1get_1ythickness_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1target_1list_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1target_1list_1new)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1target_1list_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1target_1list_1new_FUNC);
 	rc = (jintLong)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1target_1list_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1target_1list_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1target_1list_1unref
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1target_1list_1unref)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1target_1list_1unref)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1target_1list_1unref_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1target_1list_1unref_FUNC);
 	gtk_target_list_unref((GtkTargetList *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1target_1list_1unref_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1target_1list_1unref_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1copy_1clipboard
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC);
 	gtk_text_buffer_copy_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1create_1mark
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1create_1mark)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1create_1mark)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1create_1mark_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1create_1mark_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_text_buffer_create_mark((GtkTextBuffer *)arg0, (const gchar *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1create_1mark_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1create_1mark_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1cut_1clipboard
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC);
 	gtk_text_buffer_cut_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1, (gboolean)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1delete
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1delete)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1delete)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1delete_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1delete_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_text_buffer_delete((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1delete_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1delete_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1bounds
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1bounds)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1bounds)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1bounds_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1bounds_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_text_buffer_get_bounds((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1bounds_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1bounds_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1end_1iter
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1end_1iter)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1end_1iter)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1end_1iter_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1end_1iter_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_text_buffer_get_end_iter((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1end_1iter_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1end_1iter_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1insert
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1insert)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
 	rc = (jintLong)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1line
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1line)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1line)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1line_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1line_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_text_buffer_get_iter_at_line((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (gint)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1line_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1line_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1mark
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1mark)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1mark)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1mark_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1mark_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_text_buffer_get_iter_at_mark((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextMark *)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1mark_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1mark_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1offset
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1offset)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1offset)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1offset_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1offset_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_text_buffer_get_iter_at_offset((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (gint)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1offset_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1offset_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1line_1count
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1line_1count)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1line_1count)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1line_1count_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1line_1count_FUNC);
 	rc = (jint)gtk_text_buffer_get_line_count((GtkTextBuffer *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1line_1count_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1line_1count_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1selection_1bound
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
 	rc = (jintLong)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1selection_1bounds
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bounds)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bounds)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1selection_1bounds_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1selection_1bounds_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_text_buffer_get_selection_bounds((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1selection_1bounds_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1selection_1bounds_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1get_1text
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1text)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1get_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1text_FUNC);
 	return rc;
 }
 #endif
 
 #if (!defined(NO__1gtk_1text_1buffer_1insert__II_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1text_1buffer_1insert__JJ_3BI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__JJ_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__JJ_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
 #endif
 {
 	jbyte *lparg2=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
 #endif
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)arg1, (const gchar *)lparg2, (gint)arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1text_1buffer_1insert__I_3B_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1text_1buffer_1insert__J_3B_3BI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__I_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__I_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__J_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1insert__J_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
 #endif
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
@@ -14194,201 +7350,201 @@ fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
 #endif
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1paste_1clipboard
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1paste_1clipboard)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1paste_1clipboard)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jboolean arg3)
 {
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1paste_1clipboard_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1paste_1clipboard_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_text_buffer_paste_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1, (GtkTextIter *)lparg2, (gboolean)arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1paste_1clipboard_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1paste_1clipboard_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1place_1cursor
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1place_1cursor)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1place_1cursor)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1place_1cursor_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1place_1cursor_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_text_buffer_place_cursor((GtkTextBuffer *)arg0, (const GtkTextIter *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1place_1cursor_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1place_1cursor_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1select_1range
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1select_1range)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1select_1range)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1select_1range_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1select_1range_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_text_buffer_select_range((GtkTextBuffer *)arg0, (const GtkTextIter *)lparg1, (const GtkTextIter *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1select_1range_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1select_1range_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1buffer_1set_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1set_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1buffer_1set_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1set_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1set_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_text_buffer_set_text((GtkTextBuffer *)arg0, (const gchar *)lparg1, (gint)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1set_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1set_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1iter_1get_1line
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1iter_1get_1line)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1text_1iter_1get_1line)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1iter_1get_1line_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1iter_1get_1line_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jint)gtk_text_iter_get_line((const GtkTextIter *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1iter_1get_1line_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1iter_1get_1line_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1iter_1get_1offset
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1iter_1get_1offset)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1text_1iter_1get_1offset)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1iter_1get_1offset_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1iter_1get_1offset_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jint)gtk_text_iter_get_offset((const GtkTextIter *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1iter_1get_1offset_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1iter_1get_1offset_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1buffer_1to_1window_1coords
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1buffer_1to_1window_1coords)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1buffer_1to_1window_1coords)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
 {
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1buffer_1to_1window_1coords_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1buffer_1to_1window_1coords_FUNC);
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	gtk_text_view_buffer_to_window_coords((GtkTextView *)arg0, (GtkTextWindowType)arg1, (gint)arg2, (gint)arg3, (gint *)lparg4, (gint *)lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1buffer_1to_1window_1coords_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1buffer_1to_1window_1coords_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1buffer
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1buffer)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
 	rc = (jintLong)gtk_text_view_get_buffer((GtkTextView *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1editable
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1editable)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1editable)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1editable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1editable_FUNC);
 	rc = (jboolean)gtk_text_view_get_editable((GtkTextView *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1editable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1editable_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1iter_1at_1location
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1iter_1at_1location)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1iter_1at_1location)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1iter_1at_1location_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1iter_1at_1location_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_text_view_get_iter_at_location((GtkTextView *)arg0, (GtkTextIter *)lparg1, (gint)arg2, (gint)arg3);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1iter_1at_1location_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1iter_1at_1location_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1iter_1location
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1iter_1location)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1iter_1location)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
 {
 	jbyte *lparg1=NULL;
 	GdkRectangle _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1iter_1location_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1iter_1location_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
 	gtk_text_view_get_iter_location((GtkTextView *)arg0, (const GtkTextIter *)lparg1, (GdkRectangle *)lparg2);
 fail:
 	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1iter_1location_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1iter_1location_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1line_1at_1y
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1line_1at_1y)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1line_1at_1y)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintArray arg3)
 {
 	jbyte *lparg1=NULL;
 	jint *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1line_1at_1y_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1line_1at_1y_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_text_view_get_line_at_y((GtkTextView *)arg0, (GtkTextIter *)lparg1, (gint)arg2, (gint *)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1line_1at_1y_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1line_1at_1y_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1line_1yrange
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1line_1yrange)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1line_1yrange)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintArray arg3)
 {
 	jbyte *lparg1=NULL;
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1line_1yrange_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1line_1yrange_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
@@ -14397,1036 +7553,1036 @@ fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1line_1yrange_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1line_1yrange_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1visible_1rect
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1visible_1rect)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1visible_1rect)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1visible_1rect_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1visible_1rect_FUNC);
 	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
 	gtk_text_view_get_visible_rect((GtkTextView *)arg0, (GdkRectangle *)lparg1);
 fail:
 	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1visible_1rect_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1visible_1rect_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1get_1window
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1window)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1view_1get_1window)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1window_FUNC);
 	rc = (jintLong)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1window_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1text_1view_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1new_FUNC);
 	rc = (jintLong)gtk_text_view_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1scroll_1to_1iter
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1to_1iter)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1text_1view_1scroll_1to_1iter)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
 {
 	jbyte *lparg1=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1to_1iter_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1to_1iter_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_text_view_scroll_to_iter((GtkTextView *)arg0, (GtkTextIter *)lparg1, (gdouble)arg2, (gboolean)arg3, (gdouble)arg4, (gdouble)arg5);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1scroll_1to_1iter_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1scroll_1to_1iter_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1scroll_1to_1mark
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1to_1mark)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1scroll_1to_1mark)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1to_1mark_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1to_1mark_FUNC);
 	gtk_text_view_scroll_to_mark((GtkTextView *)arg0, (GtkTextMark *)arg1, (gdouble)arg2, (gboolean)arg3, (gdouble)arg4, (gdouble)arg5);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1scroll_1to_1mark_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1scroll_1to_1mark_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1set_1editable
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1editable)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1editable)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1editable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1editable_FUNC);
 	gtk_text_view_set_editable((GtkTextView *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1set_1editable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1set_1editable_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1set_1justification
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1justification)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1justification)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1justification_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1justification_FUNC);
 	gtk_text_view_set_justification((GtkTextView *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1set_1justification_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1set_1justification_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1set_1tabs
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1tabs)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1tabs)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1tabs_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1tabs_FUNC);
 	gtk_text_view_set_tabs((GtkTextView *)arg0, (PangoTabArray *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1set_1tabs_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1set_1tabs_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1text_1view_1set_1wrap_1mode
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1wrap_1mode_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1wrap_1mode_FUNC);
 	gtk_text_view_set_wrap_mode((GtkTextView *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1set_1wrap_1mode_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1text_1view_1set_1wrap_1mode_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1toggle_1button_1get_1active
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1active)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1get_1active)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1active_FUNC);
 	rc = (jboolean)gtk_toggle_button_get_active((GtkToggleButton *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1get_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1get_1active_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1toggle_1button_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1new_FUNC);
 	rc = (jintLong)gtk_toggle_button_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1toggle_1button_1set_1active
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1active)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1active)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1active_FUNC);
 	gtk_toggle_button_set_active((GtkToggleButton *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1set_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1set_1active_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1toggle_1button_1set_1inconsistent
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1inconsistent_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1inconsistent_FUNC);
 	gtk_toggle_button_set_inconsistent((GtkToggleButton *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1set_1inconsistent_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1set_1inconsistent_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1toggle_1button_1set_1mode
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1mode)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1button_1set_1mode)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1mode_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1mode_FUNC);
 	gtk_toggle_button_set_mode((GtkToggleButton *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1set_1mode_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1set_1mode_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1toggle_1tool_1button_1get_1active
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1tool_1button_1get_1active)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1get_1active)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1get_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1get_1active_FUNC);
 	rc = (jboolean)gtk_toggle_tool_button_get_active((GtkToggleToolButton *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1tool_1button_1get_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1tool_1button_1get_1active_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1toggle_1tool_1button_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1toggle_1tool_1button_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1new_FUNC);
 	rc = (jintLong)gtk_toggle_tool_button_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1tool_1button_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1tool_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1toggle_1tool_1button_1set_1active
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1tool_1button_1set_1active)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toggle_1tool_1button_1set_1active)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1set_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toggle_1tool_1button_1set_1active_FUNC);
 	gtk_toggle_tool_button_set_active((GtkToggleToolButton *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1tool_1button_1set_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toggle_1tool_1button_1set_1active_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1button_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tool_1button_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tool_1button_1new)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1new_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_tool_button_new((GtkWidget *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1button_1set_1icon_1widget
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tool_1button_1set_1icon_1widget)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1icon_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1icon_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1icon_1widget_FUNC);
 	gtk_tool_button_set_icon_widget((GtkToolButton *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1set_1icon_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1set_1icon_1widget_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1button_1set_1label
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tool_1button_1set_1label)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1label)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1label_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1label_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_tool_button_set_label((GtkToolButton *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1set_1label_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1set_1label_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1button_1set_1label_1widget
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tool_1button_1set_1label_1widget)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1label_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1label_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1label_1widget_FUNC);
 	gtk_tool_button_set_label_widget((GtkToolButton *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1set_1label_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1set_1label_1widget_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1button_1set_1use_1underline
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tool_1button_1set_1use_1underline)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1button_1set_1use_1underline)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1use_1underline_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1button_1set_1use_1underline_FUNC);
 	gtk_tool_button_set_use_underline((GtkToolButton *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1set_1use_1underline_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1button_1set_1use_1underline_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1item_1get_1proxy_1menu_1item
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tool_1item_1get_1proxy_1menu_1item)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tool_1item_1get_1proxy_1menu_1item)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1get_1proxy_1menu_1item_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1get_1proxy_1menu_1item_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_tool_item_get_proxy_menu_item((GtkToolItem *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1get_1proxy_1menu_1item_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1get_1proxy_1menu_1item_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1item_1retrieve_1proxy_1menu_1item
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tool_1item_1retrieve_1proxy_1menu_1item)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tool_1item_1retrieve_1proxy_1menu_1item)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1retrieve_1proxy_1menu_1item_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1retrieve_1proxy_1menu_1item_FUNC);
 	rc = (jintLong)gtk_tool_item_retrieve_proxy_menu_item((GtkToolItem *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1retrieve_1proxy_1menu_1item_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1retrieve_1proxy_1menu_1item_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1item_1set_1is_1important
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tool_1item_1set_1is_1important)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1item_1set_1is_1important)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1set_1is_1important_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1set_1is_1important_FUNC);
 	gtk_tool_item_set_is_important((GtkToolItem *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1set_1is_1important_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1set_1is_1important_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tool_1item_1set_1proxy_1menu_1item
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tool_1item_1set_1proxy_1menu_1item)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tool_1item_1set_1proxy_1menu_1item)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1set_1proxy_1menu_1item_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tool_1item_1set_1proxy_1menu_1item_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_tool_item_set_proxy_menu_item((GtkToolItem *)arg0, (const gchar *)lparg1, (GtkWidget *)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1set_1proxy_1menu_1item_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tool_1item_1set_1proxy_1menu_1item_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1toolbar_1insert
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1insert)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1insert)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1insert_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1insert_FUNC);
 	gtk_toolbar_insert((GtkToolbar *)arg0, (GtkToolItem *)arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1insert_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toolbar_1insert_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1toolbar_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1toolbar_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1new_FUNC);
 	rc = (jintLong)gtk_toolbar_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toolbar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1toolbar_1set_1icon_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1set_1icon_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1icon_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1icon_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1icon_1size_FUNC);
 	gtk_toolbar_set_icon_size((GtkToolbar *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1set_1icon_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toolbar_1set_1icon_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1toolbar_1set_1show_1arrow
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1set_1show_1arrow)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1show_1arrow)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1show_1arrow_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1show_1arrow_FUNC);
 	gtk_toolbar_set_show_arrow((GtkToolbar *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1set_1show_1arrow_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toolbar_1set_1show_1arrow_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1toolbar_1set_1style
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1set_1style)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1toolbar_1set_1style)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1style_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1style_FUNC);
 	gtk_toolbar_set_style((GtkToolbar *)arg0, (GtkToolbarStyle)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1set_1style_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1toolbar_1set_1style_FUNC);
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1model_1get__III_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1model_1get__JJI_3II) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__III_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__JJI_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__JJI_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
 #endif
 {
 	jint *lparg3=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3II_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3II_FUNC);
 #endif
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3II_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3II_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1model_1get__III_3JI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1model_1get__JJI_3JI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3JI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__III_3JI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__JJI_3JI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get__JJI_3JI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jint arg4)
 #endif
 {
 	jlong *lparg3=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3JI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3JI_FUNC);
 #endif
 	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3JI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3JI_FUNC);
 #endif
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1get_1iter
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1iter)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_FUNC);
 	rc = (jboolean)gtk_tree_model_get_iter((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, (GtkTreePath *)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1iter_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1iter_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1get_1iter_1first
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter_1first)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1iter_1first)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_1first_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_1first_FUNC);
 	rc = (jboolean)gtk_tree_model_get_iter_first((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1iter_1first_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1iter_1first_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1get_1n_1columns
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1n_1columns)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1n_1columns)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1n_1columns_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1n_1columns_FUNC);
 	rc = (jint)gtk_tree_model_get_n_columns((GtkTreeModel *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1n_1columns_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1n_1columns_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1get_1path
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1path)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1path)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
 	rc = (jintLong)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1get_1type
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1model_1get_1type)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
 	rc = (jintLong)gtk_tree_model_get_type();
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1iter_1children
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1children)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1children)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1children_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1children_FUNC);
 	rc = (jboolean)gtk_tree_model_iter_children((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1iter_1children_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1iter_1children_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1iter_1n_1children
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1n_1children)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1n_1children)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1n_1children_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1n_1children_FUNC);
 	rc = (jint)gtk_tree_model_iter_n_children((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1iter_1n_1children_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1iter_1n_1children_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1iter_1next
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1next)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1next)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1next_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1next_FUNC);
 	rc = (jboolean)gtk_tree_model_iter_next((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1iter_1next_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1iter_1next_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1model_1iter_1nth_1child
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1nth_1child_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1nth_1child_FUNC);
 	rc = (jboolean)gtk_tree_model_iter_nth_child((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2, arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1iter_1nth_1child_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1iter_1nth_1child_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1append_1index
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1append_1index)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1append_1index)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1append_1index_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1append_1index_FUNC);
 	gtk_tree_path_append_index((GtkTreePath *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1append_1index_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1append_1index_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1compare
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1compare)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1compare_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1compare_FUNC);
 	rc = (jintLong)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1compare_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1compare_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1free
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1free)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1free)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1free_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1free_FUNC);
 	gtk_tree_path_free((GtkTreePath *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1free_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1free_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1get_1depth
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1depth)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1path_1get_1depth)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1depth_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1depth_FUNC);
 	rc = (jint)gtk_tree_path_get_depth((GtkTreePath *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1get_1depth_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1get_1depth_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1get_1indices
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1indices)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1get_1indices)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
 	rc = (jintLong)gtk_tree_path_get_indices((GtkTreePath *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_FUNC);
 	rc = (jintLong)gtk_tree_path_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_FUNC);
 	return rc;
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1path_1new_1from_1string__I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1path_1new_1from_1string__J) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__I)(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new_1from_1string__I)(JNIEnv *env, jclass that, jintLong arg0)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__J)(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new_1from_1string__J)(JNIEnv *env, jclass that, jintLong arg0)
 #endif
 {
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
 #endif
 	rc = (jintLong)gtk_tree_path_new_from_string((const gchar *)arg0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
 #endif
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1new_1from_1string___3B
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_tree_path_new_from_string((const gchar *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1next
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1next)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1path_1next)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1next_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1next_FUNC);
 	gtk_tree_path_next((GtkTreePath *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1next_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1next_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1prev
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1prev)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1path_1prev)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1prev_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1prev_FUNC);
 	rc = (jboolean)gtk_tree_path_prev((GtkTreePath *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1prev_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1prev_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1path_1up
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1up)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1path_1up)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1up_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1up_FUNC);
 	rc = (jboolean)gtk_tree_path_up((GtkTreePath *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1up_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1up_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1count_1selected_1rows
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
 	rc = (jint)gtk_tree_selection_count_selected_rows((GtkTreeSelection *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1get_1select_1function
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1select_1function)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1get_1select_1function)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1select_1function_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1select_1function_FUNC);
 	rc = (jintLong)gtk_tree_selection_get_select_function((GtkTreeSelection *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1select_1function_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1select_1function_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1get_1selected_1rows
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
 {
 	jintLong *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1path_1is_1selected
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1path_1is_1selected_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1path_1is_1selected_FUNC);
 	rc = (jboolean)gtk_tree_selection_path_is_selected((GtkTreeSelection *)arg0, (GtkTreePath *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1path_1is_1selected_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1path_1is_1selected_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1select_1all
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1all)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1all)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1all_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1all_FUNC);
 	gtk_tree_selection_select_all((GtkTreeSelection *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1select_1all_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1select_1all_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1select_1iter
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1iter)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1iter)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1iter_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1iter_FUNC);
 	gtk_tree_selection_select_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1select_1iter_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1select_1iter_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1select_1path
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1path)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1select_1path)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1path_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1path_FUNC);
 	gtk_tree_selection_select_path((GtkTreeSelection *)arg0, (GtkTreePath *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1select_1path_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1select_1path_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1set_1mode
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1set_1mode)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1set_1mode)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1mode_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1mode_FUNC);
 	gtk_tree_selection_set_mode((GtkTreeSelection *)arg0, (GtkSelectionMode)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1set_1mode_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1set_1mode_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1set_1select_1function
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1set_1select_1function)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1set_1select_1function)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1select_1function_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1select_1function_FUNC);
 	gtk_tree_selection_set_select_function((GtkTreeSelection *)arg0, (GtkTreeSelectionFunc)arg1, (gpointer)arg2, (GDestroyNotify)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1set_1select_1function_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1set_1select_1function_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1unselect_1all
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1all)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1all)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1all_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1all_FUNC);
 	gtk_tree_selection_unselect_all((GtkTreeSelection *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1unselect_1all_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1unselect_1all_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1unselect_1iter
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1iter)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1iter)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1iter_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1iter_FUNC);
 	gtk_tree_selection_unselect_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1unselect_1iter_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1unselect_1iter_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1selection_1unselect_1path
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1path)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1unselect_1path)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1path_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1path_FUNC);
 	gtk_tree_selection_unselect_path((GtkTreeSelection *)arg0, (GtkTreePath *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1unselect_1path_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1unselect_1path_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1store_1append
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1append)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1append)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1append_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1append_FUNC);
 	gtk_tree_store_append((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1append_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1append_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1store_1clear
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1clear)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1clear)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1clear_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1clear_FUNC);
 	gtk_tree_store_clear((GtkTreeStore *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1clear_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1clear_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1store_1insert
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1insert)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1insert)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1insert_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1insert_FUNC);
 	gtk_tree_store_insert((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2, (gint)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1insert_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1insert_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1store_1newv
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1store_1newv)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1store_1newv)
 	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
 {
 	jintLong *lparg1=NULL;
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1newv_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1newv_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_tree_store_newv(arg0, (GType *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1newv_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1newv_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1store_1remove
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1remove)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1remove)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1remove_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1remove_FUNC);
 	gtk_tree_store_remove((GtkTreeStore *)arg0, (GtkTreeIter *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1remove_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1remove_FUNC);
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1store_1set__IIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIII) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
 #endif
 {
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIII_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIII_FUNC);
 #endif
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIII_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIII_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1store_1set__IIIJI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIJI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jint arg4)
 #endif
 {
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIJI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIJI_FUNC);
 #endif
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIJI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIJI_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
 #endif
 {
 	GdkColor _arg3, *lparg3=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4)
 #endif
 {
 	GdkRGBA _arg3, *lparg3=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
 #endif
 	if (arg3) if ((lparg3 = getGdkRGBAFields(env, arg3, &_arg3)) == NULL) goto fail;
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1store_1set__IIIZI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIZI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4)
 #endif
 {
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIZI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIZI_FUNC);
 #endif
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIZI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIZI_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1tree_1store_1set__III_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJI_3BI) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1set__JJI_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
 #endif
 {
 	jbyte *lparg3=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJI_3BI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJI_3BI_FUNC);
 #endif
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJI_3BI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJI_3BI_FUNC);
 #endif
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1collapse_1row
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1collapse_1row)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1collapse_1row)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1collapse_1row_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1collapse_1row_FUNC);
 	rc = (jboolean)gtk_tree_view_collapse_row((GtkTreeView *)arg0, (GtkTreePath *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1collapse_1row_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1collapse_1row_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1add_1attribute
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1add_1attribute)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1add_1attribute)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
 {
 	jbyte *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1add_1attribute_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1add_1attribute_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_tree_view_column_add_attribute((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (const gchar *)lparg2, (gint)arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1add_1attribute_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1add_1attribute_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1position
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1position)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1position)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1get_1position_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1get_1position_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_tree_view_column_cell_get_position((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1cell_1get_1position_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1cell_1get_1position_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
@@ -15434,7 +8590,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1size)
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1get_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1get_1size_FUNC);
 	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
@@ -15447,422 +8603,422 @@ fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1cell_1get_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1cell_1get_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1cell_1set_1cell_1data
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1data)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1data)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3, jboolean arg4)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1set_1cell_1data_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1set_1cell_1data_FUNC);
 	gtk_tree_view_column_cell_set_cell_data((GtkTreeViewColumn *)arg0, (GtkTreeModel *)arg1, (GtkTreeIter *)arg2, arg3, arg4);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1cell_1set_1cell_1data_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1cell_1set_1cell_1data_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1clear
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1clear)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1clear)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1clear_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1clear_FUNC);
 	gtk_tree_view_column_clear((GtkTreeViewColumn *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1clear_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1clear_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1button
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1button)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1button)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1button_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1button_FUNC);
 /*
 	rc = (jintLong)gtk_tree_view_column_get_button((GtkTreeViewColumn *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_tree_view_column_get_button)
+		GTK_LOAD_FUNCTION(fp, gtk_tree_view_column_get_button)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkTreeViewColumn *))fp)((GtkTreeViewColumn *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1button_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1button_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1fixed_1width
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC);
 	rc = (jint)gtk_tree_view_column_get_fixed_width((GtkTreeViewColumn *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1reorderable
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderable)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderable)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1reorderable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1reorderable_FUNC);
 	rc = (jboolean)gtk_tree_view_column_get_reorderable((GtkTreeViewColumn *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1reorderable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1reorderable_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1resizable
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1resizable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1resizable_FUNC);
 	rc = (jboolean)gtk_tree_view_column_get_resizable((GtkTreeViewColumn *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1resizable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1resizable_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1visible
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1visible)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1visible_FUNC);
 	rc = (jboolean)gtk_tree_view_column_get_visible((GtkTreeViewColumn *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1visible_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1width
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1width)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1width)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1width_FUNC);
 	rc = (jint)gtk_tree_view_column_get_width((GtkTreeViewColumn *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1width_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
 	rc = (jintLong)gtk_tree_view_column_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1pack_1end
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1end)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1pack_1end)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1end_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1end_FUNC);
 	gtk_tree_view_column_pack_end((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1pack_1end_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1pack_1end_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1pack_1start
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1start)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1pack_1start)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1start_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1start_FUNC);
 	gtk_tree_view_column_pack_start((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1pack_1start_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1pack_1start_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1alignment
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment)
 	(JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1alignment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1alignment_FUNC);
 	gtk_tree_view_column_set_alignment((GtkTreeViewColumn *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1alignment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1alignment_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1cell_1data_1func
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1func)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1func)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1cell_1data_1func_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1cell_1data_1func_FUNC);
 	gtk_tree_view_column_set_cell_data_func((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (GtkTreeCellDataFunc)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1cell_1data_1func_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1cell_1data_1func_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1clickable
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1clickable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1clickable_FUNC);
 	gtk_tree_view_column_set_clickable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1clickable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1clickable_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1fixed_1width
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1fixed_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1fixed_1width_FUNC);
 	gtk_tree_view_column_set_fixed_width((GtkTreeViewColumn *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1fixed_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1fixed_1width_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1min_1width
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1min_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1min_1width_FUNC);
 	gtk_tree_view_column_set_min_width((GtkTreeViewColumn *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1min_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1min_1width_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1reorderable
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1reorderable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1reorderable_FUNC);
 	gtk_tree_view_column_set_reorderable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1reorderable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1reorderable_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1resizable
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1resizable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1resizable_FUNC);
 	gtk_tree_view_column_set_resizable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1resizable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1resizable_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1sizing
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sizing_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sizing_FUNC);
 	gtk_tree_view_column_set_sizing((GtkTreeViewColumn *)arg0, (GtkTreeViewColumnSizing)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1sizing_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1sizing_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1indicator
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicator)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicator)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1indicator_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1indicator_FUNC);
 	gtk_tree_view_column_set_sort_indicator((GtkTreeViewColumn *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1sort_1indicator_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1sort_1indicator_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1order
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1order_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1order_FUNC);
 	gtk_tree_view_column_set_sort_order((GtkTreeViewColumn *)arg0, (GtkSortType)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1sort_1order_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1sort_1order_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1visible
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1visible)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1visible_FUNC);
 	gtk_tree_view_column_set_visible((GtkTreeViewColumn *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1visible_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1set_1widget
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1widget)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1set_1widget)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1widget_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1widget_FUNC);
 	gtk_tree_view_column_set_widget((GtkTreeViewColumn *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1widget_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1set_1widget_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
 {
 	jint *lparg3=NULL;
 	jint *lparg4=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords_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;
 	gtk_tree_view_convert_bin_window_to_tree_coords((GtkTreeView *)arg0, (gint)arg1, (gint)arg2, (gint *)lparg3, (gint *)lparg4);
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1convert_1bin_1window_1to_1tree_1coords_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1create_1row_1drag_1icon
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
 	rc = (jintLong)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1expand_1row
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1expand_1row)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1expand_1row)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1expand_1row_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1expand_1row_FUNC);
 	rc = (jboolean)gtk_tree_view_expand_row((GtkTreeView *)arg0, (GtkTreePath *)arg1, (gboolean)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1expand_1row_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1expand_1row_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1background_1area
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1background_1area)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1background_1area)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
 {
 	GdkRectangle _arg3, *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1background_1area_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1background_1area_FUNC);
 	if (arg3) if ((lparg3 = getGdkRectangleFields(env, arg3, &_arg3)) == NULL) goto fail;
 	gtk_tree_view_get_background_area((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, (GdkRectangle *)lparg3);
 fail:
 	if (arg3 && lparg3) setGdkRectangleFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1background_1area_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1background_1area_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1bin_1window
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
 	rc = (jintLong)gtk_tree_view_get_bin_window((GtkTreeView *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1cell_1area
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1cell_1area)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1cell_1area)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
 {
 	GdkRectangle _arg3, *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cell_1area_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cell_1area_FUNC);
 	if (arg3) if ((lparg3 = &_arg3) == NULL) goto fail;
 	gtk_tree_view_get_cell_area((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, (GdkRectangle *)lparg3);
 fail:
 	if (arg3 && lparg3) setGdkRectangleFields(env, arg3, lparg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1cell_1area_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1cell_1area_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1column
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1column)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1column)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
 	rc = (jintLong)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1columns
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1columns)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
 	rc = (jintLong)gtk_tree_view_get_columns((GtkTreeView *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1cursor
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1cursor)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1cursor)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
 {
 	jintLong *lparg1=NULL;
 	jintLong *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_tree_view_get_cursor((GtkTreeView *)arg0, (GtkTreePath **)lparg1, (GtkTreeViewColumn **)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1expander_1column
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
 	rc = (jintLong)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1grid_1lines
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1grid_1lines)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1grid_1lines)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1grid_1lines_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1grid_1lines_FUNC);
 	rc = (jint)gtk_tree_view_get_grid_lines((GtkTreeView*)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1grid_1lines_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1grid_1lines_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1headers_1visible
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1headers_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1headers_1visible_FUNC);
 	rc = (jboolean)gtk_tree_view_get_headers_visible((GtkTreeView *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1headers_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1headers_1visible_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1path_1at_1pos
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1path_1at_1pos)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1path_1at_1pos)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintArray arg6)
 {
 	jintLong *lparg3=NULL;
@@ -15870,7 +9026,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1path_1at_1pos)
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
@@ -15881,405 +9037,405 @@ fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1rules_1hint
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1rules_1hint)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1rules_1hint)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1rules_1hint_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1rules_1hint_FUNC);
 /*
 	rc = (jboolean)gtk_tree_view_get_rules_hint((GtkTreeView *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_tree_view_get_rules_hint)
+		GTK_LOAD_FUNCTION(fp, gtk_tree_view_get_rules_hint)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkTreeView *))fp)((GtkTreeView *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1rules_1hint_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1rules_1hint_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1selection
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1selection)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
 	rc = (jintLong)gtk_tree_view_get_selection((GtkTreeView *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1vadjustment
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1vadjustment)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1vadjustment)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1vadjustment_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1vadjustment_FUNC);
 /*
 	rc = (jintLong)gtk_tree_view_get_vadjustment((GtkTreeView *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_tree_view_get_vadjustment)
+		GTK_LOAD_FUNCTION(fp, gtk_tree_view_get_vadjustment)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkTreeView *))fp)((GtkTreeView *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1vadjustment_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1vadjustment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1visible_1rect
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1visible_1rect)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1visible_1rect)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GdkRectangle _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1visible_1rect_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1visible_1rect_FUNC);
 	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
 	gtk_tree_view_get_visible_rect((GtkTreeView *)arg0, lparg1);
 fail:
 	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1visible_1rect_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1visible_1rect_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1insert_1column
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1insert_1column)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1tree_1view_1insert_1column)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1insert_1column_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1insert_1column_FUNC);
 	rc = (jint)gtk_tree_view_insert_column((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1insert_1column_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1insert_1column_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1move_1column_1after
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1move_1column_1after)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1move_1column_1after)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1move_1column_1after_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1move_1column_1after_FUNC);
 	gtk_tree_view_move_column_after((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1, (GtkTreeViewColumn *)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1move_1column_1after_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1move_1column_1after_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1new_1with_1model
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
 	rc = (jintLong)gtk_tree_view_new_with_model((GtkTreeModel *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1remove_1column
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1remove_1column)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1remove_1column)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1remove_1column_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1remove_1column_FUNC);
 	gtk_tree_view_remove_column((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1remove_1column_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1remove_1column_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1row_1expanded
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1row_1expanded)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1row_1expanded)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1row_1expanded_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1row_1expanded_FUNC);
 	rc = (jboolean)gtk_tree_view_row_expanded((GtkTreeView *)arg0, (GtkTreePath *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1row_1expanded_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1row_1expanded_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1scroll_1to_1cell
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3, jfloat arg4, jfloat arg5)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1cell_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1cell_FUNC);
 	gtk_tree_view_scroll_to_cell((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, (gboolean)arg3, (gfloat)arg4, (gfloat)arg5);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1scroll_1to_1cell_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1scroll_1to_1cell_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1scroll_1to_1point
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1point_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1point_FUNC);
 	gtk_tree_view_scroll_to_point((GtkTreeView *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1scroll_1to_1point_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1scroll_1to_1point_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1set_1cursor
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1cursor)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1cursor)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1cursor_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1cursor_FUNC);
 	gtk_tree_view_set_cursor((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1cursor_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1cursor_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1set_1drag_1dest_1row
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC);
 	gtk_tree_view_set_drag_dest_row((GtkTreeView *)arg0, (GtkTreePath *)arg1, arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1set_1grid_1lines
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC);
 	gtk_tree_view_set_grid_lines((GtkTreeView*)arg0, (GtkTreeViewGridLines)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1set_1headers_1visible
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1headers_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1headers_1visible_FUNC);
 	gtk_tree_view_set_headers_visible((GtkTreeView *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1headers_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1headers_1visible_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1set_1model
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1model)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1model)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1model_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1model_FUNC);
 	gtk_tree_view_set_model((GtkTreeView *)arg0, (GtkTreeModel *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1model_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1model_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1set_1rules_1hint
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1rules_1hint)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1rules_1hint)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1rules_1hint_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1rules_1hint_FUNC);
 /*
 	gtk_tree_view_set_rules_hint((GtkTreeView *)arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_tree_view_set_rules_hint)
+		GTK_LOAD_FUNCTION(fp, gtk_tree_view_set_rules_hint)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkTreeView *, jboolean))fp)((GtkTreeView *)arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1rules_1hint_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1rules_1hint_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1set_1search_1column
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1search_1column)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1set_1search_1column)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1search_1column_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1search_1column_FUNC);
 	gtk_tree_view_set_search_column((GtkTreeView *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1search_1column_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1search_1column_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1unset_1rows_1drag_1dest
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
 	gtk_tree_view_unset_rows_drag_dest((GtkTreeView *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1vbox_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vbox_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1vbox_1new)
 	(JNIEnv *env, jclass that, jboolean arg0, jint arg1)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1vbox_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1vbox_1new_FUNC);
 /*
 	rc = (jintLong)gtk_vbox_new((gboolean)arg0, (gint)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_vbox_new)
+		GTK_LOAD_FUNCTION(fp, gtk_vbox_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gboolean, gint))fp)((gboolean)arg0, (gint)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1vbox_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1vbox_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1viewport_1set_1shadow_1type
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1viewport_1set_1shadow_1type)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1viewport_1set_1shadow_1type)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
 	gtk_viewport_set_shadow_type((GtkViewport *)arg0, (GtkShadowType)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1vscale_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vscale_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1vscale_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1vscale_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1vscale_1new_FUNC);
 /*
 	rc = (jintLong)gtk_vscale_new((GtkAdjustment *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_vscale_new)
+		GTK_LOAD_FUNCTION(fp, gtk_vscale_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1vscale_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1vscale_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1vscrollbar_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vscrollbar_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1vscrollbar_1new)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1vscrollbar_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1vscrollbar_1new_FUNC);
 /*
 	rc = (jintLong)gtk_vscrollbar_new((GtkAdjustment *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_vscrollbar_new)
+		GTK_LOAD_FUNCTION(fp, gtk_vscrollbar_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkAdjustment *))fp)((GtkAdjustment *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1vscrollbar_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1vscrollbar_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1vseparator_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1vseparator_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1vseparator_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1vseparator_1new_FUNC);
 /*
 	rc = (jintLong)gtk_vseparator_new();
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_vseparator_new)
+		GTK_LOAD_FUNCTION(fp, gtk_vseparator_new)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1vseparator_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1vseparator_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1add_1accelerator
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1accelerator)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1add_1accelerator)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jint arg4, jint arg5)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1accelerator_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1accelerator_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_widget_add_accelerator((GtkWidget *)arg0, (const gchar *)lparg1, (GtkAccelGroup *)arg2, (guint)arg3, (GdkModifierType)arg4, arg5);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1add_1accelerator_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1add_1accelerator_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1add_1events
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1events)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1add_1events)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1events_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1events_FUNC);
 	gtk_widget_add_events((GtkWidget *)arg0, (gint)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1add_1events_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1add_1events_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1child_1focus
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1child_1focus)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1child_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1child_1focus_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1child_1focus_FUNC);
 	rc = (jboolean)gtk_widget_child_focus((GtkWidget *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1child_1focus_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1child_1focus_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1class_1get_1css_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1class_1get_1css_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1class_1get_1css_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1class_1get_1css_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1class_1get_1css_1name_FUNC);
 /*
 	rc = (jintLong)gtk_widget_class_get_css_name((GtkWidgetClass *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_class_get_css_name)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_class_get_css_name)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidgetClass *))fp)((GtkWidgetClass *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1class_1get_1css_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1class_1get_1css_1name_FUNC);
 	return rc;
 }
 #endif
 
 #if (!defined(NO__1gtk_1widget_1create_1pango_1layout__II) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1create_1pango_1layout__JJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 #endif
 {
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
 #endif
 	rc = (jintLong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
 #endif
 	return rc;
 }
@@ -16287,279 +9443,279 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__JJ)(J
 
 #if (!defined(NO__1gtk_1widget_1create_1pango_1layout__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1create_1pango_1layout__J_3B) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1create_1pango_1layout__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 #endif
 {
 	jbyte *lparg1=NULL;
 	jintLong rc = 0;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jintLong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
 #endif
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1destroy
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1destroy)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1destroy)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1destroy_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1destroy_FUNC);
 	gtk_widget_destroy((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1destroy_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1destroy_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1draw
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1draw)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1draw)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1draw_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1draw_FUNC);
 /*
 	gtk_widget_draw(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_draw)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_draw)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1draw_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1draw_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1event
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1event)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1event)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1event_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1event_FUNC);
 	rc = (jboolean)gtk_widget_event((GtkWidget *)arg0, (GdkEvent *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1event_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1event_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1accessible
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1accessible)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1accessible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1accessible_FUNC);
 	rc = (jintLong)gtk_widget_get_accessible((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1accessible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1accessible_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1allocation
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1allocation)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1allocation)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GtkAllocation _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1allocation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1allocation_FUNC);
 	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
 	gtk_widget_get_allocation((GtkWidget *)arg0, (GtkAllocation *)lparg1);
 fail:
 	if (arg1 && lparg1) setGtkAllocationFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1allocation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1allocation_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1can_1default
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1can_1default)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1can_1default)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1can_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1can_1default_FUNC);
 	rc = (jboolean)gtk_widget_get_can_default((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1can_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1can_1default_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1child_1visible
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1child_1visible)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1child_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1child_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1child_1visible_FUNC);
 	rc = (jboolean)gtk_widget_get_child_visible((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1child_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1child_1visible_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1default_1style
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1default_1style)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
 /*
 	rc = (jintLong)gtk_widget_get_default_style();
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_default_style)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_default_style)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1events
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1events)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1events)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1events_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1events_FUNC);
 	rc = (jint)gtk_widget_get_events((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1events_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1events_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1has_1window
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1has_1window)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1has_1window)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1has_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1has_1window_FUNC);
 	rc = (jboolean)gtk_widget_get_has_window((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1has_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1has_1window_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1mapped
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1mapped)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1mapped)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1mapped_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1mapped_FUNC);
 	rc = (jboolean)gtk_widget_get_mapped((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1mapped_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1mapped_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1modifier_1style
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1modifier_1style)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1modifier_1style)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
 /*
 	rc = (jintLong)gtk_widget_get_modifier_style((GtkWidget *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_modifier_style)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_modifier_style)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1name
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1name)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1name_FUNC);
 	rc = (jintLong)gtk_widget_get_name((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1name_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1opacity
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1widget_1get_1opacity)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1widget_1get_1opacity)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1opacity_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1opacity_FUNC);
 /*
 	rc = (jdouble)gtk_widget_get_opacity((GtkWidget *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_opacity)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_opacity)
 		if (fp) {
 			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1opacity_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1opacity_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1pango_1context
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1pango_1context)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1pango_1context)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
 	rc = (jintLong)gtk_widget_get_pango_context((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1parent
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_FUNC);
 	rc = (jintLong)gtk_widget_get_parent((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1parent_1window
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent_1window)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1parent_1window)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_1window_FUNC);
 	rc = (jintLong)gtk_widget_get_parent_window((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_1window_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1preferred_1height_1for_1width
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1preferred_1height_1for_1width)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1preferred_1height_1for_1width)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1preferred_1height_1for_1width_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1preferred_1height_1for_1width_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	gtk_widget_get_preferred_height_for_width(arg0, arg1, lparg2, lparg3);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_preferred_height_for_width)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_preferred_height_for_width)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, jint *, jint *))fp)(arg0, arg1, lparg2, lparg3);
 		}
@@ -16567,24 +9723,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1preferred_1height_1for_1wid
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1preferred_1height_1for_1width_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1preferred_1height_1for_1width_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1preferred_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1preferred_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1preferred_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jobject arg2)
 {
 	GtkRequisition _arg1, *lparg1=NULL;
 	GtkRequisition _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1preferred_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1preferred_1size_FUNC);
 	if (arg1) if ((lparg1 = getGtkRequisitionFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getGtkRequisitionFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_widget_get_preferred_size((GtkWidget *)arg0, (GtkRequisition *)lparg1, (GtkRequisition *)lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_preferred_size)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_preferred_size)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, GtkRequisition *, GtkRequisition *))fp)((GtkWidget *)arg0, (GtkRequisition *)lparg1, (GtkRequisition *)lparg2);
 		}
@@ -16592,24 +9748,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1preferred_1size)
 fail:
 	if (arg2 && lparg2) setGtkRequisitionFields(env, arg2, lparg2);
 	if (arg1 && lparg1) setGtkRequisitionFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1preferred_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1preferred_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1preferred_1width_1for_1height
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1preferred_1width_1for_1height)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1preferred_1width_1for_1height)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
 {
 	jint *lparg2=NULL;
 	jint *lparg3=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1preferred_1width_1for_1height_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1preferred_1width_1for_1height_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	gtk_widget_get_preferred_width_for_height(arg0, arg1, lparg2, lparg3);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_preferred_width_for_height)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_preferred_width_for_height)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, jint *, jint *))fp)(arg0, arg1, lparg2, lparg3);
 		}
@@ -16617,824 +9773,824 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1preferred_1width_1for_1heig
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1preferred_1width_1for_1height_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1preferred_1width_1for_1height_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1realized
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1realized)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1realized)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1realized_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1realized_FUNC);
 	rc = (jboolean)gtk_widget_get_realized((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1realized_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1realized_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1sensitive
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1sensitive)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1sensitive)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1sensitive_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1sensitive_FUNC);
 	rc = (jboolean)gtk_widget_get_sensitive((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1sensitive_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1sensitive_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1size_1request
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1size_1request)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1get_1size_1request)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1size_1request_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1size_1request_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_widget_get_size_request((GtkWidget *)arg0, (gint *)lparg1, (gint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1size_1request_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1size_1request_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1state_1flags
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1state_1flags)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1state_1flags)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1state_1flags_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1state_1flags_FUNC);
 /*
 	rc = (jint)gtk_widget_get_state_flags((GtkWidget *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_state_flags)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_state_flags)
 		if (fp) {
 			rc = (jint)((jint (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1state_1flags_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1state_1flags_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1style
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1style)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1style)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_FUNC);
 /*
 	rc = (jintLong)gtk_widget_get_style((GtkWidget *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_style)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_style)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1style_1context
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1style_1context)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1style_1context)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_1context_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_1context_FUNC);
 /*
 	rc = (jintLong)gtk_widget_get_style_context((GtkWidget *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_get_style_context)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_get_style_context)
 		if (fp) {
 			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_1context_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_1context_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1tooltip_1text
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1tooltip_1text)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1tooltip_1text)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1tooltip_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1tooltip_1text_FUNC);
 	rc = (jintLong)gtk_widget_get_tooltip_text((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1tooltip_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1tooltip_1text_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1toplevel
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1toplevel)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
 	rc = (jintLong)gtk_widget_get_toplevel((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1visible
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1visible)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1visible_FUNC);
 	rc = (jboolean)gtk_widget_get_visible((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1visible_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1get_1window
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1window)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1window)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1window_FUNC);
 	rc = (jintLong)gtk_widget_get_window((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1window_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1grab_1focus
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1grab_1focus)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1grab_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1grab_1focus_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1grab_1focus_FUNC);
 	gtk_widget_grab_focus((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1grab_1focus_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1grab_1focus_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1has_1default
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1has_1default)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1has_1default)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1has_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1has_1default_FUNC);
 	rc = (jboolean)gtk_widget_has_default((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1has_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1has_1default_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1has_1focus
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1has_1focus)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1has_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1has_1focus_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1has_1focus_FUNC);
 	rc = (jboolean)gtk_widget_has_focus((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1has_1focus_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1has_1focus_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1hide
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1hide)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1hide)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1hide_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1hide_FUNC);
 	gtk_widget_hide((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1hide_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1hide_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1input_1shape_1combine_1region
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1input_1shape_1combine_1region)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1input_1shape_1combine_1region)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1input_1shape_1combine_1region_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1input_1shape_1combine_1region_FUNC);
 /*
 	gtk_widget_input_shape_combine_region((GtkWidget *)arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_input_shape_combine_region)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_input_shape_combine_region)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, jintLong))fp)((GtkWidget *)arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1input_1shape_1combine_1region_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1input_1shape_1combine_1region_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1is_1composited
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1is_1composited)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1composited_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1composited_FUNC);
 /*
 	rc = (jboolean)gtk_widget_is_composited((GtkWidget *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_is_composited)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_is_composited)
 		if (fp) {
 			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1is_1composited_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1is_1composited_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1is_1focus
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1focus)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1is_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1focus_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1focus_FUNC);
 	rc = (jboolean)gtk_widget_is_focus((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1is_1focus_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1is_1focus_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1map
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1map)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1map)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1map_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1map_FUNC);
 	gtk_widget_map((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1map_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1map_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1mnemonic_1activate
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1mnemonic_1activate)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1mnemonic_1activate)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1mnemonic_1activate_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1mnemonic_1activate_FUNC);
 	rc = (jboolean)gtk_widget_mnemonic_activate((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1mnemonic_1activate_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1mnemonic_1activate_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1modify_1base
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1base)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1modify_1base)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1base_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1base_FUNC);
 	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_widget_modify_base((GtkWidget *)arg0, (GtkStateType)arg1, (GdkColor *)lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_modify_base)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_modify_base)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, GtkStateType, GdkColor *))fp)((GtkWidget *)arg0, (GtkStateType)arg1, (GdkColor *)lparg2);
 		}
 	}
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1base_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1base_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1modify_1bg
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1bg)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1modify_1bg)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkColor _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1bg_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1bg_FUNC);
 	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_widget_modify_bg((GtkWidget *)arg0, (GtkStateType)arg1, (GdkColor *)lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_modify_bg)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_modify_bg)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, GtkStateType, GdkColor *))fp)((GtkWidget *)arg0, (GtkStateType)arg1, (GdkColor *)lparg2);
 		}
 	}
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1bg_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1bg_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1modify_1font
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1font)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1modify_1font)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1font_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1font_FUNC);
 /*
 	gtk_widget_modify_font((GtkWidget *)arg0, (PangoFontDescription *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_modify_font)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_modify_font)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, PangoFontDescription *))fp)((GtkWidget *)arg0, (PangoFontDescription *)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1font_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1font_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1modify_1style
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1style)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1modify_1style)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1style_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1style_FUNC);
 /*
 	gtk_widget_modify_style((GtkWidget *)arg0, (GtkRcStyle *)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_modify_style)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_modify_style)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, GtkRcStyle *))fp)((GtkWidget *)arg0, (GtkRcStyle *)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1style_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1style_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1override_1background_1color
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1override_1background_1color)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1background_1color)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkRGBA _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1background_1color_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1background_1color_FUNC);
 	if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_widget_override_background_color(arg0, arg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_override_background_color)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_override_background_color)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
 	if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1override_1background_1color_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1override_1background_1color_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1override_1color
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1override_1color)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1color)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	GdkRGBA _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1color_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1color_FUNC);
 	if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
 	gtk_widget_override_color(arg0, arg1, lparg2);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_override_color)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_override_color)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
 	if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1override_1color_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1override_1color_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1override_1font
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1override_1font)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1font)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1font_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1override_1font_FUNC);
 /*
 	gtk_widget_override_font(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_override_font)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_override_font)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1override_1font_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1override_1font_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1queue_1draw
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1queue_1draw)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1queue_1draw)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1draw_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1draw_FUNC);
 	gtk_widget_queue_draw((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1queue_1draw_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1queue_1draw_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1queue_1resize
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1queue_1resize)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1queue_1resize)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1resize_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1resize_FUNC);
 	gtk_widget_queue_resize((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1queue_1resize_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1queue_1resize_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1realize
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1realize)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1realize)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1realize_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1realize_FUNC);
 	gtk_widget_realize((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1realize_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1realize_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1remove_1accelerator
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1remove_1accelerator)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1remove_1accelerator)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1remove_1accelerator_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1remove_1accelerator_FUNC);
 	gtk_widget_remove_accelerator((GtkWidget *)arg0, (GtkAccelGroup *)arg1, (guint)arg2, (GdkModifierType)arg3);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1remove_1accelerator_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1remove_1accelerator_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1reparent
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1reparent)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1reparent)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1reparent_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1reparent_FUNC);
 	gtk_widget_reparent((GtkWidget *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1reparent_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1reparent_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1send_1expose
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1send_1expose)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1send_1expose)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1send_1expose_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1send_1expose_FUNC);
 	rc = (jint)gtk_widget_send_expose((GtkWidget *)arg0, (GdkEvent *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1send_1expose_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1send_1expose_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1allocation
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1allocation)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1allocation)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GtkAllocation _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1allocation_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1allocation_FUNC);
 	if (arg1) if ((lparg1 = getGtkAllocationFields(env, arg1, &_arg1)) == NULL) goto fail;
 	gtk_widget_set_allocation((GtkWidget *)arg0, (GtkAllocation *)lparg1);
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1allocation_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1allocation_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1app_1paintable
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1app_1paintable)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1app_1paintable)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1app_1paintable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1app_1paintable_FUNC);
 	gtk_widget_set_app_paintable((GtkWidget *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1app_1paintable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1app_1paintable_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1can_1default
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1can_1default)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1can_1default)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1can_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1can_1default_FUNC);
 	gtk_widget_set_can_default((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1can_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1can_1default_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1can_1focus
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1can_1focus)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1can_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1can_1focus_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1can_1focus_FUNC);
 	gtk_widget_set_can_focus((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1can_1focus_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1can_1focus_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1default_1direction
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1default_1direction)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1default_1direction)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1default_1direction_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1default_1direction_FUNC);
 	gtk_widget_set_default_direction((GtkTextDirection)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1default_1direction_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1default_1direction_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1direction
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1direction)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1direction)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1direction_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1direction_FUNC);
 	gtk_widget_set_direction((GtkWidget *)arg0, (GtkTextDirection)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1direction_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1direction_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1double_1buffered
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1double_1buffered)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1double_1buffered)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1double_1buffered_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1double_1buffered_FUNC);
 	gtk_widget_set_double_buffered((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1double_1buffered_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1double_1buffered_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1focus_1on_1click
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1focus_1on_1click)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1focus_1on_1click)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1focus_1on_1click_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1focus_1on_1click_FUNC);
 /*
 	gtk_widget_set_focus_on_click((GtkWidget *)arg0, (gboolean)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_set_focus_on_click)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_set_focus_on_click)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, gboolean))fp)((GtkWidget *)arg0, (gboolean)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1focus_1on_1click_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1focus_1on_1click_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1halign
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1halign)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1halign)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1halign_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1halign_FUNC);
 /*
 	gtk_widget_set_halign((GtkWidget *)arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_set_halign)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_set_halign)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, jint))fp)((GtkWidget *)arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1halign_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1halign_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1has_1window
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1has_1window)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1has_1window)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1has_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1has_1window_FUNC);
 	gtk_widget_set_has_window((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1has_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1has_1window_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1mapped
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1mapped)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1mapped)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1mapped_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1mapped_FUNC);
 	gtk_widget_set_mapped((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1mapped_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1mapped_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1name
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1name)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1name)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1name_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1name_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_widget_set_name((GtkWidget *)arg0, (const char *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1name_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1name_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1opacity
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1opacity)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1opacity)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1opacity_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1opacity_FUNC);
 /*
 	gtk_widget_set_opacity((GtkWidget *)arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_set_opacity)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_set_opacity)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, jdouble))fp)((GtkWidget *)arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1opacity_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1opacity_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1parent_1window
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1parent_1window)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1parent_1window)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1parent_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1parent_1window_FUNC);
 	gtk_widget_set_parent_window((GtkWidget *)arg0, (GdkWindow *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1parent_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1parent_1window_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1receives_1default
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1receives_1default)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1receives_1default)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1receives_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1receives_1default_FUNC);
 	gtk_widget_set_receives_default((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1receives_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1receives_1default_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1redraw_1on_1allocate
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1redraw_1on_1allocate_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1redraw_1on_1allocate_FUNC);
 	gtk_widget_set_redraw_on_allocate((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1redraw_1on_1allocate_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1redraw_1on_1allocate_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1sensitive
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1sensitive)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1sensitive)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1sensitive_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1sensitive_FUNC);
 	gtk_widget_set_sensitive((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1sensitive_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1sensitive_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1size_1request
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1size_1request)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1size_1request)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1size_1request_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1size_1request_FUNC);
 	gtk_widget_set_size_request((GtkWidget *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1size_1request_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1size_1request_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1state
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1state)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1state)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1state_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1state_FUNC);
 /*
 	gtk_widget_set_state((GtkWidget *)arg0, (GtkStateType)arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_set_state)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_set_state)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, GtkStateType))fp)((GtkWidget *)arg0, (GtkStateType)arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1state_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1state_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1tooltip_1text
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1tooltip_1text)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1tooltip_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1tooltip_1text_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1tooltip_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_widget_set_tooltip_text((GtkWidget *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1tooltip_1text_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1tooltip_1text_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1valign
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1valign)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1valign)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1valign_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1valign_FUNC);
 /*
 	gtk_widget_set_valign((GtkWidget *)arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_set_valign)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_set_valign)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, jint))fp)((GtkWidget *)arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1valign_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1valign_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1set_1visible
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1visible)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1visible_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1visible_FUNC);
 	gtk_widget_set_visible((GtkWidget *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1visible_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1visible_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1shape_1combine_1region
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1shape_1combine_1region)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1shape_1combine_1region)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1shape_1combine_1region_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1shape_1combine_1region_FUNC);
 /*
 	gtk_widget_shape_combine_region(arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_shape_combine_region)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_shape_combine_region)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1shape_1combine_1region_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1shape_1combine_1region_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1show
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1show)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1show_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1show_FUNC);
 	gtk_widget_show((GtkWidget *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1show_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1show_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1size_1allocate
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1size_1allocate)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1allocate)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GtkAllocation _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate_FUNC);
 	if (arg1) if ((lparg1 = getGtkAllocationFields(env, arg1, &_arg1)) == NULL) goto fail;
 	gtk_widget_size_allocate((GtkWidget *)arg0, (GtkAllocation *)lparg1);
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1size_1allocate_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1size_1allocate_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1size_1request
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1size_1request)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1size_1request)
 	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	GtkRequisition _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1request_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1request_FUNC);
 	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
 /*
 	gtk_widget_size_request((GtkWidget *)arg0, (GtkRequisition *)lparg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_widget_size_request)
+		GTK_LOAD_FUNCTION(fp, gtk_widget_size_request)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWidget *, GtkRequisition *))fp)((GtkWidget *)arg0, (GtkRequisition *)lparg1);
 		}
 	}
 fail:
 	if (arg1 && lparg1) setGtkRequisitionFields(env, arg1, lparg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1size_1request_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1size_1request_FUNC);
 }
 #endif
 
 #if (!defined(NO__1gtk_1widget_1style_1get__I_3B_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1style_1get__J_3B_3IJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__J_3B_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__J_3B_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
 #endif
 {
 	jbyte *lparg1=NULL;
 	jint *lparg2=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
@@ -17443,26 +10599,26 @@ fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
 #endif
 }
 #endif
 
 #if (!defined(NO__1gtk_1widget_1style_1get__I_3B_3JI) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1style_1get__J_3B_3JJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3JI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__I_3B_3JI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
 #else
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1style_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
 #endif
 {
 	jbyte *lparg1=NULL;
 	jlong *lparg2=NULL;
 #ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
 #endif
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
@@ -17471,458 +10627,7306 @@ fail:
 	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 #ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
 #endif
 }
 #endif
 
 #ifndef NO__1gtk_1widget_1translate_1coordinates
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1translate_1coordinates)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1translate_1coordinates)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
 {
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1translate_1coordinates_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1translate_1coordinates_FUNC);
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_widget_translate_coordinates((GtkWidget *)arg0, (GtkWidget *)arg1, arg2, arg3, (gint *)lparg4, (gint *)lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1translate_1coordinates_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1translate_1coordinates_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1activate_1default
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1activate_1default)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1activate_1default)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1activate_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1activate_1default_FUNC);
 	rc = (jboolean)gtk_window_activate_default((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1activate_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1activate_1default_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1add_1accel_1group
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1add_1accel_1group)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1add_1accel_1group)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1add_1accel_1group_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1add_1accel_1group_FUNC);
 	gtk_window_add_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1add_1accel_1group_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1add_1accel_1group_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1deiconify
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1deiconify)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1deiconify)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1deiconify_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1deiconify_FUNC);
 	gtk_window_deiconify((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1deiconify_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1deiconify_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1fullscreen
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1fullscreen)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1fullscreen)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1fullscreen_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1fullscreen_FUNC);
 	gtk_window_fullscreen((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1fullscreen_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1fullscreen_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1focus
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1focus)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1get_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1focus_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1focus_FUNC);
 	rc = (jintLong)gtk_window_get_focus((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1focus_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1focus_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1group
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1get_1group)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1group_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1group_FUNC);
 	rc = (jintLong)gtk_window_get_group((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1group_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1group_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1icon_1list
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1get_1icon_1list)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
 	rc = (jintLong)gtk_window_get_icon_list((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1mnemonic_1modifier
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier)
+JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1mnemonic_1modifier_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1mnemonic_1modifier_FUNC);
 	rc = (jint)gtk_window_get_mnemonic_modifier((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1mnemonic_1modifier_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1mnemonic_1modifier_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1modal
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1get_1modal)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1get_1modal)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1modal_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1modal_FUNC);
 	rc = (jboolean)gtk_window_get_modal((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1modal_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1modal_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1opacity
-JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity)
+JNIEXPORT jdouble JNICALL GTK_NATIVE(_1gtk_1window_1get_1opacity)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jdouble rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1opacity_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1opacity_FUNC);
 /*
 	rc = (jdouble)gtk_window_get_opacity((GtkWindow *)arg0);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_window_get_opacity)
+		GTK_LOAD_FUNCTION(fp, gtk_window_get_opacity)
 		if (fp) {
 			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1opacity_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1opacity_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1position
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1get_1position)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1get_1position)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1position_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1position_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_window_get_position((GtkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1position_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1position_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1get_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1get_1size)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1get_1size)
 	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1size_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1get_1size_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	gtk_window_get_size((GtkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1size_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1get_1size_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1group_1add_1window
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1add_1window)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1group_1add_1window)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1add_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1group_1add_1window_FUNC);
 	gtk_window_group_add_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1group_1add_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1group_1add_1window_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1group_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1group_1new)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1group_1new_FUNC);
 	rc = (jintLong)gtk_window_group_new();
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1group_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1group_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1group_1remove_1window
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1remove_1window)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1group_1remove_1window)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1remove_1window_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1group_1remove_1window_FUNC);
 	gtk_window_group_remove_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1group_1remove_1window_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1group_1remove_1window_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1iconify
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1iconify)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1iconify)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1iconify_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1iconify_FUNC);
 	gtk_window_iconify((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1iconify_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1iconify_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1is_1active
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1is_1active)
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1window_1is_1active)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1is_1active_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1is_1active_FUNC);
 	rc = (jboolean)gtk_window_is_active((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1is_1active_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1is_1active_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1list_1toplevels
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1list_1toplevels)
 	(JNIEnv *env, jclass that)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1list_1toplevels_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1list_1toplevels_FUNC);
 	rc = (jintLong)gtk_window_list_toplevels();
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1list_1toplevels_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1list_1toplevels_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1maximize
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1maximize)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1maximize)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1maximize_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1maximize_FUNC);
 	gtk_window_maximize((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1maximize_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1maximize_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1move
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1move)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1move)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1move_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1move_FUNC);
 	gtk_window_move((GtkWindow *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1move_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1move_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1new
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1new)
+JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1window_1new)
 	(JNIEnv *env, jclass that, jint arg0)
 {
 	jintLong rc = 0;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1new_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1new_FUNC);
 	rc = (jintLong)gtk_window_new((GtkWindowType)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1gtk_1window_1remove_1accel_1group
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1remove_1accel_1group)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1remove_1accel_1group)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1remove_1accel_1group_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1remove_1accel_1group_FUNC);
 	gtk_window_remove_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1remove_1accel_1group_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1remove_1accel_1group_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1resize
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1resize)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1resize)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1resize_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1resize_FUNC);
 	gtk_window_resize((GtkWindow *)arg0, (gint)arg1, (gint)arg2);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1resize_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1resize_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1decorated
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1decorated)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1decorated)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1decorated_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1decorated_FUNC);
 	gtk_window_set_decorated((GtkWindow *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1decorated_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1decorated_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1default
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1default)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1default)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1default_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1default_FUNC);
 	gtk_window_set_default((GtkWindow *)arg0, (GtkWidget *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1default_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1default_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1destroy_1with_1parent
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1destroy_1with_1parent_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1destroy_1with_1parent_FUNC);
 	gtk_window_set_destroy_with_parent((GtkWindow *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1destroy_1with_1parent_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1destroy_1with_1parent_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1geometry_1hints
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1geometry_1hints)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1geometry_1hints)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
 {
 	GdkGeometry _arg2, *lparg2=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1geometry_1hints_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1geometry_1hints_FUNC);
 	if (arg2) if ((lparg2 = getGdkGeometryFields(env, arg2, &_arg2)) == NULL) goto fail;
 	gtk_window_set_geometry_hints((GtkWindow *)arg0, (GtkWidget *)arg1, lparg2, arg3);
 fail:
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1geometry_1hints_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1geometry_1hints_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1icon_1list
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1icon_1list)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1icon_1list)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1icon_1list_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1icon_1list_FUNC);
 	gtk_window_set_icon_list((GtkWindow *)arg0, (GList *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1icon_1list_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1icon_1list_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1modal
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1modal)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1modal)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1modal_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1modal_FUNC);
 	gtk_window_set_modal((GtkWindow *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1modal_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1modal_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1opacity
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1opacity)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1opacity)
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1opacity_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1opacity_FUNC);
 /*
 	gtk_window_set_opacity((GtkWindow *)arg0, arg1);
 */
 	{
-		OS_LOAD_FUNCTION(fp, gtk_window_set_opacity)
+		GTK_LOAD_FUNCTION(fp, gtk_window_set_opacity)
 		if (fp) {
 			((void (CALLING_CONVENTION*)(GtkWindow *, jdouble))fp)((GtkWindow *)arg0, arg1);
 		}
 	}
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1opacity_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1opacity_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1resizable
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1resizable)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1resizable)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1resizable_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1resizable_FUNC);
 	gtk_window_set_resizable((GtkWindow *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1resizable_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1resizable_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1skip_1taskbar_1hint
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint)
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
 	gtk_window_set_skip_taskbar_hint((GtkWindow *)arg0, (gboolean)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1title
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1title)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1title)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1title_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1title_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gtk_window_set_title((GtkWindow *)arg0, (const gchar *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1title_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1title_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1transient_1for
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1transient_1for)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1transient_1for)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1transient_1for_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1transient_1for_FUNC);
 	gtk_window_set_transient_for((GtkWindow *)arg0, (GtkWindow *)arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1transient_1for_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1transient_1for_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1set_1type_1hint
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1type_1hint)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1set_1type_1hint)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1type_1hint_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1set_1type_1hint_FUNC);
 	gtk_window_set_type_hint((GtkWindow *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1type_1hint_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1set_1type_1hint_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1unfullscreen
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unfullscreen)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1unfullscreen)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1unfullscreen_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1unfullscreen_FUNC);
 	gtk_window_unfullscreen((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1unfullscreen_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1unfullscreen_FUNC);
 }
 #endif
 
 #ifndef NO__1gtk_1window_1unmaximize
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unmaximize)
+JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1window_1unmaximize)
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	OS_NATIVE_ENTER(env, that, _1gtk_1window_1unmaximize_FUNC);
+	GTK_NATIVE_ENTER(env, that, _1gtk_1window_1unmaximize_FUNC);
 	gtk_window_unmaximize((GtkWindow *)arg0);
-	OS_NATIVE_EXIT(env, that, _1gtk_1window_1unmaximize_FUNC);
+	GTK_NATIVE_EXIT(env, that, _1gtk_1window_1unmaximize_FUNC);
+}
+#endif
+
+#ifndef OS_NATIVE
+#define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func
+#endif
+
+#if (!defined(NO_Call__IIII) && !defined(JNI64)) || (!defined(NO_Call__JJII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(Call__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(Call__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+#endif
+{
+	jint rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, Call__IIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, Call__JJII_FUNC);
+#endif
+	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, Call__IIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, Call__JJII_FUNC);
+#endif
+	return rc;
+}
+#endif
+
+#if (!defined(NO_Call__IIIJ) && !defined(JNI64)) || (!defined(NO_Call__JJIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jlong JNICALL OS_NATIVE(Call__IIIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3)
+#else
+JNIEXPORT jlong JNICALL OS_NATIVE(Call__JJIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3)
+#endif
+{
+	jlong rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, Call__IIIJ_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, Call__JJIJ_FUNC);
+#endif
+	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, Call__IIIJ_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, Call__JJIJ_FUNC);
+#endif
+	return rc;
+}
+#endif
+
+#ifndef NO_GDK_1EVENT_1TYPE
+JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1TYPE)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GDK_1EVENT_1TYPE_FUNC);
+	rc = (jint)GDK_EVENT_TYPE((GdkEvent *)arg0);
+	OS_NATIVE_EXIT(env, that, GDK_1EVENT_1TYPE_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GDK_1EVENT_1WINDOW
+JNIEXPORT jintLong JNICALL OS_NATIVE(GDK_1EVENT_1WINDOW)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, GDK_1EVENT_1WINDOW_FUNC);
+	rc = (jintLong)GDK_EVENT_WINDOW((GdkEventAny *)arg0);
+	OS_NATIVE_EXIT(env, that, GDK_1EVENT_1WINDOW_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GDK_1IS_1X11_1DISPLAY
+JNIEXPORT jboolean JNICALL OS_NATIVE(GDK_1IS_1X11_1DISPLAY)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, GDK_1IS_1X11_1DISPLAY_FUNC);
+	rc = (jboolean)GDK_IS_X11_DISPLAY((GdkDisplay *)arg0);
+	OS_NATIVE_EXIT(env, that, GDK_1IS_1X11_1DISPLAY_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GInterfaceInfo_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GInterfaceInfo_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GInterfaceInfo_1sizeof_FUNC);
+	rc = (jint)GInterfaceInfo_sizeof();
+	OS_NATIVE_EXIT(env, that, GInterfaceInfo_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GPollFD_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GPollFD_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GPollFD_1sizeof_FUNC);
+	rc = (jint)GPollFD_sizeof();
+	OS_NATIVE_EXIT(env, that, GPollFD_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GTypeInfo_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GTypeInfo_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GTypeInfo_1sizeof_FUNC);
+	rc = (jint)GTypeInfo_sizeof();
+	OS_NATIVE_EXIT(env, that, GTypeInfo_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GTypeQuery_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GTypeQuery_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GTypeQuery_1sizeof_FUNC);
+	rc = (jint)GTypeQuery_sizeof();
+	OS_NATIVE_EXIT(env, that, GTypeQuery_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_G_1OBJECT_1CLASS_1CONSTRUCTOR
+JNIEXPORT jintLong JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1CONSTRUCTOR)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC);
+	rc = (jintLong)G_OBJECT_CLASS_CONSTRUCTOR((GObjectClass *)arg0);
+	OS_NATIVE_EXIT(env, that, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR
+JNIEXPORT void JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC);
+	G_OBJECT_CLASS_SET_CONSTRUCTOR((GObjectClass *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC);
+}
+#endif
+
+#ifndef NO_G_1TYPE_1BOOLEAN
+JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1BOOLEAN)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, G_1TYPE_1BOOLEAN_FUNC);
+	rc = (jintLong)G_TYPE_BOOLEAN;
+	OS_NATIVE_EXIT(env, that, G_1TYPE_1BOOLEAN_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_G_1TYPE_1DOUBLE
+JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1DOUBLE)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, G_1TYPE_1DOUBLE_FUNC);
+	rc = (jintLong)G_TYPE_DOUBLE;
+	OS_NATIVE_EXIT(env, that, G_1TYPE_1DOUBLE_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_G_1TYPE_1FLOAT
+JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1FLOAT)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, G_1TYPE_1FLOAT_FUNC);
+	rc = (jintLong)G_TYPE_FLOAT;
+	OS_NATIVE_EXIT(env, that, G_1TYPE_1FLOAT_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_G_1TYPE_1INT
+JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1INT)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, G_1TYPE_1INT_FUNC);
+	rc = (jintLong)G_TYPE_INT;
+	OS_NATIVE_EXIT(env, that, G_1TYPE_1INT_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_G_1TYPE_1INT64
+JNIEXPORT jintLong JNICALL OS_NATIVE(G_1TYPE_1INT64)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, G_1TYPE_1INT64_FUNC);
+	rc = (jintLong)G_TYPE_INT64;
+	OS_NATIVE_EXIT(env, that, G_1TYPE_1INT64_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_G_1VALUE_1TYPE
+JNIEXPORT jintLong JNICALL OS_NATIVE(G_1VALUE_1TYPE)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, G_1VALUE_1TYPE_FUNC);
+	rc = (jintLong)G_VALUE_TYPE(arg0);
+	OS_NATIVE_EXIT(env, that, G_1VALUE_1TYPE_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkColor_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkColor_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkColor_1sizeof_FUNC);
+	rc = (jint)GdkColor_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkColor_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkDragContext_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkDragContext_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkDragContext_1sizeof_FUNC);
+	rc = (jint)GdkDragContext_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkDragContext_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventAny_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventAny_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventAny_1sizeof_FUNC);
+	rc = (jint)GdkEventAny_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventAny_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventButton_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventButton_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventButton_1sizeof_FUNC);
+	rc = (jint)GdkEventButton_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventButton_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventCrossing_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventCrossing_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventCrossing_1sizeof_FUNC);
+	rc = (jint)GdkEventCrossing_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventCrossing_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventExpose_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventExpose_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventExpose_1sizeof_FUNC);
+	rc = (jint)GdkEventExpose_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventExpose_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventFocus_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventFocus_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventFocus_1sizeof_FUNC);
+	rc = (jint)GdkEventFocus_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventFocus_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventKey_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventKey_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventKey_1sizeof_FUNC);
+	rc = (jint)GdkEventKey_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventKey_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventMotion_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventMotion_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventMotion_1sizeof_FUNC);
+	rc = (jint)GdkEventMotion_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventMotion_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventProperty_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventProperty_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventProperty_1sizeof_FUNC);
+	rc = (jint)GdkEventProperty_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventProperty_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventScroll_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventScroll_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventScroll_1sizeof_FUNC);
+	rc = (jint)GdkEventScroll_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventScroll_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventWindowState_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventWindowState_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEventWindowState_1sizeof_FUNC);
+	rc = (jint)GdkEventWindowState_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEventWindowState_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEvent_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEvent_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkEvent_1sizeof_FUNC);
+	rc = (jint)GdkEvent_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkEvent_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkGeometry_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkGeometry_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkGeometry_1sizeof_FUNC);
+	rc = (jint)GdkGeometry_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkGeometry_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkKeymapKey_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkKeymapKey_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkKeymapKey_1sizeof_FUNC);
+	rc = (jint)GdkKeymapKey_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkKeymapKey_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkRGBA_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkRGBA_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkRGBA_1sizeof_FUNC);
+	rc = (jint)GdkRGBA_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkRGBA_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkRectangle_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkRectangle_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkRectangle_1sizeof_FUNC);
+	rc = (jint)GdkRectangle_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkRectangle_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkWindowAttr_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkWindowAttr_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, GdkWindowAttr_1sizeof_FUNC);
+	rc = (jint)GdkWindowAttr_sizeof();
+	OS_NATIVE_EXIT(env, that, GdkWindowAttr_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoAttrColor_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoAttrColor_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PangoAttrColor_1sizeof_FUNC);
+	rc = (jint)PangoAttrColor_sizeof();
+	OS_NATIVE_EXIT(env, that, PangoAttrColor_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoAttrInt_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoAttrInt_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PangoAttrInt_1sizeof_FUNC);
+	rc = (jint)PangoAttrInt_sizeof();
+	OS_NATIVE_EXIT(env, that, PangoAttrInt_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoAttribute_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoAttribute_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PangoAttribute_1sizeof_FUNC);
+	rc = (jint)PangoAttribute_sizeof();
+	OS_NATIVE_EXIT(env, that, PangoAttribute_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoItem_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoItem_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PangoItem_1sizeof_FUNC);
+	rc = (jint)PangoItem_sizeof();
+	OS_NATIVE_EXIT(env, that, PangoItem_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoLayoutLine_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoLayoutLine_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PangoLayoutLine_1sizeof_FUNC);
+	rc = (jint)PangoLayoutLine_sizeof();
+	OS_NATIVE_EXIT(env, that, PangoLayoutLine_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoLayoutRun_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoLayoutRun_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PangoLayoutRun_1sizeof_FUNC);
+	rc = (jint)PangoLayoutRun_sizeof();
+	OS_NATIVE_EXIT(env, that, PangoLayoutRun_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoLogAttr_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoLogAttr_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PangoLogAttr_1sizeof_FUNC);
+	rc = (jint)PangoLogAttr_sizeof();
+	OS_NATIVE_EXIT(env, that, PangoLogAttr_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoRectangle_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoRectangle_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, PangoRectangle_1sizeof_FUNC);
+	rc = (jint)PangoRectangle_sizeof();
+	OS_NATIVE_EXIT(env, that, PangoRectangle_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_RTLD_1GLOBAL
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1GLOBAL)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, RTLD_1GLOBAL_FUNC);
+	rc = (jint)RTLD_GLOBAL;
+	OS_NATIVE_EXIT(env, that, RTLD_1GLOBAL_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_RTLD_1LAZY
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1LAZY)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, RTLD_1LAZY_FUNC);
+	rc = (jint)RTLD_LAZY;
+	OS_NATIVE_EXIT(env, that, RTLD_1LAZY_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_RTLD_1NOW
+JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1NOW)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, RTLD_1NOW_FUNC);
+	rc = (jint)RTLD_NOW;
+	OS_NATIVE_EXIT(env, that, RTLD_1NOW_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_XAnyEvent_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(XAnyEvent_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, XAnyEvent_1sizeof_FUNC);
+	rc = (jint)XAnyEvent_sizeof();
+	OS_NATIVE_EXIT(env, that, XAnyEvent_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_XEvent_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(XEvent_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, XEvent_1sizeof_FUNC);
+	rc = (jint)XEvent_sizeof();
+	OS_NATIVE_EXIT(env, that, XEvent_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_XExposeEvent_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(XExposeEvent_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, XExposeEvent_1sizeof_FUNC);
+	rc = (jint)XExposeEvent_sizeof();
+	OS_NATIVE_EXIT(env, that, XExposeEvent_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_XFocusChangeEvent_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(XFocusChangeEvent_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, XFocusChangeEvent_1sizeof_FUNC);
+	rc = (jint)XFocusChangeEvent_sizeof();
+	OS_NATIVE_EXIT(env, that, XFocusChangeEvent_1sizeof_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_X_1EVENT_1TYPE
+JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, X_1EVENT_1TYPE_FUNC);
+	rc = (jint)X_EVENT_TYPE((XEvent *)arg0);
+	OS_NATIVE_EXIT(env, that, X_1EVENT_1TYPE_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_X_1EVENT_1WINDOW
+JNIEXPORT jintLong JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, X_1EVENT_1WINDOW_FUNC);
+	rc = (jintLong)X_EVENT_WINDOW((XAnyEvent *)arg0);
+	OS_NATIVE_EXIT(env, that, X_1EVENT_1WINDOW_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1Call
+JNIEXPORT jint JNICALL OS_NATIVE(_1Call)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1Call_FUNC);
+	rc = (jint)((jint (*)())arg0)(arg1, arg2);
+	OS_NATIVE_EXIT(env, that, _1Call_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1FcConfigAppFontAddFile
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1FcConfigAppFontAddFile_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+/*
+	rc = (jboolean)FcConfigAppFontAddFile(arg0, lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, FcConfigAppFontAddFile)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1FcConfigAppFontAddFile_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1GDK_1PIXMAP_1XID
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1GDK_1PIXMAP_1XID_FUNC);
+	rc = (jintLong)GDK_PIXMAP_XID((GdkPixmap *)arg0);
+	OS_NATIVE_EXIT(env, that, _1GDK_1PIXMAP_1XID_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1GDK_1TYPE_1COLOR
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1COLOR)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1COLOR_FUNC);
+	rc = (jintLong)GDK_TYPE_COLOR;
+	OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1COLOR_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1GDK_1TYPE_1PIXBUF
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
+	rc = (jintLong)GDK_TYPE_PIXBUF;
+	OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1GDK_1TYPE_1RGBA
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1RGBA)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1RGBA_FUNC);
+	rc = (jintLong)GDK_TYPE_RGBA;
+	OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1RGBA_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1GString_1len
+JNIEXPORT jint JNICALL OS_NATIVE(_1GString_1len)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1GString_1len_FUNC);
+	rc = (jint)((GString *)arg0)->len;
+	OS_NATIVE_EXIT(env, that, _1GString_1len_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1GString_1str
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GString_1str)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1GString_1str_FUNC);
+	rc = (jintLong)((GString *)arg0)->str;
+	OS_NATIVE_EXIT(env, that, _1GString_1str_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1G_1OBJECT_1CLASS
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1CLASS_FUNC);
+	rc = (jintLong)G_OBJECT_CLASS(arg0);
+	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1CLASS_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1G_1OBJECT_1GET_1CLASS
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
+	rc = (jintLong)G_OBJECT_GET_CLASS(arg0);
+	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1G_1OBJECT_1TYPE
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_FUNC);
+	rc = (jintLong)G_OBJECT_TYPE(arg0);
+	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1G_1OBJECT_1TYPE_1NAME
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
+	rc = (jintLong)G_OBJECT_TYPE_NAME(arg0);
+	OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1G_1TYPE_1CHECK_1INSTANCE_1TYPE
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1G_1TYPE_1CHECK_1INSTANCE_1TYPE)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC);
+	rc = (jboolean)G_TYPE_CHECK_INSTANCE_TYPE(arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1G_1TYPE_1STRING
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1STRING)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1G_1TYPE_1STRING_FUNC);
+	rc = (jintLong)G_TYPE_STRING;
+	OS_NATIVE_EXIT(env, that, _1G_1TYPE_1STRING_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1PANGO_1PIXELS
+JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1PIXELS)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1PANGO_1PIXELS_FUNC);
+	rc = (jint)PANGO_PIXELS(arg0);
+	OS_NATIVE_EXIT(env, that, _1PANGO_1PIXELS_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1PANGO_1TYPE_1FONT_1DESCRIPTION
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
+	rc = (jintLong)PANGO_TYPE_FONT_DESCRIPTION;
+	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1PANGO_1TYPE_1FONT_1FACE
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1FACE)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1FACE_FUNC);
+	rc = (jintLong)PANGO_TYPE_FONT_FACE;
+	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1FACE_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1PANGO_1TYPE_1FONT_1FAMILY
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1FAMILY)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1FAMILY_FUNC);
+	rc = (jintLong)PANGO_TYPE_FONT_FAMILY;
+	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1FAMILY_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1PANGO_1TYPE_1LAYOUT
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1LAYOUT)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1LAYOUT_FUNC);
+	rc = (jintLong)PANGO_TYPE_LAYOUT;
+	OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1LAYOUT_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XCheckIfEvent
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XCheckIfEvent_FUNC);
+	rc = (jboolean)XCheckIfEvent((Display *)arg0, (XEvent *)arg1, (Bool (*)())arg2, (XPointer)arg3);
+	OS_NATIVE_EXIT(env, that, _1XCheckIfEvent_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XDefaultRootWindow
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XDefaultRootWindow)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XDefaultRootWindow_FUNC);
+	rc = (jintLong)XDefaultRootWindow((Display *)arg0);
+	OS_NATIVE_EXIT(env, that, _1XDefaultRootWindow_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XDefaultScreen
+JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XDefaultScreen_FUNC);
+	rc = (jint)XDefaultScreen((Display *)arg0);
+	OS_NATIVE_EXIT(env, that, _1XDefaultScreen_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XFlush
+JNIEXPORT void JNICALL OS_NATIVE(_1XFlush)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1XFlush_FUNC);
+	XFlush((Display *)arg0);
+	OS_NATIVE_EXIT(env, that, _1XFlush_FUNC);
+}
+#endif
+
+#ifndef NO__1XFree
+JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1XFree_FUNC);
+	XFree((void *)arg0);
+	OS_NATIVE_EXIT(env, that, _1XFree_FUNC);
+}
+#endif
+
+#ifndef NO__1XGetWindowProperty
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XGetWindowProperty)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jboolean arg5, jintLong arg6, jintLongArray arg7, jintArray arg8, jintArray arg9, jintArray arg10, jintLongArray arg11)
+{
+	jintLong *lparg7=NULL;
+	jint *lparg8=NULL;
+	jint *lparg9=NULL;
+	jint *lparg10=NULL;
+	jintLong *lparg11=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XGetWindowProperty_FUNC);
+	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
+	if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail;
+	if (arg10) if ((lparg10 = (*env)->GetIntArrayElements(env, arg10, NULL)) == NULL) goto fail;
+	if (arg11) if ((lparg11 = (*env)->GetIntLongArrayElements(env, arg11, NULL)) == NULL) goto fail;
+	rc = (jintLong)XGetWindowProperty((Display *)arg0, (Window)arg1, (Atom)arg2, arg3, arg4, arg5, (Atom)arg6, (Atom*)lparg7, (int *)lparg8, (unsigned long *)lparg9, (unsigned long *)lparg10, (unsigned char **)lparg11);
+fail:
+	if (arg11 && lparg11) (*env)->ReleaseIntLongArrayElements(env, arg11, lparg11, 0);
+	if (arg10 && lparg10) (*env)->ReleaseIntArrayElements(env, arg10, lparg10, 0);
+	if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0);
+	if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
+	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
+	OS_NATIVE_EXIT(env, that, _1XGetWindowProperty_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XKeysymToKeycode
+JNIEXPORT jint JNICALL OS_NATIVE(_1XKeysymToKeycode)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XKeysymToKeycode_FUNC);
+	rc = (jint)XKeysymToKeycode((Display *)arg0, (KeySym)arg1);
+	OS_NATIVE_EXIT(env, that, _1XKeysymToKeycode_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XQueryPointer
+JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+{
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jint *lparg4=NULL;
+	jint *lparg5=NULL;
+	jint *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint *lparg8=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XQueryPointer_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(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;
+	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
+	rc = (jint)XQueryPointer((Display *)arg0, (Window)arg1, (Window *)lparg2, (Window *)lparg3, (int *)lparg4, (int *)lparg5, (int *)lparg6, (int *)lparg7, (unsigned int *)lparg8);
+fail:
+	if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
+	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
+	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)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, _1XQueryPointer_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XSetErrorHandler
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetErrorHandler)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XSetErrorHandler_FUNC);
+	rc = (jintLong)XSetErrorHandler((XErrorHandler)arg0);
+	OS_NATIVE_EXIT(env, that, _1XSetErrorHandler_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XSetIOErrorHandler
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetIOErrorHandler)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XSetIOErrorHandler_FUNC);
+	rc = (jintLong)XSetIOErrorHandler((XIOErrorHandler)arg0);
+	OS_NATIVE_EXIT(env, that, _1XSetIOErrorHandler_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XSetInputFocus
+JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XSetInputFocus_FUNC);
+	rc = (jint)XSetInputFocus((Display *)arg0, (Window)arg1, arg2, arg3);
+	OS_NATIVE_EXIT(env, that, _1XSetInputFocus_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XSetTransientForHint
+JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XSetTransientForHint_FUNC);
+	rc = (jint)XSetTransientForHint((Display *)arg0, (Window)arg1, (Window)arg2);
+	OS_NATIVE_EXIT(env, that, _1XSetTransientForHint_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XSynchronize
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSynchronize)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1XSynchronize_FUNC);
+	rc = (jintLong)XSynchronize((Display *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1XSynchronize_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1XTestFakeKeyEvent
+JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeKeyEvent)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jintLong arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1XTestFakeKeyEvent_FUNC);
+	XTestFakeKeyEvent((Display *)arg0, arg1, (Bool)arg2, (unsigned long)arg3);
+	OS_NATIVE_EXIT(env, that, _1XTestFakeKeyEvent_FUNC);
+}
+#endif
+
+#ifndef NO__1access
+JNIEXPORT jint JNICALL OS_NATIVE(_1access)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+{
+	jbyte *lparg0=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1access_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jint)access((const char*)lparg0, arg1);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1access_FUNC);
+	return rc;
+}
+#endif
+
+#if (!defined(NO__1call__IIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#endif
+{
+	jintLong rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1call__IIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1call__JJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1call__IIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1call__JJJJJ_FUNC);
+#endif
+	return rc;
+}
+#endif
+
+#if (!defined(NO__1call__IIIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+#endif
+{
+	jintLong rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1call__IIIIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1call__JJJJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1call__IIIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1call__JJJJJJJ_FUNC);
+#endif
+	return rc;
+}
+#endif
+
+#if (!defined(NO__1call__IIIIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1call__JJJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
+#endif
+{
+	jintLong rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1call__IIIIIIII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1call__JJJJJJJJ_FUNC);
+#endif
+	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1call__IIIIIIII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1call__JJJJJJJJ_FUNC);
+#endif
+	return rc;
+}
+#endif
+
+#ifndef NO__1dlopen
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlopen)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1dlopen_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)dlopen((const char *)lparg0, arg1);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1dlopen_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1create_1from_1commandline
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1create_1from_1commandline)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
+{
+	jbyte *lparg0=NULL;
+	jbyte *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1create_1from_1commandline_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_app_info_create_from_commandline((gchar *)lparg0, (gchar *)lparg1, (GAppInfoCreateFlags)arg2, (GError **)arg3);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1create_1from_1commandline_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1get_1all
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1all)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1all_FUNC);
+	rc = (jintLong)g_app_info_get_all();
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1all_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1get_1default_1for_1type
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1default_1for_1type)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1default_1for_1type_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_app_info_get_default_for_type((gchar *)lparg0, (gboolean)arg1);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1default_1for_1type_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1get_1executable
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1executable)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1executable_FUNC);
+	rc = (jintLong)g_app_info_get_executable((GAppInfo *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1executable_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1get_1icon
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1icon)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1icon_FUNC);
+	rc = (jintLong)g_app_info_get_icon((GAppInfo *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1icon_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1get_1name
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1app_1info_1get_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1get_1name_FUNC);
+	rc = (jintLong)g_app_info_get_name((GAppInfo *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1get_1name_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1launch
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1launch_FUNC);
+	rc = (jboolean)g_app_info_launch((GAppInfo *)arg0, (GList *)arg1, (GAppLaunchContext *)arg2, (GError **)arg3);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1launch_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1launch_1default_1for_1uri
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1launch_1default_1for_1uri)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1launch_1default_1for_1uri_FUNC);
+	rc = (jboolean)g_app_info_launch_default_for_uri((char *)arg0, (GAppLaunchContext *)arg1, (GError **)arg2);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1launch_1default_1for_1uri_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1should_1show
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1should_1show)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1should_1show_FUNC);
+	rc = (jboolean)g_app_info_should_show((GAppInfo *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1should_1show_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1app_1info_1supports_1uris
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1app_1info_1supports_1uris)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1app_1info_1supports_1uris_FUNC);
+	rc = (jboolean)g_app_info_supports_uris((GAppInfo *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1app_1info_1supports_1uris_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1bus_1own_1name
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1bus_1own_1name)
+	(JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
+{
+	jbyte *lparg1=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1bus_1own_1name_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jint)g_bus_own_name((GBusType)arg0, (const gchar *)lparg1, (GBusNameOwnerFlags)arg2, (GBusAcquiredCallback)arg3, (GBusNameAcquiredCallback)arg4, (GBusNameLostCallback)arg5, (gpointer)arg6, (GDestroyNotify)arg7);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1bus_1own_1name_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1bytes_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1bytes_1new)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1bytes_1new_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+/*
+	rc = (jintLong)g_bytes_new((gconstpointer)lparg0, (gsize)arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, g_bytes_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gconstpointer, gsize))fp)((gconstpointer)lparg0, (gsize)arg1);
+		}
+	}
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1bytes_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1bytes_1unref
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1bytes_1unref)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1bytes_1unref_FUNC);
+/*
+	g_bytes_unref((GBytes *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, g_bytes_unref)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GBytes *))fp)((GBytes *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1g_1bytes_1unref_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1cclosure_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1cclosure_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1cclosure_1new_FUNC);
+	rc = (jintLong)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2);
+	OS_NATIVE_EXIT(env, that, _1g_1cclosure_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1closure_1ref
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1closure_1ref)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1closure_1ref_FUNC);
+	rc = (jintLong)g_closure_ref((GClosure *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1closure_1ref_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1closure_1sink
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1sink)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1closure_1sink_FUNC);
+	g_closure_sink((GClosure *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1closure_1sink_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1closure_1unref
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1closure_1unref_FUNC);
+	g_closure_unref((GClosure *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1closure_1unref_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1content_1type_1equals
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1equals)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1content_1type_1equals_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jboolean)g_content_type_equals((gchar *)arg0, (gchar *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1content_1type_1equals_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1content_1type_1is_1a
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1content_1type_1is_1a)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1content_1type_1is_1a_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jboolean)g_content_type_is_a((gchar *)arg0, (gchar *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1content_1type_1is_1a_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1dbus_1connection_1register_1object
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1dbus_1connection_1register_1object)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLongArray arg3, jintLong arg4, jintLong arg5, jintLongArray arg6)
+{
+	jbyte *lparg1=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg6=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1dbus_1connection_1register_1object_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	rc = (jint)g_dbus_connection_register_object((GDBusConnection *)arg0, (const gchar *)lparg1, (GDBusInterfaceInfo *)arg2, (const GDBusInterfaceVTable *)lparg3, (gpointer)arg4, (GDestroyNotify)arg5, (GError **)lparg6);
+fail:
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1dbus_1connection_1register_1object_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1dbus_1method_1invocation_1return_1value
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1dbus_1method_1invocation_1return_1value)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1dbus_1method_1invocation_1return_1value_FUNC);
+	g_dbus_method_invocation_return_value((GDBusMethodInvocation *)arg0, (GVariant *)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1dbus_1method_1invocation_1return_1value_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1dbus_1node_1info_1lookup_1interface
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1lookup_1interface)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1dbus_1node_1info_1lookup_1interface_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_dbus_node_info_lookup_interface((GDBusNodeInfo *)arg0, (const gchar *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1dbus_1node_1info_1lookup_1interface_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1dbus_1node_1info_1new_1for_1xml
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1new_1for_1xml)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
+{
+	jbyte *lparg0=NULL;
+	jintLong *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1dbus_1node_1info_1new_1for_1xml_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_dbus_node_info_new_for_xml((const gchar *)lparg0, (GError **)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1dbus_1node_1info_1new_1for_1xml_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1error_1free
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1error_1free)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1error_1free_FUNC);
+	g_error_free((GError *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1error_1free_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1error_1get_1message
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1error_1get_1message)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1error_1get_1message_FUNC);
+	rc = (jintLong)g_error_get_message((GError *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1error_1get_1message_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1file_1get_1uri
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1get_1uri)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1file_1get_1uri_FUNC);
+	rc = (jintLong)g_file_get_uri((GFile *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1file_1get_1uri_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1file_1info_1get_1content_1type
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1info_1get_1content_1type)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1file_1info_1get_1content_1type_FUNC);
+	rc = (jintLong)g_file_info_get_content_type((GFileInfo *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1file_1info_1get_1content_1type_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1file_1new_1for_1commandline_1arg
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1commandline_1arg)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_file_new_for_commandline_arg((const char *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1commandline_1arg_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1file_1new_1for_1path
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1path)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1path_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_file_new_for_path((const char *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1path_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1file_1new_1for_1uri
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1new_1for_1uri)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1file_1new_1for_1uri_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_file_new_for_uri((const char *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1file_1new_1for_1uri_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1file_1query_1info
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1file_1query_1info)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+{
+	jbyte *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1file_1query_1info_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_file_query_info((GFile *)arg0, (const char *)lparg1, (GFileQueryInfoFlags)arg2, (GCancellable *)arg3, (GError **)arg4);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1file_1query_1info_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1file_1test
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1file_1test)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+{
+	jbyte *lparg0=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1file_1test_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jboolean)g_file_test((const gchar *)lparg0, (GFileTest)arg1);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1file_1test_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1filename_1display_1name
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1display_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1filename_1display_1name_FUNC);
+	rc = (jintLong)g_filename_display_name((const gchar *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1filename_1display_1name_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1filename_1from_1uri
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
+{
+	jintLong *lparg1=NULL;
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1uri_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1uri_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1filename_1from_1utf8
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+{
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1utf8_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1utf8_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1filename_1to_1uri
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
+{
+	jintLong *lparg2=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1uri_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1uri_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1filename_1to_1utf8
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+{
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1utf8_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1utf8_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1free
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1free)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1free_FUNC);
+	g_free((gpointer)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1free_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1hash_1table_1get_1values
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1hash_1table_1get_1values)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1hash_1table_1get_1values_FUNC);
+	rc = (jintLong)g_hash_table_get_values((GHashTable *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1hash_1table_1get_1values_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1icon_1new_1for_1string
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1new_1for_1string)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
+{
+	jbyte *lparg0=NULL;
+	jintLong *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1icon_1new_1for_1string_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_icon_new_for_string((const gchar *)lparg0, (GError **)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1icon_1new_1for_1string_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1icon_1to_1string
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1icon_1to_1string)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1icon_1to_1string_FUNC);
+	rc = (jintLong)g_icon_to_string((GIcon *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1icon_1to_1string_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1idle_1add
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1idle_1add_FUNC);
+	rc = (jint)g_idle_add((GSourceFunc)arg0, (gpointer)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1idle_1add_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1append
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1append)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC);
+	rc = (jintLong)g_list_append((GList *)arg0, (gpointer)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1data
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1data)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1data_FUNC);
+	rc = (jintLong)g_list_data((GList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1data_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1free
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC);
+	g_list_free((GList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1free_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1list_1free_11
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1list_1free_11_FUNC);
+	g_list_free_1((GList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1free_11_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1list_1last
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1last)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1last_FUNC);
+	rc = (jintLong)g_list_last((GList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1last_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1length
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1length_FUNC);
+	rc = (jint)g_list_length((GList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1length_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1next
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1next)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC);
+	rc = (jintLong)g_list_next(arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1nth
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1nth_FUNC);
+	rc = (jintLong)g_list_nth((GList *)arg0, (guint)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1nth_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1nth_1data
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth_1data)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1nth_1data_FUNC);
+	rc = (jintLong)g_list_nth_data((GList *)arg0, (guint)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1nth_1data_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1prepend
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1prepend)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1prepend_FUNC);
+	rc = (jintLong)g_list_prepend((GList *)arg0, (gpointer)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1prepend_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1previous
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1previous)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1previous_FUNC);
+	rc = (jintLong)g_list_previous(arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1previous_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1remove_1link
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1remove_1link)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1list_1remove_1link_FUNC);
+	rc = (jintLong)g_list_remove_link((GList *)arg0, (GList *)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1remove_1link_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1list_1set_1next
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1list_1set_1next_FUNC);
+	g_list_set_next((GList *)arg0, (GList *)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1set_1next_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1list_1set_1previous
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1list_1set_1previous_FUNC);
+	g_list_set_previous((GList *)arg0, (GList *)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1list_1set_1previous_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1log_1default_1handler
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1default_1handler)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1log_1default_1handler_FUNC);
+	g_log_default_handler((gchar *)arg0, (GLogLevelFlags)arg1, (gchar *)arg2, (gpointer)arg3);
+	OS_NATIVE_EXIT(env, that, _1g_1log_1default_1handler_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1log_1remove_1handler
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1remove_1handler)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+{
+	jbyte *lparg0=NULL;
+	OS_NATIVE_ENTER(env, that, _1g_1log_1remove_1handler_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	g_log_remove_handler((gchar *)lparg0, (gint)arg1);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1g_1log_1remove_1handler_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1log_1set_1handler
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1log_1set_1handler)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLong arg2, jintLong arg3)
+{
+	jbyte *lparg0=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1log_1set_1handler_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jint)g_log_set_handler((gchar *)lparg0, (GLogLevelFlags)arg1, (GLogFunc)arg2, (gpointer)arg3);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1g_1log_1set_1handler_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1main_1context_1acquire
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1acquire_FUNC);
+	rc = (jboolean)g_main_context_acquire((GMainContext *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1acquire_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1main_1context_1check
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1check_FUNC);
+	rc = (jint)g_main_context_check((GMainContext *)arg0, arg1, (GPollFD *)arg2, arg3);
+	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1check_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1main_1context_1default
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1default)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1default_FUNC);
+	rc = (jintLong)g_main_context_default();
+	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1default_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1main_1context_1get_1poll_1func
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
+	rc = (jintLong)g_main_context_get_poll_func((GMainContext *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1main_1context_1iteration
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1iteration_FUNC);
+	rc = (jboolean)g_main_context_iteration((GMainContext *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1iteration_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1main_1context_1prepare
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1prepare)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
+{
+	jint *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1prepare_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jboolean)g_main_context_prepare((GMainContext *)arg0, (gint *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1prepare_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1main_1context_1query
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1query)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintLong arg3, jint arg4)
+{
+	jint *lparg2=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1query_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jint)g_main_context_query((GMainContext *)arg0, arg1, (gint *)lparg2, (GPollFD *)arg3, arg4);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1query_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1main_1context_1release
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1main_1context_1release_FUNC);
+	g_main_context_release((GMainContext *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1main_1context_1release_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1malloc
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1malloc)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1malloc_FUNC);
+	rc = (jintLong)g_malloc((gulong)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1malloc_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1object_1class_1find_1property
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1class_1find_1property)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1object_1class_1find_1property_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_object_class_find_property((GObjectClass *)arg0, (const gchar *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1object_1class_1find_1property_FUNC);
+	return rc;
+}
+#endif
+
+#if (!defined(NO__1g_1object_1get__I_3B_3II) && !defined(JNI64)) || (!defined(NO__1g_1object_1get__J_3B_3IJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__J_3B_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+	jint *lparg2=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1get__I_3B_3II_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1get__J_3B_3IJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1get__I_3B_3II_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1get__J_3B_3IJ_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1object_1get__I_3B_3JI) && !defined(JNI64)) || (!defined(NO__1g_1object_1get__J_3B_3JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__I_3B_3JI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+	jlong *lparg2=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1get__I_3B_3JI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1get__J_3B_3JJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1get__I_3B_3JI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1get__J_3B_3JJ_FUNC);
+#endif
+}
+#endif
+
+#ifndef NO__1g_1object_1get_1qdata
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1get_1qdata)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1object_1get_1qdata_FUNC);
+	rc = (jintLong)g_object_get_qdata((GObject *)arg0, (GQuark)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1object_1get_1qdata_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1object_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1object_1new_FUNC);
+	rc = (jintLong)g_object_new((GType)arg0, (const gchar *)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1object_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1object_1notify
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1notify)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1g_1object_1notify_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_object_notify((GObject *)arg0, (const gchar *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1object_1notify_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1object_1ref
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1object_1ref_FUNC);
+	rc = (jintLong)g_object_ref((gpointer)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1object_1ref_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1object_1ref_1sink
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref_1sink)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1object_1ref_1sink_FUNC);
+	rc = (jintLong)g_object_ref_sink((GObject *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1object_1ref_1sink_FUNC);
+	return rc;
+}
+#endif
+
+#if (!defined(NO__1g_1object_1set__I_3BFI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BFJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BFJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BFI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BFJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BFI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BFJ_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1object_1set__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BIJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BIJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BIJ_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1object_1set__I_3BJI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BJI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BJI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BJJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BJI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BJJ_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+	GdkColor _arg2, *lparg2=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
+fail:
+	if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+	GdkRGBA _arg2, *lparg2=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail;
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
+fail:
+	if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1object_1set__I_3BZI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BZI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BZJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BZI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BZJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BZI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BZJ_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1object_1set__I_3B_3BI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3B_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3B_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+	jbyte *lparg2=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3B_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3B_3BJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3B_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3B_3BJ_FUNC);
+#endif
+}
+#endif
+
+#ifndef NO__1g_1object_1set_1qdata
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1object_1set_1qdata_FUNC);
+	g_object_set_qdata((GObject *)arg0, (GQuark)arg1, (gpointer)arg2);
+	OS_NATIVE_EXIT(env, that, _1g_1object_1set_1qdata_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1object_1unref
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1unref)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC);
+	g_object_unref((gpointer)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1object_1unref_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1quark_1from_1string
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1quark_1from_1string)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1quark_1from_1string_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jint)g_quark_from_string((const gchar *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1g_1quark_1from_1string_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1set_1prgname
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1set_1prgname)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	OS_NATIVE_ENTER(env, that, _1g_1set_1prgname_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	g_set_prgname((const gchar *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1g_1set_1prgname_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1signal_1add_1emission_1hook
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
+	rc = (jintLong)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1signal_1connect
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
+{
+	jbyte *lparg1=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jint)g_signal_connect((gpointer)arg0, (const gchar *)lparg1, (GCallback)arg2, (gpointer)arg3);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1connect_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1signal_1connect_1closure
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jboolean arg3)
+{
+	jbyte *lparg1=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1closure_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jint)g_signal_connect_closure((gpointer)arg0, (const gchar *)lparg1, (GClosure *)arg2, (gboolean)arg3);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1connect_1closure_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1signal_1connect_1closure_1by_1id
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jboolean arg4)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1closure_1by_1id_FUNC);
+	rc = (jint)g_signal_connect_closure_by_id((gpointer)arg0, (guint)arg1, (GQuark)arg2, (GClosure *)arg3, (gboolean)arg4);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1connect_1closure_1by_1id_FUNC);
+	return rc;
+}
+#endif
+
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#endif
+{
+	jbyte *lparg1=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BI) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+#endif
+{
+	jbyte *lparg1=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
+#endif
+{
+	jbyte *lparg1=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
+#endif
+{
+	jbyte *lparg1=NULL;
+	GdkRectangle _arg2, *lparg2=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = getGdkRectangleFields(env, arg2, &_arg2)) == NULL) goto fail;
+	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2);
+fail:
+	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
+#endif
+{
+	jbyte *lparg1=NULL;
+	jbyte *lparg2=NULL;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
+#endif
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
+#endif
+}
+#endif
+
+#ifndef NO__1g_1signal_1handler_1disconnect
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1disconnect_FUNC);
+	g_signal_handler_disconnect((gpointer)arg0, (gulong)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1handler_1disconnect_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1signal_1handler_1find
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handler_1find)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1find_FUNC);
+	rc = (jint)g_signal_handler_find((gpointer)arg0, arg1, arg2, (GQuark)arg3, (GClosure *)arg4, (gpointer)arg5, (gpointer)arg6);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1handler_1find_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1signal_1handlers_1block_1matched
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1block_1matched_FUNC);
+	rc = (jint)g_signal_handlers_block_matched((gpointer)arg0, (GSignalMatchType)arg1, (guint)arg2, (GQuark)arg3, (GClosure *)arg4, (gpointer)arg5, (gpointer)arg6);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1handlers_1block_1matched_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1signal_1handlers_1unblock_1matched
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1unblock_1matched_FUNC);
+	rc = (jint)g_signal_handlers_unblock_matched((gpointer)arg0, (GSignalMatchType)arg1, (guint)arg2, (GQuark)arg3, (GClosure *)arg4, (gpointer)arg5, (gpointer)arg6);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1handlers_1unblock_1matched_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1signal_1lookup
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1lookup)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
+{
+	jbyte *lparg0=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1lookup_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jint)g_signal_lookup((const gchar *)lparg0, arg1);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1lookup_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1signal_1remove_1emission_1hook
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1remove_1emission_1hook_FUNC);
+	g_signal_remove_emission_hook((guint)arg0, (gulong)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1remove_1emission_1hook_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1signal_1stop_1emission_1by_1name
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1stop_1emission_1by_1name)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1g_1signal_1stop_1emission_1by_1name_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	g_signal_stop_emission_by_name((gpointer)arg0, (const gchar *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1g_1signal_1stop_1emission_1by_1name_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1slist_1append
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1append)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1slist_1append_FUNC);
+	rc = (jintLong)g_slist_append((GSList *)arg0, (gpointer)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1slist_1append_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1slist_1data
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1data)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1slist_1data_FUNC);
+	rc = (jintLong)g_slist_data((GSList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1slist_1data_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1slist_1free
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1slist_1free_FUNC);
+	g_slist_free((GSList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1slist_1free_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1slist_1length
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1slist_1length_FUNC);
+	rc = (jint)g_slist_length((GSList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1slist_1length_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1slist_1next
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1next)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1slist_1next_FUNC);
+	rc = (jintLong)g_slist_next((GSList *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1slist_1next_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1source_1remove
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1source_1remove_FUNC);
+	rc = (jboolean)g_source_remove((guint)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1source_1remove_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1strfreev
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1strfreev_FUNC);
+	g_strfreev((gchar **)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1strfreev_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1string_1free
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1string_1free)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1string_1free_FUNC);
+	rc = (jintLong)g_string_free((GString *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1string_1free_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1string_1new_1len
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1string_1new_1len)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1string_1new_1len_FUNC);
+	rc = (jintLong)g_string_new_len((const gchar *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1string_1new_1len_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1strtod
+JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1strtod)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
+{
+	jintLong *lparg1=NULL;
+	jdouble rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1strtod_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jdouble)g_strtod((const gchar *)arg0, (gchar **)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1strtod_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1thread_1init
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
+/*
+	g_thread_init(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, g_thread_init)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1g_1thread_1init_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1thread_1supported
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported)
+	(JNIEnv *env, jclass that)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC);
+	rc = (jboolean)g_thread_supported();
+	OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1timeout_1add
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1timeout_1add)
+	(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1timeout_1add_FUNC);
+	rc = (jint)g_timeout_add((guint32)arg0, (GSourceFunc)arg1, (gpointer)arg2);
+	OS_NATIVE_EXIT(env, that, _1g_1timeout_1add_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1add_1interface_1static
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1type_1add_1interface_1static_FUNC);
+	g_type_add_interface_static((GType)arg0, (GType)arg1, (const GInterfaceInfo *)arg2);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1add_1interface_1static_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1type_1class_1peek
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_FUNC);
+	rc = (jintLong)g_type_class_peek((GType)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1class_1peek_1parent
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_1parent_FUNC);
+	rc = (jintLong)g_type_class_peek_parent((gpointer)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_1parent_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1class_1ref
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1ref)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1ref_FUNC);
+	rc = (jintLong)g_type_class_ref((GType)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1ref_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1class_1unref
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1class_1unref)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1type_1class_1unref_FUNC);
+	g_type_class_unref((gpointer)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1class_1unref_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1type_1from_1name
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1from_1name)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1from_1name_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_type_from_name((const gchar *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1from_1name_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1interface_1peek_1parent
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
+	rc = (jintLong)g_type_interface_peek_parent((gpointer)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1is_1a
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1is_1a_FUNC);
+	rc = (jboolean)g_type_is_a((GType)arg0, (GType)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1is_1a_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1name
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1name_FUNC);
+	rc = (jintLong)g_type_name((GType)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1name_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1parent
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1parent_FUNC);
+	rc = (jintLong)g_type_parent((GType)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1parent_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1query
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1g_1type_1query_FUNC);
+	g_type_query((GType)arg0, (GTypeQuery *)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1query_FUNC);
+}
+#endif
+
+#ifndef NO__1g_1type_1register_1static
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1register_1static)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3)
+{
+	jbyte *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1type_1register_1static_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1type_1register_1static_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1utf16_1offset_1to_1pointer
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1offset_1to_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1utf16_1offset_1to_1pointer_FUNC);
+	rc = (jintLong)g_utf16_offset_to_pointer((const gchar *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1utf16_1offset_1to_1pointer_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1utf16_1offset_1to_1utf8_1offset
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1offset_1to_1utf8_1offset)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1utf16_1offset_1to_1utf8_1offset_FUNC);
+	rc = (jintLong)g_utf16_offset_to_utf8_offset((const gchar *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1utf16_1offset_1to_1utf8_1offset_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1utf16_1pointer_1to_1offset
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1pointer_1to_1offset)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1utf16_1pointer_1to_1offset_FUNC);
+	rc = (jintLong)g_utf16_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1utf16_1pointer_1to_1offset_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1utf16_1strlen
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1strlen)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1utf16_1strlen_FUNC);
+	rc = (jintLong)g_utf16_strlen((const gchar *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1utf16_1strlen_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1utf16_1to_1utf8
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
+	(JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+{
+	jchar *lparg0=NULL;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1utf16_1to_1utf8_FUNC);
+		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
+		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
+		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+fail:
+		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
+		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
+		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
+		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1g_1utf16_1to_1utf8_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1utf8_1offset_1to_1utf16_1offset
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1utf16_1offset)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1offset_1to_1utf16_1offset_FUNC);
+	rc = (jintLong)g_utf8_offset_to_utf16_offset((const gchar *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1offset_1to_1utf16_1offset_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1utf8_1pointer_1to_1offset
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
+	rc = (jintLong)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1utf8_1strlen
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1strlen)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1strlen_FUNC);
+	rc = (jintLong)g_utf8_strlen((const gchar *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1strlen_FUNC);
+	return rc;
+}
+#endif
+
+#if (!defined(NO__1g_1utf8_1to_1utf16__II_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#endif
+{
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
+#endif
+		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
+		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+fail:
+		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
+		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
+		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
+#endif
+	return rc;
+}
+#endif
+
+#if (!defined(NO__1g_1utf8_1to_1utf16___3BI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#endif
+{
+	jbyte *lparg0=NULL;
+	jintLong *lparg2=NULL;
+	jintLong *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong rc = 0;
+#ifndef JNI64
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
+#endif
+		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
+		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
+		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
+		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+fail:
+		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
+		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
+		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
+		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
+#ifndef JNI64
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
+#else
+	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
+#endif
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1value_1peek_1pointer
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1value_1peek_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1value_1peek_1pointer_FUNC);
+	rc = (jintLong)g_value_peek_pointer((const GValue *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1value_1peek_1pointer_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1get_1boolean
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1variant_1get_1boolean)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1boolean_FUNC);
+	rc = (jboolean)g_variant_get_boolean((GVariant *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1boolean_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1get_1byte
+JNIEXPORT jbyte JNICALL OS_NATIVE(_1g_1variant_1get_1byte)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jbyte rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1byte_FUNC);
+	rc = (jbyte)g_variant_get_byte((GVariant *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1byte_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1get_1child_1value
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1child_1value)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1child_1value_FUNC);
+	rc = (jintLong)g_variant_get_child_value((GVariant *)arg0, (gsize)arg1);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1child_1value_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1get_1double
+JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1variant_1get_1double)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jdouble rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1double_FUNC);
+	rc = (jdouble)g_variant_get_double((GVariant *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1double_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1get_1int32
+JNIEXPORT jint JNICALL OS_NATIVE(_1g_1variant_1get_1int32)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1int32_FUNC);
+	rc = (jint)g_variant_get_int32((GVariant *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1int32_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1get_1string
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1string)
+	(JNIEnv *env, jclass that, jintLong arg0, jlongArray arg1)
+{
+	jlong *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1string_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_variant_get_string((GVariant *)arg0, (gsize *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1string_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1get_1type
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1type)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1type_FUNC);
+	rc = (jintLong)g_variant_get_type((GVariant *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1type_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1get_1type_1string
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1get_1type_1string)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1get_1type_1string_FUNC);
+	rc = (jintLong)g_variant_get_type_string((GVariant *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1get_1type_1string_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1is_1of_1type
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1variant_1is_1of_1type)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1is_1of_1type_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jboolean)g_variant_is_of_type((GVariant *)arg0, (const GVariantType *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1is_1of_1type_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1n_1children
+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1n_1children)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1n_1children_FUNC);
+	rc = (jlong)g_variant_n_children((GVariant *)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1n_1children_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1new_1boolean
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1boolean)
+	(JNIEnv *env, jclass that, jboolean arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1boolean_FUNC);
+	rc = (jintLong)g_variant_new_boolean((gboolean)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1boolean_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1new_1byte
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1byte)
+	(JNIEnv *env, jclass that, jbyte arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1byte_FUNC);
+	rc = (jintLong)g_variant_new_byte((guchar)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1byte_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1new_1double
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1double)
+	(JNIEnv *env, jclass that, jdouble arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1double_FUNC);
+	rc = (jintLong)g_variant_new_double((gboolean)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1double_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1new_1int32
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1int32)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1int32_FUNC);
+	rc = (jintLong)g_variant_new_int32((gint32)arg0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1int32_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1new_1string
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1string)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1string_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_variant_new_string((const gchar *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1string_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1g_1variant_1new_1tuple
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1variant_1new_1tuple)
+	(JNIEnv *env, jclass that, jintLongArray arg0, jlong arg1)
+{
+	jintLong *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1tuple_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)g_variant_new_tuple((GVariant * const *)lparg0, (gsize)arg1);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1tuple_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1atom_1intern
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1intern)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1atom_1intern_FUNC);
+		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)gdk_atom_intern((const gchar *)lparg0, arg1);
+fail:
+		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1gdk_1atom_1intern_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1atom_1name
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1atom_1name_FUNC);
+	rc = (jintLong)gdk_atom_name((GdkAtom)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1atom_1name_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1beep
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1beep)
+	(JNIEnv *env, jclass that)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1beep_FUNC);
+	gdk_beep();
+	OS_NATIVE_EXIT(env, that, _1gdk_1beep_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1bitmap_1create_1from_1data
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
+{
+	jbyte *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
+		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_bitmap_create_from_data)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, const gchar *, gint, gint))fp)((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
+		}
+	}
+fail:
+		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, JNI_ABORT);
+	OS_NATIVE_EXIT(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1create
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cairo_1create)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1create_FUNC);
+/*
+	rc = (jintLong)gdk_cairo_create(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_create)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1create_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1get_1clip_1rectangle
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1cairo_1get_1clip_1rectangle)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkRectangle _arg1, *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1get_1clip_1rectangle_FUNC);
+	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
+/*
+	rc = (jboolean)gdk_cairo_get_clip_rectangle(arg0, lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_get_clip_rectangle)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, GdkRectangle *))fp)(arg0, lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1get_1clip_1rectangle_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1region
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_FUNC);
+/*
+	gdk_cairo_region(arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_region)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1region_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1region_1create_1from_1surface
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cairo_1region_1create_1from_1surface)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_1create_1from_1surface_FUNC);
+/*
+	rc = (jintLong)gdk_cairo_region_create_from_surface(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_region_create_from_surface)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1region_1create_1from_1surface_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1reset_1clip
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1reset_1clip)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1reset_1clip_FUNC);
+/*
+	gdk_cairo_reset_clip(arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_reset_clip)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1reset_1clip_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1set_1source_1color
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkColor _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1color_FUNC);
+	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
+/*
+	gdk_cairo_set_source_color(arg0, lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_color)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1color_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1set_1source_1pixbuf
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1pixbuf)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1pixbuf_FUNC);
+/*
+	gdk_cairo_set_source_pixbuf(arg0, (const GdkPixbuf *)arg1, arg2, arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_pixbuf)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, const GdkPixbuf *, jdouble, jdouble))fp)(arg0, (const GdkPixbuf *)arg1, arg2, arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1pixbuf_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1set_1source_1pixmap
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1pixmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1pixmap_FUNC);
+/*
+	gdk_cairo_set_source_pixmap(arg0, arg1, arg2, arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_pixmap)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jdouble, jdouble))fp)(arg0, arg1, arg2, arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1pixmap_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1set_1source_1rgba
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1rgba)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkRGBA _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1rgba_FUNC);
+	if (arg1) if ((lparg1 = getGdkRGBAFields(env, arg1, &_arg1)) == NULL) goto fail;
+/*
+	gdk_cairo_set_source_rgba(arg0, lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_rgba)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, GdkRGBA *))fp)(arg0, lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) setGdkRGBAFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1rgba_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1cairo_1set_1source_1window
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1window)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1window_FUNC);
+/*
+	gdk_cairo_set_source_window(arg0, (GdkWindow *)arg1, arg2, arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cairo_set_source_window)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, GdkWindow *, jint, jint))fp)(arg0, (GdkWindow *)arg1, arg2, arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1set_1source_1window_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1color_1free
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1color_1free)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1color_1free_FUNC);
+/*
+	gdk_color_free((GdkColor *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_color_free)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkColor *))fp)((GdkColor *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1color_1free_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1color_1parse
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1color_1parse)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jobject arg1)
+{
+	jbyte *lparg0=NULL;
+	GdkColor _arg1, *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1color_1parse_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
+/*
+	rc = (jboolean)gdk_color_parse((const gchar *)lparg0, (GdkColor *)lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_color_parse)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(const gchar *, GdkColor *))fp)((const gchar *)lparg0, (GdkColor *)lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1color_1parse_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1color_1white
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1color_1white)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkColor _arg1, *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1color_1white_FUNC);
+	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
+/*
+	rc = (jboolean)gdk_color_white(arg0, lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_color_white)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1color_1white_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1colormap_1alloc_1color
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1colormap_1alloc_1color)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2, jboolean arg3)
+{
+	GdkColor _arg1, *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1alloc_1color_FUNC);
+	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
+/*
+	rc = (jboolean)gdk_colormap_alloc_color(arg0, (GdkColor *)lparg1, (gboolean)arg2, (gboolean)arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_colormap_alloc_color)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, GdkColor *, gboolean, gboolean))fp)(arg0, (GdkColor *)lparg1, (gboolean)arg2, (gboolean)arg3);
+		}
+	}
+fail:
+	if (arg1 && lparg1) setGdkColorFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1alloc_1color_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1colormap_1free_1colors
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1colormap_1free_1colors)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+{
+	GdkColor _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1free_1colors_FUNC);
+	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
+/*
+	gdk_colormap_free_colors(arg0, (GdkColor *)lparg1, (gint)arg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_colormap_free_colors)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, GdkColor *, gint))fp)(arg0, (GdkColor *)lparg1, (gint)arg2);
+		}
+	}
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1free_1colors_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1colormap_1get_1system
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1get_1system_FUNC);
+/*
+	rc = (jintLong)gdk_colormap_get_system();
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_colormap_get_system)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1get_1system_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cursor_1new_1for_1display
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1for_1display)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1for_1display_FUNC);
+	rc = (jintLong)gdk_cursor_new_for_display((GdkDisplay *)arg0, (GdkCursorType)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1for_1display_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cursor_1new_1from_1name
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1name)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1name_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)gdk_cursor_new_from_name((GdkDisplay *)arg0, (const gchar *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1name_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cursor_1new_1from_1pixbuf
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
+/*
+	rc = (jintLong)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cursor_new_from_pixbuf)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cursor_1new_1from_1pixmap
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jint arg4, jint arg5)
+{
+	GdkColor _arg2, *lparg2=NULL;
+	GdkColor _arg3, *lparg3=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
+	if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_cursor_new_from_pixmap(arg0, arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cursor_new_from_pixmap)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, GdkColor *, GdkColor *, gint, gint))fp)(arg0, arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
+		}
+	}
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1cursor_1unref
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cursor_1unref)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1unref_FUNC);
+/*
+	gdk_cursor_unref(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_cursor_unref)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1unref_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1device_1get_1associated_1device
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1device_1get_1associated_1device)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1device_1get_1associated_1device_FUNC);
+/*
+	rc = (jintLong)gdk_device_get_associated_device((GdkDevice *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_device_get_associated_device)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDevice *))fp)((GdkDevice *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1device_1get_1associated_1device_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1device_1get_1window_1at_1position
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1device_1get_1window_1at_1position)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1device_1get_1window_1at_1position_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_device_get_window_at_position(arg0, (gint *)lparg1, (gint *)lparg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_device_get_window_at_position)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint *, gint *))fp)(arg0, (gint *)lparg1, (gint *)lparg2);
+		}
+	}
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1device_1get_1window_1at_1position_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1device_1grab
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1device_1grab)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jint arg4, jintLong arg5, jint arg6)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1device_1grab_FUNC);
+/*
+	rc = (jint)gdk_device_grab((GdkDevice *)arg0, (GdkWindow *)arg1, arg2, (gboolean)arg3, (GdkEventMask)arg4, (GdkCursor *)arg5, (guint32)arg6);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_device_grab)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkDevice *, GdkWindow *, jint, gboolean, GdkEventMask, GdkCursor *, guint32))fp)((GdkDevice *)arg0, (GdkWindow *)arg1, arg2, (gboolean)arg3, (GdkEventMask)arg4, (GdkCursor *)arg5, (guint32)arg6);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1device_1grab_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1device_1manager_1get_1client_1pointer
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1device_1manager_1get_1client_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1device_1manager_1get_1client_1pointer_FUNC);
+/*
+	rc = (jintLong)gdk_device_manager_get_client_pointer(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_device_manager_get_client_pointer)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1device_1manager_1get_1client_1pointer_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1device_1ungrab
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1device_1ungrab)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1device_1ungrab_FUNC);
+/*
+	gdk_device_ungrab((GdkDevice *)arg0, (guint32)arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_device_ungrab)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkDevice *, guint32))fp)((GdkDevice *)arg0, (guint32)arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1device_1ungrab_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1device_1warp
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1device_1warp)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1device_1warp_FUNC);
+/*
+	gdk_device_warp(arg0, arg1, arg2, arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_device_warp)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1device_1warp_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1display_1get_1default
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_FUNC);
+/*
+	rc = (jintLong)gdk_display_get_default();
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_display_get_default)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1display_1get_1default_1seat
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1default_1seat)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_1seat_FUNC);
+/*
+	rc = (jintLong)gdk_display_get_default_seat(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_display_get_default_seat)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_1seat_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1display_1get_1device_1manager
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1device_1manager)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1device_1manager_FUNC);
+/*
+	rc = (jintLong)gdk_display_get_device_manager((GdkDisplay *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_display_get_device_manager)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDisplay *))fp)((GdkDisplay *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1device_1manager_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1display_1supports_1cursor_1color
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
+/*
+	rc = (jboolean)gdk_display_supports_cursor_color(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_display_supports_cursor_color)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1display_1warp_1pointer
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1display_1warp_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1display_1warp_1pointer_FUNC);
+/*
+	gdk_display_warp_pointer(arg0, arg1, arg2, arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_display_warp_pointer)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1display_1warp_1pointer_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1drag_1context_1get_1actions
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drag_1context_1get_1actions)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1actions_FUNC);
+/*
+	rc = (jint)gdk_drag_context_get_actions((GdkDragContext *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_drag_context_get_actions)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkDragContext *))fp)((GdkDragContext *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1get_1actions_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1drag_1context_1get_1dest_1window
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drag_1context_1get_1dest_1window)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1dest_1window_FUNC);
+/*
+	rc = (jintLong)gdk_drag_context_get_dest_window((GdkDragContext *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_drag_context_get_dest_window)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDragContext *))fp)((GdkDragContext *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1get_1dest_1window_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1drag_1context_1get_1selected_1action
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drag_1context_1get_1selected_1action)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1get_1selected_1action_FUNC);
+/*
+	rc = (jint)gdk_drag_context_get_selected_action((GdkDragContext *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_drag_context_get_selected_action)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkDragContext *))fp)((GdkDragContext *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1get_1selected_1action_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1drag_1context_1list_1targets
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drag_1context_1list_1targets)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1context_1list_1targets_FUNC);
+/*
+	rc = (jintLong)gdk_drag_context_list_targets((GdkDragContext *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_drag_context_list_targets)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDragContext *))fp)((GdkDragContext *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1context_1list_1targets_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1drag_1status
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drag_1status)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1drag_1status_FUNC);
+	gdk_drag_status((GdkDragContext *)arg0, (GdkDragAction)arg1, (guint32)arg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1drag_1status_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1draw_1arc
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1arc)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1arc_FUNC);
+/*
+	gdk_draw_arc(arg0, arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_draw_arc)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, gint, gint, gint, gint, gint, gint, gint))fp)(arg0, arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1arc_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1draw_1image
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1image)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1image_FUNC);
+/*
+	gdk_draw_image(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_draw_image)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1image_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1draw_1pixbuf
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1pixbuf_FUNC);
+/*
+	gdk_draw_pixbuf(arg0, arg1, arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, arg9, (gint)arg10, (gint)arg11);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_draw_pixbuf)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, gint, gint, gint, gint, gint, gint, jint, gint, gint))fp)(arg0, arg1, arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, arg9, (gint)arg10, (gint)arg11);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1pixbuf_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1draw_1rectangle
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1rectangle)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1draw_1rectangle_FUNC);
+/*
+	gdk_draw_rectangle(arg0, arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_draw_rectangle)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong, gint, gint, gint, gint, gint))fp)(arg0, arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1draw_1rectangle_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1drawable_1get_1depth
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1depth)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1depth_FUNC);
+/*
+	rc = (jint)gdk_drawable_get_depth(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_drawable_get_depth)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1depth_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1drawable_1get_1image
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1image_FUNC);
+/*
+	rc = (jintLong)gdk_drawable_get_image(arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_drawable_get_image)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint, gint, gint, gint))fp)(arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1image_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1drawable_1get_1visible_1region
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1visible_1region)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
+/*
+	rc = (jintLong)gdk_drawable_get_visible_region(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_drawable_get_visible_region)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1error_1trap_1pop
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1error_1trap_1pop)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1error_1trap_1pop_FUNC);
+	rc = (jint)gdk_error_trap_pop();
+	OS_NATIVE_EXIT(env, that, _1gdk_1error_1trap_1pop_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1error_1trap_1push
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1error_1trap_1push)
+	(JNIEnv *env, jclass that)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1error_1trap_1push_FUNC);
+	gdk_error_trap_push();
+	OS_NATIVE_EXIT(env, that, _1gdk_1error_1trap_1push_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1event_1copy
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1copy)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1copy_FUNC);
+	rc = (jintLong)gdk_event_copy((GdkEvent *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1copy_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1free
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1free)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1free_FUNC);
+	gdk_event_free((GdkEvent *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1free_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1event_1get
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1get)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_FUNC);
+	rc = (jintLong)gdk_event_get();
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1get_1coords
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1coords)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
+{
+	jdouble *lparg1=NULL;
+	jdouble *lparg2=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1coords_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jboolean)gdk_event_get_coords((GdkEvent *)arg0, (gdouble *)lparg1, (gdouble *)lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1coords_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1get_1event_1type
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1event_1type)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1event_1type_FUNC);
+/*
+	rc = (jint)gdk_event_get_event_type((GdkEvent *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_event_get_event_type)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkEvent *))fp)((GdkEvent *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1event_1type_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1get_1scroll_1deltas
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1scroll_1deltas)
+	(JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
+{
+	jdouble *lparg1=NULL;
+	jdouble *lparg2=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1scroll_1deltas_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
+/*
+	rc = (jboolean)gdk_event_get_scroll_deltas((GdkEvent *)arg0, lparg1, lparg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_event_get_scroll_deltas)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkEvent *, jdouble *, jdouble *))fp)((GdkEvent *)arg0, lparg1, lparg2);
+		}
+	}
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1scroll_1deltas_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1get_1seat
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1get_1seat)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1seat_FUNC);
+/*
+	rc = (jintLong)gdk_event_get_seat(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_event_get_seat)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1seat_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1get_1state
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1state)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
+{
+	jint *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1state_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jboolean)gdk_event_get_state((GdkEvent *)arg0, (GdkModifierType *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1state_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1get_1time
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1time)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1time_FUNC);
+	rc = (jint)gdk_event_get_time((GdkEvent *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1time_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1handler_1set
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1handler_1set)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1handler_1set_FUNC);
+	gdk_event_handler_set((GdkEventFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1handler_1set_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1event_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1new)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1new_FUNC);
+	rc = (jintLong)gdk_event_new(arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1peek
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1peek)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1peek_FUNC);
+	rc = (jintLong)gdk_event_peek();
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1peek_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1event_1put
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1put)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1event_1put_FUNC);
+	gdk_event_put((GdkEvent *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1event_1put_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1flush
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1flush)
+	(JNIEnv *env, jclass that)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1flush_FUNC);
+	gdk_flush();
+	OS_NATIVE_EXIT(env, that, _1gdk_1flush_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1gc_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1gc_1new)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1new_FUNC);
+/*
+	rc = (jintLong)gdk_gc_new(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_gc_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1gc_1set_1fill
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1fill)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1fill_FUNC);
+/*
+	gdk_gc_set_fill(arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_gc_set_fill)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1fill_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1gc_1set_1foreground
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1foreground)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkColor _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1foreground_FUNC);
+	if (arg1) if ((lparg1 = getGdkColorFields(env, arg1, &_arg1)) == NULL) goto fail;
+/*
+	gdk_gc_set_foreground(arg0, lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_gc_set_foreground)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
+		}
+	}
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1foreground_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1gc_1set_1function
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1function)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1function_FUNC);
+/*
+	gdk_gc_set_function(arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_gc_set_function)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1function_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1gc_1set_1stipple
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1stipple)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1stipple_FUNC);
+/*
+	gdk_gc_set_stipple(arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_gc_set_stipple)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1stipple_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1gc_1set_1subwindow
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1subwindow)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1subwindow_FUNC);
+/*
+	gdk_gc_set_subwindow(arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_gc_set_subwindow)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1gc_1set_1subwindow_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1get_1default_1root_1window
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1get_1default_1root_1window)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1get_1default_1root_1window_FUNC);
+	rc = (jintLong)gdk_get_default_root_window();
+	OS_NATIVE_EXIT(env, that, _1gdk_1get_1default_1root_1window_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1keyboard_1ungrab
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1keyboard_1ungrab)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1keyboard_1ungrab_FUNC);
+/*
+	gdk_keyboard_ungrab(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_keyboard_ungrab)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jint))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1keyboard_1ungrab_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1keymap_1get_1default
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1default_FUNC);
+	rc = (jintLong)gdk_keymap_get_default();
+	OS_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1default_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1keymap_1get_1entries_1for_1keyval
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1keymap_1get_1entries_1for_1keyval)
+	(JNIEnv *env, jclass that, jintLong arg0, jlong arg1, jintLongArray arg2, jintArray arg3)
+{
+	jintLong *lparg2=NULL;
+	jint *lparg3=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1entries_1for_1keyval_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	rc = (jboolean)gdk_keymap_get_entries_for_keyval((GdkKeymap*)arg0, (guint)arg1, (GdkKeymapKey**)lparg2, (gint*)lparg3);
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1entries_1for_1keyval_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1keyval_1to_1lower
+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1keyval_1to_1lower)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1keyval_1to_1lower_FUNC);
+	rc = (jlong)gdk_keyval_to_lower(arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1keyval_1to_1lower_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1keyval_1to_1unicode
+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1keyval_1to_1unicode)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1keyval_1to_1unicode_FUNC);
+	rc = (jlong)gdk_keyval_to_unicode(arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1keyval_1to_1unicode_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pango_1context_1get
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1get_FUNC);
+	rc = (jintLong)gdk_pango_context_get();
+	OS_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1get_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pango_1layout_1get_1clip_1region
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
+{
+	jint *lparg3=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
+	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	rc = (jintLong)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, (gint *)lparg3, arg4);
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1copy_1area
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1copy_1area)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1copy_1area_FUNC);
+	gdk_pixbuf_copy_area((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, (GdkPixbuf *)arg5, arg6, arg7);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1copy_1area_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1get_1from_1drawable
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
+/*
+	rc = (jintLong)gdk_pixbuf_get_from_drawable((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_pixbuf_get_from_drawable)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkPixbuf *, jintLong, jintLong, jint, jint, jint, jint, jint, jint))fp)((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1get_1from_1window
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1window)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1from_1window_FUNC);
+/*
+	rc = (jintLong)gdk_pixbuf_get_from_window((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_pixbuf_get_from_window)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, gint, gint, gint, gint))fp)((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1from_1window_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1get_1has_1alpha
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1has_1alpha_FUNC);
+	rc = (jboolean)gdk_pixbuf_get_has_alpha((const GdkPixbuf *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1has_1alpha_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1get_1height
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1height)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1height_FUNC);
+	rc = (jint)gdk_pixbuf_get_height((const GdkPixbuf *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1height_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1get_1pixels
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
+	rc = (jintLong)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1get_1rowstride
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1rowstride)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1rowstride_FUNC);
+	rc = (jint)gdk_pixbuf_get_rowstride((const GdkPixbuf *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1rowstride_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1get_1width
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1width)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1width_FUNC);
+	rc = (jint)gdk_pixbuf_get_width((const GdkPixbuf *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1width_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1loader_1close
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1close)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
+{
+	jintLong *lparg1=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jboolean)gdk_pixbuf_loader_close((GdkPixbufLoader *)arg0, (GError **)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1loader_1get_1pixbuf
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
+	rc = (jintLong)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1loader_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
+	rc = (jintLong)gdk_pixbuf_loader_new();
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1loader_1write
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1write)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3)
+{
+	jintLong *lparg3=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
+	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	rc = (jboolean)gdk_pixbuf_loader_write((GdkPixbufLoader *)arg0, (const guchar *)arg1, (gsize)arg2, (GError **)lparg3);
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new)
+	(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_FUNC);
+	rc = (jintLong)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1new_1from_1file
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new_1from_1file)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
+{
+	jbyte *lparg0=NULL;
+	jintLong *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jintLong)gdk_pixbuf_new_from_file((const char *)lparg0, (GError**)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1save_1to_1bufferv
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1bufferv)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jbyteArray arg3, jintLongArray arg4, jintLongArray arg5, jintLongArray arg6)
+{
+	jintLong *lparg1=NULL;
+	jintLong *lparg2=NULL;
+	jbyte *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jintLong *lparg5=NULL;
+	jintLong *lparg6=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1save_1to_1bufferv_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+/*
+	rc = (jboolean)gdk_pixbuf_save_to_bufferv((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (char **)lparg4, (char **)lparg5, (GError **)lparg6);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_pixbuf_save_to_bufferv)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkPixbuf *, gchar **, gsize *, const char *, char **, char **, GError **))fp)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (char **)lparg4, (char **)lparg5, (GError **)lparg6);
+		}
+	}
+fail:
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
+	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1save_1to_1bufferv_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixbuf_1scale_1simple
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
+	rc = (jintLong)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pixmap_1get_1size
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixmap_1get_1size)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1get_1size_FUNC);
+		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
+		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
+/*
+	gdk_pixmap_get_size(arg0, (gint *)lparg1, (gint *)lparg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_pixmap_get_size)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, gint *, gint *))fp)(arg0, (gint *)lparg1, (gint *)lparg2);
+		}
+	}
+fail:
+		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
+		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1get_1size_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1pixmap_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1new_FUNC);
+/*
+	rc = (jintLong)gdk_pixmap_new((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_pixmap_new)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, gint, gint, gint))fp)((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pointer_1grab
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pointer_1grab)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jint arg2, jintLong arg3, jintLong arg4, jint arg5)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1pointer_1grab_FUNC);
+/*
+	rc = (jint)gdk_pointer_grab((GdkWindow *)arg0, (gboolean)arg1, (GdkEventMask)arg2, (GdkWindow *)arg3, (GdkCursor *)arg4, (guint32)arg5);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_pointer_grab)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkWindow *, gboolean, GdkEventMask, GdkWindow *, GdkCursor *, guint32))fp)((GdkWindow *)arg0, (gboolean)arg1, (GdkEventMask)arg2, (GdkWindow *)arg3, (GdkCursor *)arg4, (guint32)arg5);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1pointer_1grab_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1pointer_1ungrab
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pointer_1ungrab)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1pointer_1ungrab_FUNC);
+/*
+	gdk_pointer_ungrab((guint32)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_pointer_ungrab)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(guint32))fp)((guint32)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1pointer_1ungrab_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1property_1get
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1property_1get)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jintLongArray arg6, jintArray arg7, jintArray arg8, jintLongArray arg9)
+{
+	jintLong *lparg6=NULL;
+	jint *lparg7=NULL;
+	jint *lparg8=NULL;
+	jintLong *lparg9=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1property_1get_FUNC);
+	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
+	if (arg9) if ((lparg9 = (*env)->GetIntLongArrayElements(env, arg9, NULL)) == NULL) goto fail;
+	rc = (jboolean)gdk_property_get((GdkWindow *)arg0, (GdkAtom)arg1, (GdkAtom)arg2, arg3, arg4, arg5, (GdkAtom *)lparg6, (gint *)lparg7, (gint *)lparg8, (guchar **)lparg9);
+fail:
+	if (arg9 && lparg9) (*env)->ReleaseIntLongArrayElements(env, arg9, lparg9, 0);
+	if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
+	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
+	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1property_1get_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1region_1destroy
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1destroy)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1destroy_FUNC);
+	gdk_region_destroy((GdkRegion *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1destroy_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1region_1empty
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1empty)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1empty_FUNC);
+	rc = (jboolean)gdk_region_empty((GdkRegion *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1empty_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1region_1get_1clipbox
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1clipbox)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkRectangle _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1clipbox_FUNC);
+	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
+	gdk_region_get_clipbox((GdkRegion *)arg0, (GdkRectangle *)lparg1);
+fail:
+	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1get_1clipbox_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1region_1get_1rectangles
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1rectangles)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
+{
+	jintLong *lparg1=NULL;
+	jint *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1rectangles_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+/*
+	gdk_region_get_rectangles(arg0, lparg1, (gint *)lparg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_region_get_rectangles)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong *, gint *))fp)(arg0, lparg1, (gint *)lparg2);
+		}
+	}
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1get_1rectangles_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1region_1intersect
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1intersect)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1intersect_FUNC);
+	gdk_region_intersect((GdkRegion *)arg0, (GdkRegion *)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1intersect_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1region_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1new)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1new_FUNC);
+	rc = (jintLong)gdk_region_new();
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1region_1offset
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1offset)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1offset_FUNC);
+	gdk_region_offset((GdkRegion *)arg0, (gint)arg1, (gint)arg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1offset_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1region_1point_1in
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1point_1in)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1point_1in_FUNC);
+	rc = (jboolean)gdk_region_point_in((GdkRegion *)arg0, (gint)arg1, (gint)arg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1point_1in_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1region_1polygon
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1polygon)
+	(JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
+{
+	jint *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1polygon_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_region_polygon(lparg0, arg1, arg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_region_polygon)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jint *, jint, jint))fp)(lparg0, arg1, arg2);
+		}
+	}
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1polygon_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1region_1rect_1in
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1rect_1in)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkRectangle _arg1, *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1rect_1in_FUNC);
+	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
+	rc = (jintLong)gdk_region_rect_in((GdkRegion *)arg0, (GdkRectangle *)lparg1);
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1rect_1in_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1region_1rectangle
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1rectangle)
+	(JNIEnv *env, jclass that, jobject arg0)
+{
+	GdkRectangle _arg0, *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1rectangle_FUNC);
+	if (arg0) if ((lparg0 = getGdkRectangleFields(env, arg0, &_arg0)) == NULL) goto fail;
+	rc = (jintLong)gdk_region_rectangle(lparg0);
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1rectangle_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1region_1subtract
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1subtract)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1subtract_FUNC);
+	gdk_region_subtract((GdkRegion *)arg0, (GdkRegion *)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1subtract_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1region_1union
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_FUNC);
+	gdk_region_union((GdkRegion *)arg0, (GdkRegion *)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1union_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1region_1union_1with_1rect
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union_1with_1rect)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkRectangle _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_1with_1rect_FUNC);
+	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
+	gdk_region_union_with_rect((GdkRegion *)arg0, (GdkRectangle *)lparg1);
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1region_1union_1with_1rect_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1rgba_1free
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1rgba_1free)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1rgba_1free_FUNC);
+/*
+	gdk_rgba_free((GdkRGBA *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_rgba_free)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1rgba_1free_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1rgba_1hash
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1rgba_1hash)
+	(JNIEnv *env, jclass that, jobject arg0)
+{
+	GdkRGBA _arg0, *lparg0=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1rgba_1hash_FUNC);
+	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
+/*
+	rc = (jint)gdk_rgba_hash((GdkRGBA *)lparg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_rgba_hash)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)lparg0);
+		}
+	}
+fail:
+	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1rgba_1hash_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1rgba_1parse
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1rgba_1parse)
+	(JNIEnv *env, jclass that, jobject arg0, jbyteArray arg1)
+{
+	GdkRGBA _arg0, *lparg0=NULL;
+	jbyte *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1rgba_1parse_FUNC);
+	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_rgba_parse((GdkRGBA *)lparg0, (const gchar *)lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_rgba_parse)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkRGBA *, const gchar *))fp)((GdkRGBA *)lparg0, (const gchar *)lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1rgba_1parse_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1rgba_1to_1string
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1rgba_1to_1string)
+	(JNIEnv *env, jclass that, jobject arg0)
+{
+	GdkRGBA _arg0, *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1rgba_1to_1string_FUNC);
+	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_rgba_to_string((GdkRGBA *)lparg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_rgba_to_string)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkRGBA *))fp)((GdkRGBA *)lparg0);
+		}
+	}
+fail:
+	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1rgba_1to_1string_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1active_1window
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1active_1window)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1active_1window_FUNC);
+	rc = (jintLong)gdk_screen_get_active_window((GdkScreen *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1active_1window_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1default
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1default_FUNC);
+/*
+	rc = (jintLong)gdk_screen_get_default();
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_default)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1default_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1monitor_1at_1point
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
+/*
+	rc = (jint)gdk_screen_get_monitor_at_point((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_point)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, gint, gint))fp)((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1monitor_1at_1window
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
+/*
+	rc = (jint)gdk_screen_get_monitor_at_window((GdkScreen *)arg0, (GdkWindow *)arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_window)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, GdkWindow *))fp)((GdkScreen *)arg0, (GdkWindow *)arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1monitor_1geometry
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+{
+	GdkRectangle _arg2, *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1geometry_FUNC);
+	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
+/*
+	gdk_screen_get_monitor_geometry((GdkScreen *)arg0, arg1, lparg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_geometry)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkScreen *, jint, GdkRectangle *))fp)((GdkScreen *)arg0, arg1, lparg2);
+		}
+	}
+fail:
+	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1geometry_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1monitor_1scale_1factor
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1scale_1factor)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1scale_1factor_FUNC);
+/*
+	rc = (jint)gdk_screen_get_monitor_scale_factor((GdkScreen *)arg0, (gint)arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_scale_factor)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, gint))fp)((GdkScreen *)arg0, (gint)arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1scale_1factor_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1monitor_1width_1mm
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1width_1mm)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1width_1mm_FUNC);
+/*
+	rc = (jint)gdk_screen_get_monitor_width_mm((GdkScreen *)arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_width_mm)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, jint))fp)((GdkScreen *)arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1width_1mm_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1monitor_1workarea
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1workarea)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+{
+	GdkRectangle _arg2, *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1workarea_FUNC);
+	if (arg2) if ((lparg2 = &_arg2) == NULL) goto fail;
+/*
+	gdk_screen_get_monitor_workarea((GdkScreen *)arg0, arg1, lparg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_monitor_workarea)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkScreen *, jint, GdkRectangle *))fp)((GdkScreen *)arg0, arg1, lparg2);
+		}
+	}
+fail:
+	if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1workarea_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1n_1monitors
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
+/*
+	rc = (jint)gdk_screen_get_n_monitors((GdkScreen *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_n_monitors)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1primary_1monitor
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1primary_1monitor)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1primary_1monitor_FUNC);
+/*
+	rc = (jint)gdk_screen_get_primary_monitor((GdkScreen *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_primary_monitor)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1primary_1monitor_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1get_1resolution
+JNIEXPORT jdouble JNICALL OS_NATIVE(_1gdk_1screen_1get_1resolution)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jdouble rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1resolution_FUNC);
+/*
+	rc = (jdouble)gdk_screen_get_resolution((GdkScreen *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_screen_get_resolution)
+		if (fp) {
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1resolution_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1height
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1height)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1height_FUNC);
+	rc = (jint)gdk_screen_height();
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1height_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1width
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1width)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1width_FUNC);
+	rc = (jint)gdk_screen_width();
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1width_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1screen_1width_1mm
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1width_1mm)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1screen_1width_1mm_FUNC);
+	rc = (jint)gdk_screen_width_mm();
+	OS_NATIVE_EXIT(env, that, _1gdk_1screen_1width_1mm_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1seat_1get_1pointer
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1seat_1get_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1seat_1get_1pointer_FUNC);
+/*
+	rc = (jintLong)gdk_seat_get_pointer(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_seat_get_pointer)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1seat_1get_1pointer_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1seat_1grab
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1seat_1grab)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1seat_1grab_FUNC);
+/*
+	rc = (jint)gdk_seat_grab(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_seat_grab)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jint, jboolean, jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1seat_1grab_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1seat_1ungrab
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1seat_1ungrab)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1seat_1ungrab_FUNC);
+/*
+	gdk_seat_ungrab(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_seat_ungrab)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1seat_1ungrab_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1selection_1owner_1get
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1selection_1owner_1get)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1selection_1owner_1get_FUNC);
+	gdk_selection_owner_get((GdkAtom)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1selection_1owner_1get_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1selection_1owner_1set
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1selection_1owner_1set)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1selection_1owner_1set_FUNC);
+	gdk_selection_owner_set((GdkWindow *)arg0, (GdkAtom)arg1, (guint32)arg2, (gboolean)arg3);
+	OS_NATIVE_EXIT(env, that, _1gdk_1selection_1owner_1set_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1set_1program_1class
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1set_1program_1class)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1set_1program_1class_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	gdk_set_program_class((const char *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1set_1program_1class_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1test_1simulate_1button
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1test_1simulate_1button)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1test_1simulate_1button_FUNC);
+	rc = (jboolean)gdk_test_simulate_button((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (guint)arg3, (GdkModifierType)arg4, (GdkEventType)arg5);
+	OS_NATIVE_EXIT(env, that, _1gdk_1test_1simulate_1button_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1text_1property_1to_1utf8_1list_1for_1display
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1text_1property_1to_1utf8_1list_1for_1display)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLongArray arg5)
+{
+	jintLong *lparg5=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC);
+	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	rc = (jint)gdk_text_property_to_utf8_list_for_display((GdkDisplay *)arg0, (GdkAtom)arg1, arg2, (guchar *)arg3, arg4, (gchar ***)lparg5);
+fail:
+	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1unicode_1to_1keyval
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1unicode_1to_1keyval)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1unicode_1to_1keyval_FUNC);
+	rc = (jint)gdk_unicode_to_keyval(arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1unicode_1to_1keyval_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1utf8_1to_1string_1target
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1utf8_1to_1string_1target)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	rc = (jintLong)gdk_utf8_to_string_target((const gchar *)lparg0);
+fail:
+	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1visual_1get_1depth
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1visual_1get_1depth)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1visual_1get_1depth_FUNC);
+/*
+	rc = (jint)gdk_visual_get_depth((GdkVisual *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_visual_get_depth)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkVisual *))fp)((GdkVisual *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1visual_1get_1depth_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1visual_1get_1system
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1visual_1get_1system_FUNC);
+	rc = (jintLong)gdk_visual_get_system();
+	OS_NATIVE_EXIT(env, that, _1gdk_1visual_1get_1system_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1add_1filter
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1add_1filter)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1add_1filter_FUNC);
+	gdk_window_add_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1add_1filter_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1at_1pointer
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1at_1pointer)
+	(JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
+{
+	jint *lparg0=NULL;
+	jint *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1at_1pointer_FUNC);
+	if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_window_at_pointer((gint *)lparg0, (gint *)lparg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_at_pointer)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gint *, gint *))fp)((gint *)lparg0, (gint *)lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1at_1pointer_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1begin_1paint_1rect
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1begin_1paint_1rect)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkRectangle _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1begin_1paint_1rect_FUNC);
+	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
+	gdk_window_begin_paint_rect((GdkWindow *)arg0, (GdkRectangle *)lparg1);
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1begin_1paint_1rect_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1create_1similar_1surface
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1create_1similar_1surface)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1create_1similar_1surface_FUNC);
+/*
+	rc = (jintLong)gdk_window_create_similar_surface((GdkWindow *)arg0, arg1, arg2, arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_create_similar_surface)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, jint, jint, jint))fp)((GdkWindow *)arg0, arg1, arg2, arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1create_1similar_1surface_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1destroy
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1destroy)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1destroy_FUNC);
+	gdk_window_destroy((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1destroy_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1end_1paint
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1end_1paint)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1end_1paint_FUNC);
+	gdk_window_end_paint((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1end_1paint_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1focus
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1focus)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1focus_FUNC);
+	gdk_window_focus((GdkWindow *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1focus_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1children
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1children_FUNC);
+	rc = (jintLong)gdk_window_get_children((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1children_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1device_1position
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1device_1position)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+{
+	jint *lparg2=NULL;
+	jint *lparg3=NULL;
+	jint *lparg4=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1device_1position_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_window_get_device_position((GdkWindow *)arg0, (GdkDevice *)arg1, (gint *)lparg2, (gint *)lparg3, (GdkModifierType *)lparg4);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_get_device_position)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, GdkDevice *, gint *, gint *, GdkModifierType *))fp)((GdkWindow *)arg0, (GdkDevice *)arg1, (gint *)lparg2, (gint *)lparg3, (GdkModifierType *)lparg4);
+		}
+	}
+fail:
+	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1device_1position_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1display
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1display)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1display_FUNC);
+/*
+	rc = (jintLong)gdk_window_get_display((GdkWindow *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_get_display)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1display_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1events
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1events)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1events_FUNC);
+	rc = (jint)gdk_window_get_events((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1events_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1frame_1extents
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1frame_1extents)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+{
+	GdkRectangle _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1frame_1extents_FUNC);
+	if (arg1) if ((lparg1 = &_arg1) == NULL) goto fail;
+	gdk_window_get_frame_extents((GdkWindow *)arg0, (GdkRectangle *)lparg1);
+fail:
+	if (arg1 && lparg1) setGdkRectangleFields(env, arg1, lparg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1frame_1extents_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1height
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1height)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1height_FUNC);
+/*
+	rc = (jint)gdk_window_get_height((GdkWindow *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_get_height)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1height_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1internal_1paint_1info
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1internal_1paint_1info)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2, jintArray arg3)
+{
+	jintLong *lparg1=NULL;
+	jint *lparg2=NULL;
+	jint *lparg3=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+/*
+	gdk_window_get_internal_paint_info((GdkWindow *)arg0, lparg1, (gint *)lparg2, (gint *)lparg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_get_internal_paint_info)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, jintLong *, gint *, gint *))fp)((GdkWindow *)arg0, lparg1, (gint *)lparg2, (gint *)lparg3);
+		}
+	}
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1origin
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1origin)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1origin_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jint)gdk_window_get_origin((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1origin_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1parent
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1parent)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1parent_FUNC);
+	rc = (jintLong)gdk_window_get_parent((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1parent_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1pointer
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1pointer)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	jint *lparg3=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1pointer_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+/*
+	rc = (jintLong)gdk_window_get_pointer((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_get_pointer)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *, gint *, gint *, GdkModifierType *))fp)((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
+		}
+	}
+fail:
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1pointer_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1position
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1position)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1position_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	gdk_window_get_position((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1position_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1root_1origin
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1root_1origin)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
+{
+	jint *lparg1=NULL;
+	jint *lparg2=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1root_1origin_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	gdk_window_get_root_origin((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1root_1origin_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1user_1data
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1user_1data)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
+{
+	jintLong *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1user_1data_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	gdk_window_get_user_data((GdkWindow *)arg0, (gpointer *)lparg1);
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1user_1data_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1visible_1region
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1visible_1region)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1visible_1region_FUNC);
+/*
+	rc = (jintLong)gdk_window_get_visible_region((GdkWindow *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_get_visible_region)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1visible_1region_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1get_1width
+JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1width)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1width_FUNC);
+/*
+	rc = (jint)gdk_window_get_width((GdkWindow *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_get_width)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1width_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1hide
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1hide)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1hide_FUNC);
+	gdk_window_hide((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1hide_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1invalidate_1rect
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1rect)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2)
+{
+	GdkRectangle _arg1, *lparg1=NULL;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1rect_FUNC);
+	if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
+	gdk_window_invalidate_rect((GdkWindow *)arg0, (GdkRectangle *)lparg1, (gboolean)arg2);
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1invalidate_1rect_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1invalidate_1region
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1region)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1region_FUNC);
+/*
+	gdk_window_invalidate_region((GdkWindow *)arg0, arg1, (gboolean)arg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_invalidate_region)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, jintLong, gboolean))fp)((GdkWindow *)arg0, arg1, (gboolean)arg2);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1invalidate_1region_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1is_1visible
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1window_1is_1visible)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1is_1visible_FUNC);
+	rc = (jboolean)gdk_window_is_visible((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1is_1visible_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1lower
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1lower)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1lower_FUNC);
+	gdk_window_lower((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1lower_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1move
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1move_FUNC);
+	gdk_window_move((GdkWindow *)arg0, arg1, arg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1move_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1move_1resize
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move_1resize)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1move_1resize_FUNC);
+	gdk_window_move_resize((GdkWindow *)arg0, arg1, arg2, arg3, arg4);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1move_1resize_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1new)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+{
+	GdkWindowAttr _arg1, *lparg1=NULL;
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1new_FUNC);
+	if (arg1) if ((lparg1 = getGdkWindowAttrFields(env, arg1, &_arg1)) == NULL) goto fail;
+	rc = (jintLong)gdk_window_new((GdkWindow *)arg0, lparg1, arg2);
+fail:
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1new_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1window_1process_1all_1updates
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1all_1updates)
+	(JNIEnv *env, jclass that)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1process_1all_1updates_FUNC);
+/*
+	gdk_window_process_all_updates();
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_process_all_updates)
+		if (fp) {
+			((void (CALLING_CONVENTION*)())fp)();
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1process_1all_1updates_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1process_1updates
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1updates)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1process_1updates_FUNC);
+/*
+	gdk_window_process_updates((GdkWindow *)arg0, (gboolean)arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_process_updates)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1process_1updates_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1raise
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1raise)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1raise_FUNC);
+	gdk_window_raise((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1raise_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1remove_1filter
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1remove_1filter)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1remove_1filter_FUNC);
+	gdk_window_remove_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1remove_1filter_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1resize
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1resize)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1resize_FUNC);
+	gdk_window_resize((GdkWindow *)arg0, arg1, arg2);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1resize_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1restack
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1restack)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1restack_FUNC);
+/*
+	gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_restack)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1restack_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1set_1back_1pixmap
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1back_1pixmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1back_1pixmap_FUNC);
+/*
+	gdk_window_set_back_pixmap((GdkWindow *)arg0, arg1, (gboolean)arg2);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_set_back_pixmap)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, jintLong, gboolean))fp)((GdkWindow *)arg0, arg1, (gboolean)arg2);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1back_1pixmap_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1set_1background_1pattern
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1background_1pattern)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1background_1pattern_FUNC);
+/*
+	gdk_window_set_background_pattern(arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_set_background_pattern)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1background_1pattern_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1set_1cursor
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1cursor)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1cursor_FUNC);
+	gdk_window_set_cursor((GdkWindow *)arg0, (GdkCursor *)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1cursor_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1set_1decorations
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1decorations)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1decorations_FUNC);
+	gdk_window_set_decorations((GdkWindow *)arg0, (GdkWMDecoration)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1decorations_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1set_1events
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1events)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1events_FUNC);
+	gdk_window_set_events((GdkWindow *)arg0, arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1events_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1set_1functions
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1functions)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1functions_FUNC);
+	gdk_window_set_functions((GdkWindow *)arg0, (GdkWMFunction)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1functions_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1set_1override_1redirect
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1override_1redirect)
+	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1override_1redirect_FUNC);
+	gdk_window_set_override_redirect((GdkWindow *)arg0, (gboolean)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1override_1redirect_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1set_1user_1data
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1user_1data)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1user_1data_FUNC);
+	gdk_window_set_user_data((GdkWindow *)arg0, (gpointer)arg1);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1user_1data_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1shape_1combine_1region
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1shape_1combine_1region)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1shape_1combine_1region_FUNC);
+/*
+	gdk_window_shape_combine_region((GdkWindow *)arg0, arg1, arg2, arg3);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_window_shape_combine_region)
+		if (fp) {
+			((void (CALLING_CONVENTION*)(GdkWindow *, jintLong, jint, jint))fp)((GdkWindow *)arg0, arg1, arg2, arg3);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1shape_1combine_1region_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1show
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_FUNC);
+	gdk_window_show((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1show_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1window_1show_1unraised
+JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show_1unraised)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_1unraised_FUNC);
+	gdk_window_show_unraised((GdkWindow *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1window_1show_1unraised_FUNC);
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1atom_1to_1xatom
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
+	rc = (jintLong)gdk_x11_atom_to_xatom((GdkAtom)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1display_1get_1xdisplay
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1display_1get_1xdisplay)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1get_1xdisplay_FUNC);
+	rc = (jintLong)gdk_x11_display_get_xdisplay((GdkDisplay *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1display_1get_1xdisplay_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1display_1utf8_1to_1compound_1text
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1x11_1display_1utf8_1to_1compound_1text)
+	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLongArray arg2, jintArray arg3, jintLongArray arg4, jintArray arg5)
+{
+	jbyte *lparg1=NULL;
+	jintLong *lparg2=NULL;
+	jint *lparg3=NULL;
+	jintLong *lparg4=NULL;
+	jint *lparg5=NULL;
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
+/*
+	rc = (jboolean)gdk_x11_display_utf8_to_compound_text((GdkDisplay *)arg0, lparg1, lparg2, lparg3, lparg4, lparg5);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_x11_display_utf8_to_compound_text)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkDisplay *, jbyte *, jintLong *, jint *, jintLong *, jint *))fp)((GdkDisplay *)arg0, lparg1, lparg2, lparg3, lparg4, lparg5);
+		}
+	}
+fail:
+	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
+	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1drawable_1get_1xid
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xid)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
+/*
+	rc = (jintLong)gdk_x11_drawable_get_xid(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_x11_drawable_get_xid)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1get_1default_1xdisplay
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1get_1default_1xdisplay)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1get_1default_1xdisplay_FUNC);
+	rc = (jintLong)gdk_x11_get_default_xdisplay();
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1get_1default_1xdisplay_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1screen_1get_1window_1manager_1name
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
+/*
+	rc = (jintLong)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1screen_1lookup_1visual
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
+/*
+	rc = (jintLong)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *, VisualID))fp)((GdkScreen *)arg0, (VisualID)arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1visual_1get_1xvisual
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1visual_1get_1xvisual)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
+	rc = (jintLong)gdk_x11_visual_get_xvisual((GdkVisual *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1window_1get_1xid
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1window_1get_1xid)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1window_1get_1xid_FUNC);
+/*
+	rc = (jintLong)gdk_x11_window_get_xid((GdkWindow *)arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_x11_window_get_xid)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkWindow *))fp)((GdkWindow *)arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1window_1get_1xid_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1gdk_1x11_1window_1lookup_1for_1display
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1window_1lookup_1for_1display)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gdk_1x11_1window_1lookup_1for_1display_FUNC);
+/*
+	rc = (jintLong)gdk_x11_window_lookup_for_display((GdkDisplay *)arg0, arg1);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gdk_x11_window_lookup_for_display)
+		if (fp) {
+			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkDisplay *, jintLong))fp)((GdkDisplay *)arg0, arg1);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gdk_1x11_1window_1lookup_1for_1display_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1getpid
+JNIEXPORT jint JNICALL OS_NATIVE(_1getpid)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1getpid_FUNC);
+	rc = (jint)getpid();
+	OS_NATIVE_EXIT(env, that, _1getpid_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1glib_1major_1version
+JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1major_1version)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1glib_1major_1version_FUNC);
+	rc = (jint)glib_major_version;
+	OS_NATIVE_EXIT(env, that, _1glib_1major_1version_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1glib_1micro_1version
+JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1micro_1version)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1glib_1micro_1version_FUNC);
+	rc = (jint)glib_micro_version;
+	OS_NATIVE_EXIT(env, that, _1glib_1micro_1version_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO__1glib_1minor_1version
+JNIEXPORT jint JNICALL OS_NATIVE(_1glib_1minor_1version)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1glib_1minor_1version_FUNC);
+	rc = (jint)glib_minor_version;
+	OS_NATIVE_EXIT(env, that, _1glib_1minor_1version_FUNC);
+	return rc;
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index 967af4019f..9a9dc3bb3d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -69,6 +69,17 @@
 
 #define OS_LOAD_FUNCTION LOAD_FUNCTION
 
+// Hard-link code generated from GTK.java to LIB_GTK
+#define GTK_LOAD_FUNCTION(var, name) \
+		static int initialized = 0; \
+		static void *var = NULL; \
+		if (!initialized) { \
+			void* handle = dlopen(LIB_GTK, LOAD_FLAGS); \
+			if (handle) var = dlsym(handle, #name); \
+			initialized = 1; \
+	                CHECK_DLERROR \
+		}
+
 #ifdef GDK_WINDOWING_X11
 
 #include <gdk/gdkx.h>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
index f3a552b8b1..b8d51a9047 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
@@ -64,56 +64,7 @@
 /* Libraries for dynamic loaded functions */
 
 #define g_thread_init_LIB LIB_GTHREAD
-#define gtk_widget_set_opacity_LIB LIB_GTK
-#define gtk_widget_get_opacity_LIB LIB_GTK
-#define gtk_scrollable_get_vadjustment_LIB LIB_GTK
-#define gtk_adjustment_value_changed_LIB LIB_GTK
-#define gtk_arrow_new_LIB LIB_GTK
-#define gtk_arrow_set_LIB LIB_GTK
-#define gtk_box_new_LIB LIB_GTK
-#define gtk_hbox_new_LIB LIB_GTK
-#define gtk_vbox_new_LIB LIB_GTK
-#define gtk_cell_renderer_get_preferred_size_LIB LIB_GTK
-#define gtk_cell_renderer_get_size_LIB LIB_GTK
-#define gtk_color_selection_dialog_get_color_selection_LIB LIB_GTK
-#define gtk_color_selection_dialog_new_LIB LIB_GTK
-#define gtk_color_selection_set_has_palette_LIB LIB_GTK
-#define gtk_color_selection_get_current_color_LIB LIB_GTK
-#define gtk_color_selection_set_current_color_LIB LIB_GTK
-#define gtk_color_selection_palette_to_string_LIB LIB_GTK
-#define gtk_color_chooser_add_palette_LIB LIB_GTK
-#define gtk_color_chooser_get_rgba_LIB LIB_GTK
-#define gtk_color_chooser_dialog_new_LIB LIB_GTK
-#define gtk_color_chooser_set_rgba_LIB LIB_GTK
-#define gtk_color_chooser_set_use_alpha_LIB LIB_GTK
-#define gtk_color_chooser_get_use_alpha_LIB LIB_GTK
-#define gtk_combo_box_text_insert_LIB LIB_GTK
-#define gtk_combo_box_text_remove_all_LIB LIB_GTK
-#define gtk_combo_box_set_focus_on_click_LIB LIB_GTK
-#define gtk_drag_begin_LIB LIB_GTK
-#define gtk_entry_get_inner_border_LIB LIB_GTK
-#define gtk_font_chooser_dialog_new_LIB LIB_GTK
-#define gtk_font_chooser_get_font_LIB LIB_GTK
-#define gtk_font_chooser_set_font_LIB LIB_GTK
-#define gtk_font_selection_dialog_get_font_name_LIB LIB_GTK
-#define gtk_font_selection_dialog_set_font_name_LIB LIB_GTK
-#define gtk_font_selection_dialog_new_LIB LIB_GTK
-#define gtk_icon_info_free_LIB LIB_GTK
-#define gtk_image_menu_item_set_image_LIB LIB_GTK
 #define gdk_keyboard_ungrab_LIB LIB_GDK
-#define gtk_image_menu_item_new_with_label_LIB LIB_GTK
-#define gtk_im_multicontext_append_menuitems_LIB LIB_GTK
-#define gtk_scrollbar_new_LIB LIB_GTK
-#define gtk_hscrollbar_new_LIB LIB_GTK
-#define gtk_vscrollbar_new_LIB LIB_GTK
-#define gtk_separator_new_LIB LIB_GTK
-#define gtk_rc_parse_string_LIB LIB_GTK
-#define gtk_hseparator_new_LIB LIB_GTK
-#define gtk_vseparator_new_LIB LIB_GTK
-#define gtk_tree_view_column_get_button_LIB LIB_GTK
-#define gtk_tree_view_get_vadjustment_LIB LIB_GTK
-#define gtk_tree_view_set_rules_hint_LIB LIB_GTK
-#define gtk_tree_view_get_rules_hint_LIB LIB_GTK
 #define gdk_cursor_new_from_pixbuf_LIB LIB_GDK
 #define gdk_cursor_unref_LIB LIB_GDK
 #define gdk_display_warp_pointer_LIB LIB_GDK
@@ -177,20 +128,6 @@
 #define gdk_screen_get_monitor_width_mm_LIB LIB_GDK
 #define gdk_screen_get_primary_monitor_LIB LIB_GDK
 #define gdk_visual_get_depth_LIB LIB_GDK
-#define gtk_scale_new_LIB LIB_GTK
-#define gtk_style_context_add_provider_for_screen_LIB LIB_GTK
-#define gtk_style_context_add_provider_LIB LIB_GTK
-#define gtk_style_context_restore_LIB LIB_GTK
-#define gtk_style_context_save_LIB LIB_GTK
-#define gtk_style_context_set_state_LIB LIB_GTK
-#define gtk_hscale_new_LIB LIB_GTK
-#define gtk_vscale_new_LIB LIB_GTK
-#define gtk_scrolled_window_add_with_viewport_LIB LIB_GTK
-#define gtk_scrolled_window_get_overlay_scrolling_LIB LIB_GTK
-#define gtk_settings_set_string_property_LIB LIB_GTK
-#define gtk_status_icon_position_menu_LIB LIB_GTK
-#define gtk_false_LIB LIB_GTK
-#define gtk_window_get_opacity_LIB LIB_GTK
 #define gdk_window_create_similar_surface_LIB LIB_GDK
 #define gdk_window_restack_LIB LIB_GDK
 #define gdk_window_process_all_updates_LIB LIB_GDK
@@ -205,28 +142,6 @@
 #define gdk_window_get_visible_region_LIB LIB_GDK
 #define gdk_window_set_keep_above_LIB LIB_GDK
 #define gdk_window_set_accept_focus_LIB LIB_GDK
-#define gtk_misc_set_alignment_LIB LIB_GTK
-#define gtk_label_set_xalign_LIB LIB_GTK
-#define gtk_label_set_yalign_LIB LIB_GTK
-#define gtk_widget_set_halign_LIB LIB_GTK
-#define gtk_widget_set_valign_LIB LIB_GTK
-#define gtk_window_set_opacity_LIB LIB_GTK
-#define gtk_widget_is_composited_LIB LIB_GTK
-#define gtk_widget_class_get_css_name_LIB LIB_GTK
-#define gtk_widget_size_request_LIB LIB_GTK
-#define gtk_widget_get_default_style_LIB LIB_GTK
-#define gtk_widget_get_preferred_size_LIB LIB_GTK
-#define gtk_widget_get_style_context_LIB LIB_GTK
-#define gtk_widget_get_state_flags_LIB LIB_GTK
-#define gtk_widget_set_state_LIB LIB_GTK
-#define gtk_widget_shape_combine_region_LIB LIB_GTK
-#define gtk_widget_modify_base_LIB LIB_GTK
-#define gtk_widget_modify_bg_LIB LIB_GTK
-#define gtk_widget_modify_font_LIB LIB_GTK
-#define gtk_widget_modify_style_LIB LIB_GTK
-#define gtk_widget_get_style_LIB LIB_GTK
-#define gtk_widget_get_modifier_style_LIB LIB_GTK
-#define gtk_widget_set_focus_on_click_LIB LIB_GTK
 #define gdk_threads_set_lock_functions_LIB LIB_GDK
 
 #define gdk_cairo_reset_clip_LIB LIB_GDK
@@ -241,77 +156,18 @@
 #define gdk_cairo_create_LIB LIB_GDK
 #define gdk_colormap_alloc_color_LIB LIB_GDK
 #define gdk_colormap_free_colors_LIB LIB_GDK
-#define gtk_paint_box_LIB LIB_GTK
-#define gtk_paint_handle_LIB LIB_GTK
-#define gtk_paint_flat_box_LIB LIB_GTK
-#define gtk_printer_option_widget_get_type_LIB LIB_GTK
-#define gtk_render_handle_LIB LIB_GTK
-#define gtk_render_focus_LIB LIB_GTK
-#define gtk_render_frame_LIB LIB_GTK
-#define gtk_render_background_LIB LIB_GTK
-#define gtk_progress_bar_set_inverted_LIB LIB_GTK
-#define gtk_progress_bar_set_orientation_LIB LIB_GTK
 #define ubuntu_menu_proxy_get_LIB LIB_GTK
 #define FcConfigAppFontAddFile_LIB LIB_FONTCONFIG
 
 // GTK3 only
-#define gtk_event_controller_handle_event_LIB LIB_GTK
-#define gtk_event_controller_set_propagation_phase_LIB LIB_GTK
-#define gtk_file_filter_add_pattern_LIB LIB_GTK
-#define gtk_gesture_drag_get_start_point_LIB LIB_GTK
-#define gtk_gesture_drag_new_LIB LIB_GTK
-#define gtk_gesture_drag_get_offset_LIB LIB_GTK
-#define gtk_gesture_get_last_event_LIB LIB_GTK
-#define gtk_gesture_get_last_updated_sequence_LIB LIB_GTK
-#define gtk_gesture_get_point_LIB LIB_GTK
-#define gtk_gesture_get_sequences_LIB LIB_GTK
-#define gtk_gesture_group_LIB LIB_GTK
-#define gtk_gesture_is_recognized_LIB LIB_GTK
-#define gtk_gesture_pan_get_orientation_LIB LIB_GTK
-#define gtk_gesture_pan_set_orientation_LIB LIB_GTK
-#define gtk_gesture_pan_new_LIB LIB_GTK
-#define gtk_gesture_rotate_get_angle_delta_LIB LIB_GTK
-#define gtk_gesture_rotate_new_LIB LIB_GTK
-#define gtk_gesture_swipe_get_velocity_LIB LIB_GTK
-#define gtk_gesture_swipe_new_LIB LIB_GTK
-#define gtk_gesture_zoom_get_scale_delta_LIB LIB_GTK
-#define gtk_gesture_zoom_new_LIB LIB_GTK
-#define gtk_gesture_single_set_button_LIB LIB_GTK
-#define gtk_menu_popup_LIB LIB_GTK
-#define gtk_menu_popup_at_pointer_LIB LIB_GTK
-#define gtk_widget_draw_LIB LIB_GTK
-#define gtk_widget_override_color_LIB LIB_GTK
-#define gtk_widget_override_background_color_LIB LIB_GTK
-#define gtk_widget_override_font_LIB LIB_GTK
-#define gtk_widget_get_preferred_height_for_width_LIB LIB_GTK
-#define gtk_widget_get_preferred_width_for_height_LIB LIB_GTK
-#define gtk_style_context_get_font_LIB LIB_GTK
-#define gtk_style_context_get_color_LIB LIB_GTK
-#define gtk_style_context_get_background_color_LIB LIB_GTK
-#define gtk_style_context_add_class_LIB LIB_GTK
-#define gtk_style_context_get_padding_LIB LIB_GTK
-#define gtk_style_context_get_border_LIB LIB_GTK
-#define gtk_style_context_get_LIB LIB_GTK
-#define gtk_style_context_invalidate_LIB LIB_GTK
 #define gdk_screen_get_monitor_workarea_LIB LIB_GDK
 #define gdk_seat_grab_LIB LIB_GDK
 #define gdk_seat_ungrab_LIB LIB_GDK
 #define gdk_seat_get_pointer_LIB LIB_GDK
 #define gdk_window_set_background_pattern_LIB LIB_GTK
-#define gtk_widget_input_shape_combine_region_LIB LIB_GTK
-#define gtk_entry_set_placeholder_text_LIB LIB_GTK
-#define gtk_entry_get_icon_area_LIB LIB_GTK
 #define gdk_event_get_scroll_deltas_LIB LIB_GTK
 #define gdk_event_get_seat_LIB LIB_GDK
 #define gdk_event_get_event_type_LIB LIB_GDK
-#define gtk_cell_renderer_get_preferred_height_for_width_LIB LIB_GTK
-#define gtk_css_provider_load_from_data_LIB LIB_GTK
-#define gtk_css_provider_new_LIB LIB_GTK
-#define gtk_css_provider_to_string_LIB LIB_GTK
-#define gtk_css_provider_get_named_LIB LIB_GTK
-#define gtk_drag_set_icon_surface_LIB LIB_GTK
-#define gtk_accel_label_set_accel_LIB LIB_GTK
-#define gtk_drag_begin_with_coordinates_LIB LIB_GTK
 #define g_bytes_new_LIB LIB_GLIB
 #define g_bytes_unref_LIB LIB_GLIB
 
@@ -403,11 +259,11 @@ struct _GtkAccelLabelPrivate
 // Idea is that you substitute the return value with the function pointer.
 // NOTE: functions like gtk_false need to be linked to a lib. Eg see gtk_false_LIB above.
 #define GET_FUNCTION_POINTER_gtk_false() 0; \
-OS_LOAD_FUNCTION(fp, gtk_false) \
+GTK_LOAD_FUNCTION(fp, gtk_false) \
 rc = (jintLong)fp;
 
 #define gtk_status_icon_position_menu_func() 0; \
-OS_LOAD_FUNCTION(fp, gtk_status_icon_position_menu) \
+GTK_LOAD_FUNCTION(fp, gtk_status_icon_position_menu) \
 rc = (jintLong)fp;
 
 glong g_utf16_pointer_to_offset(const gchar*, const gchar*);
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 cf6835baa8..5cecf1cc0c 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
@@ -21,24 +21,7 @@
 
 #ifdef NATIVE_STATS
 
-char * OS_nativeFunctionNames[] = {
-#ifndef JNI64
-	"Call__IIII",
-#else
-	"Call__JJII",
-#endif
-#ifndef JNI64
-	"Call__IIIJ",
-#else
-	"Call__JJIJ",
-#endif
-	"GDK_1EVENT_1TYPE",
-	"GDK_1EVENT_1WINDOW",
-	"GDK_1IS_1X11_1DISPLAY",
-	"GDK_1WINDOWING_1WAYLAND",
-	"GDK_1WINDOWING_1X11",
-	"GInterfaceInfo_1sizeof",
-	"GPollFD_1sizeof",
+char * GTK_nativeFunctionNames[] = {
 	"GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING",
 	"GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING",
 	"GTK_1ENTRY_1IM_1CONTEXT",
@@ -47,34 +30,6 @@ char * OS_nativeFunctionNames[] = {
 	"GTK_1WIDGET_1GET_1CLASS",
 	"GTK_1WIDGET_1REQUISITION_1HEIGHT",
 	"GTK_1WIDGET_1REQUISITION_1WIDTH",
-	"GTypeInfo_1sizeof",
-	"GTypeQuery_1sizeof",
-	"G_1OBJECT_1CLASS_1CONSTRUCTOR",
-	"G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR",
-	"G_1TYPE_1BOOLEAN",
-	"G_1TYPE_1DOUBLE",
-	"G_1TYPE_1FLOAT",
-	"G_1TYPE_1INT",
-	"G_1TYPE_1INT64",
-	"G_1VALUE_1TYPE",
-	"GdkColor_1sizeof",
-	"GdkDragContext_1sizeof",
-	"GdkEventAny_1sizeof",
-	"GdkEventButton_1sizeof",
-	"GdkEventCrossing_1sizeof",
-	"GdkEventExpose_1sizeof",
-	"GdkEventFocus_1sizeof",
-	"GdkEventKey_1sizeof",
-	"GdkEventMotion_1sizeof",
-	"GdkEventProperty_1sizeof",
-	"GdkEventScroll_1sizeof",
-	"GdkEventWindowState_1sizeof",
-	"GdkEvent_1sizeof",
-	"GdkGeometry_1sizeof",
-	"GdkKeymapKey_1sizeof",
-	"GdkRGBA_1sizeof",
-	"GdkRectangle_1sizeof",
-	"GdkWindowAttr_1sizeof",
 	"GtkAllocation_1sizeof",
 	"GtkBorder_1sizeof",
 	"GtkCellRendererPixbufClass_1sizeof",
@@ -87,32 +42,7 @@ char * OS_nativeFunctionNames[] = {
 	"GtkTargetEntry_1sizeof",
 	"GtkTextIter_1sizeof",
 	"GtkTreeIter_1sizeof",
-	"PangoAttrColor_1sizeof",
-	"PangoAttrInt_1sizeof",
-	"PangoAttribute_1sizeof",
-	"PangoItem_1sizeof",
-	"PangoLayoutLine_1sizeof",
-	"PangoLayoutRun_1sizeof",
-	"PangoLogAttr_1sizeof",
-	"PangoRectangle_1sizeof",
-	"RTLD_1GLOBAL",
-	"RTLD_1LAZY",
-	"RTLD_1NOW",
-	"XAnyEvent_1sizeof",
-	"XEvent_1sizeof",
-	"XExposeEvent_1sizeof",
-	"XFocusChangeEvent_1sizeof",
-	"X_1EVENT_1TYPE",
-	"X_1EVENT_1WINDOW",
-	"_1Call",
-	"_1FcConfigAppFontAddFile",
-	"_1GDK_1PIXMAP_1XID",
-	"_1GDK_1TYPE_1COLOR",
-	"_1GDK_1TYPE_1PIXBUF",
-	"_1GDK_1TYPE_1RGBA",
 	"_1GET_1FUNCTION_1POINTER_1gtk_1false",
-	"_1GString_1len",
-	"_1GString_1str",
 	"_1GTK_1ACCESSIBLE",
 	"_1GTK_1IS_1ACCEL_1LABEL",
 	"_1GTK_1IS_1BUTTON",
@@ -137,474 +67,6 @@ char * OS_nativeFunctionNames[] = {
 	"_1GTK_1TYPE_1WIDGET",
 	"_1GTK_1WIDGET_1SET_1FLAGS",
 	"_1GTK_1WIDGET_1UNSET_1FLAGS",
-	"_1G_1OBJECT_1CLASS",
-	"_1G_1OBJECT_1GET_1CLASS",
-	"_1G_1OBJECT_1TYPE",
-	"_1G_1OBJECT_1TYPE_1NAME",
-	"_1G_1TYPE_1CHECK_1INSTANCE_1TYPE",
-	"_1G_1TYPE_1STRING",
-	"_1PANGO_1PIXELS",
-	"_1PANGO_1TYPE_1FONT_1DESCRIPTION",
-	"_1PANGO_1TYPE_1FONT_1FACE",
-	"_1PANGO_1TYPE_1FONT_1FAMILY",
-	"_1PANGO_1TYPE_1LAYOUT",
-	"_1XCheckIfEvent",
-	"_1XDefaultRootWindow",
-	"_1XDefaultScreen",
-	"_1XFlush",
-	"_1XFree",
-	"_1XGetWindowProperty",
-	"_1XKeysymToKeycode",
-	"_1XQueryPointer",
-	"_1XSetErrorHandler",
-	"_1XSetIOErrorHandler",
-	"_1XSetInputFocus",
-	"_1XSetTransientForHint",
-	"_1XSynchronize",
-	"_1XTestFakeKeyEvent",
-	"_1access",
-	"_1cachejvmptr",
-#ifndef JNI64
-	"_1call__IIIII",
-#else
-	"_1call__JJJJJ",
-#endif
-#ifndef JNI64
-	"_1call__IIIIIII",
-#else
-	"_1call__JJJJJJJ",
-#endif
-#ifndef JNI64
-	"_1call__IIIIIIII",
-#else
-	"_1call__JJJJJJJJ",
-#endif
-	"_1call_1get_1size",
-	"_1dlopen",
-	"_1g_1app_1info_1create_1from_1commandline",
-	"_1g_1app_1info_1get_1all",
-	"_1g_1app_1info_1get_1default_1for_1type",
-	"_1g_1app_1info_1get_1executable",
-	"_1g_1app_1info_1get_1icon",
-	"_1g_1app_1info_1get_1name",
-	"_1g_1app_1info_1launch",
-	"_1g_1app_1info_1launch_1default_1for_1uri",
-	"_1g_1app_1info_1should_1show",
-	"_1g_1app_1info_1supports_1uris",
-	"_1g_1bus_1own_1name",
-	"_1g_1bytes_1new",
-	"_1g_1bytes_1unref",
-	"_1g_1cclosure_1new",
-	"_1g_1closure_1ref",
-	"_1g_1closure_1sink",
-	"_1g_1closure_1unref",
-	"_1g_1content_1type_1equals",
-	"_1g_1content_1type_1is_1a",
-	"_1g_1dbus_1connection_1register_1object",
-	"_1g_1dbus_1method_1invocation_1return_1value",
-	"_1g_1dbus_1node_1info_1lookup_1interface",
-	"_1g_1dbus_1node_1info_1new_1for_1xml",
-	"_1g_1error_1free",
-	"_1g_1error_1get_1message",
-	"_1g_1file_1get_1uri",
-	"_1g_1file_1info_1get_1content_1type",
-	"_1g_1file_1new_1for_1commandline_1arg",
-	"_1g_1file_1new_1for_1path",
-	"_1g_1file_1new_1for_1uri",
-	"_1g_1file_1query_1info",
-	"_1g_1file_1test",
-	"_1g_1filename_1display_1name",
-	"_1g_1filename_1from_1uri",
-	"_1g_1filename_1from_1utf8",
-	"_1g_1filename_1to_1uri",
-	"_1g_1filename_1to_1utf8",
-	"_1g_1free",
-	"_1g_1hash_1table_1get_1values",
-	"_1g_1icon_1new_1for_1string",
-	"_1g_1icon_1to_1string",
-	"_1g_1idle_1add",
-	"_1g_1list_1append",
-	"_1g_1list_1data",
-	"_1g_1list_1free",
-	"_1g_1list_1free_11",
-	"_1g_1list_1last",
-	"_1g_1list_1length",
-	"_1g_1list_1next",
-	"_1g_1list_1nth",
-	"_1g_1list_1nth_1data",
-	"_1g_1list_1prepend",
-	"_1g_1list_1previous",
-	"_1g_1list_1remove_1link",
-	"_1g_1list_1set_1next",
-	"_1g_1list_1set_1previous",
-	"_1g_1log_1default_1handler",
-	"_1g_1log_1remove_1handler",
-	"_1g_1log_1set_1handler",
-	"_1g_1main_1context_1acquire",
-	"_1g_1main_1context_1check",
-	"_1g_1main_1context_1default",
-	"_1g_1main_1context_1get_1poll_1func",
-	"_1g_1main_1context_1iteration",
-	"_1g_1main_1context_1prepare",
-	"_1g_1main_1context_1query",
-	"_1g_1main_1context_1release",
-	"_1g_1malloc",
-	"_1g_1object_1class_1find_1property",
-#ifndef JNI64
-	"_1g_1object_1get__I_3B_3II",
-#else
-	"_1g_1object_1get__J_3B_3IJ",
-#endif
-#ifndef JNI64
-	"_1g_1object_1get__I_3B_3JI",
-#else
-	"_1g_1object_1get__J_3B_3JJ",
-#endif
-	"_1g_1object_1get_1qdata",
-	"_1g_1object_1new",
-	"_1g_1object_1notify",
-	"_1g_1object_1ref",
-	"_1g_1object_1ref_1sink",
-#ifndef JNI64
-	"_1g_1object_1set__I_3BFI",
-#else
-	"_1g_1object_1set__J_3BFJ",
-#endif
-#ifndef JNI64
-	"_1g_1object_1set__I_3BII",
-#else
-	"_1g_1object_1set__J_3BIJ",
-#endif
-#ifndef JNI64
-	"_1g_1object_1set__I_3BJI",
-#else
-	"_1g_1object_1set__J_3BJJ",
-#endif
-#ifndef JNI64
-	"_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I",
-#else
-	"_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J",
-#endif
-#ifndef JNI64
-	"_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I",
-#else
-	"_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J",
-#endif
-#ifndef JNI64
-	"_1g_1object_1set__I_3BZI",
-#else
-	"_1g_1object_1set__J_3BZJ",
-#endif
-#ifndef JNI64
-	"_1g_1object_1set__I_3B_3BI",
-#else
-	"_1g_1object_1set__J_3B_3BJ",
-#endif
-	"_1g_1object_1set_1qdata",
-	"_1g_1object_1unref",
-	"_1g_1quark_1from_1string",
-	"_1g_1set_1prgname",
-	"_1g_1signal_1add_1emission_1hook",
-	"_1g_1signal_1connect",
-	"_1g_1signal_1connect_1closure",
-	"_1g_1signal_1connect_1closure_1by_1id",
-#ifndef JNI64
-	"_1g_1signal_1emit_1by_1name__I_3B",
-#else
-	"_1g_1signal_1emit_1by_1name__J_3B",
-#endif
-#ifndef JNI64
-	"_1g_1signal_1emit_1by_1name__I_3BI",
-#else
-	"_1g_1signal_1emit_1by_1name__J_3BJ",
-#endif
-#ifndef JNI64
-	"_1g_1signal_1emit_1by_1name__I_3BII",
-#else
-	"_1g_1signal_1emit_1by_1name__J_3BJJ",
-#endif
-#ifndef JNI64
-	"_1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2",
-#else
-	"_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2",
-#endif
-#ifndef JNI64
-	"_1g_1signal_1emit_1by_1name__I_3B_3B",
-#else
-	"_1g_1signal_1emit_1by_1name__J_3B_3B",
-#endif
-	"_1g_1signal_1handler_1disconnect",
-	"_1g_1signal_1handler_1find",
-	"_1g_1signal_1handlers_1block_1matched",
-	"_1g_1signal_1handlers_1unblock_1matched",
-	"_1g_1signal_1lookup",
-	"_1g_1signal_1remove_1emission_1hook",
-	"_1g_1signal_1stop_1emission_1by_1name",
-	"_1g_1slist_1append",
-	"_1g_1slist_1data",
-	"_1g_1slist_1free",
-	"_1g_1slist_1length",
-	"_1g_1slist_1next",
-	"_1g_1source_1remove",
-	"_1g_1strfreev",
-	"_1g_1string_1free",
-	"_1g_1string_1new_1len",
-	"_1g_1strtod",
-	"_1g_1thread_1init",
-	"_1g_1thread_1supported",
-	"_1g_1timeout_1add",
-	"_1g_1type_1add_1interface_1static",
-	"_1g_1type_1class_1peek",
-	"_1g_1type_1class_1peek_1parent",
-	"_1g_1type_1class_1ref",
-	"_1g_1type_1class_1unref",
-	"_1g_1type_1from_1name",
-	"_1g_1type_1interface_1peek_1parent",
-	"_1g_1type_1is_1a",
-	"_1g_1type_1name",
-	"_1g_1type_1parent",
-	"_1g_1type_1query",
-	"_1g_1type_1register_1static",
-	"_1g_1utf16_1offset_1to_1pointer",
-	"_1g_1utf16_1offset_1to_1utf8_1offset",
-	"_1g_1utf16_1pointer_1to_1offset",
-	"_1g_1utf16_1strlen",
-	"_1g_1utf16_1to_1utf8",
-	"_1g_1utf8_1offset_1to_1utf16_1offset",
-	"_1g_1utf8_1pointer_1to_1offset",
-	"_1g_1utf8_1strlen",
-#ifndef JNI64
-	"_1g_1utf8_1to_1utf16__II_3I_3I_3I",
-#else
-	"_1g_1utf8_1to_1utf16__JJ_3J_3J_3J",
-#endif
-#ifndef JNI64
-	"_1g_1utf8_1to_1utf16___3BI_3I_3I_3I",
-#else
-	"_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J",
-#endif
-	"_1g_1value_1peek_1pointer",
-	"_1g_1variant_1get_1boolean",
-	"_1g_1variant_1get_1byte",
-	"_1g_1variant_1get_1child_1value",
-	"_1g_1variant_1get_1double",
-	"_1g_1variant_1get_1int32",
-	"_1g_1variant_1get_1string",
-	"_1g_1variant_1get_1type",
-	"_1g_1variant_1get_1type_1string",
-	"_1g_1variant_1is_1of_1type",
-	"_1g_1variant_1n_1children",
-	"_1g_1variant_1new_1boolean",
-	"_1g_1variant_1new_1byte",
-	"_1g_1variant_1new_1double",
-	"_1g_1variant_1new_1int32",
-	"_1g_1variant_1new_1string",
-	"_1g_1variant_1new_1tuple",
-	"_1gdk_1atom_1intern",
-	"_1gdk_1atom_1name",
-	"_1gdk_1beep",
-	"_1gdk_1bitmap_1create_1from_1data",
-	"_1gdk_1cairo_1create",
-	"_1gdk_1cairo_1get_1clip_1rectangle",
-	"_1gdk_1cairo_1region",
-	"_1gdk_1cairo_1region_1create_1from_1surface",
-	"_1gdk_1cairo_1reset_1clip",
-	"_1gdk_1cairo_1set_1source_1color",
-	"_1gdk_1cairo_1set_1source_1pixbuf",
-	"_1gdk_1cairo_1set_1source_1pixmap",
-	"_1gdk_1cairo_1set_1source_1rgba",
-	"_1gdk_1cairo_1set_1source_1window",
-	"_1gdk_1color_1free",
-	"_1gdk_1color_1parse",
-	"_1gdk_1color_1white",
-	"_1gdk_1colormap_1alloc_1color",
-	"_1gdk_1colormap_1free_1colors",
-	"_1gdk_1colormap_1get_1system",
-	"_1gdk_1cursor_1new_1for_1display",
-	"_1gdk_1cursor_1new_1from_1name",
-	"_1gdk_1cursor_1new_1from_1pixbuf",
-	"_1gdk_1cursor_1new_1from_1pixmap",
-	"_1gdk_1cursor_1unref",
-	"_1gdk_1device_1get_1associated_1device",
-	"_1gdk_1device_1get_1window_1at_1position",
-	"_1gdk_1device_1grab",
-	"_1gdk_1device_1manager_1get_1client_1pointer",
-	"_1gdk_1device_1ungrab",
-	"_1gdk_1device_1warp",
-	"_1gdk_1display_1get_1default",
-	"_1gdk_1display_1get_1default_1seat",
-	"_1gdk_1display_1get_1device_1manager",
-	"_1gdk_1display_1supports_1cursor_1color",
-	"_1gdk_1display_1warp_1pointer",
-	"_1gdk_1drag_1context_1get_1actions",
-	"_1gdk_1drag_1context_1get_1dest_1window",
-	"_1gdk_1drag_1context_1get_1selected_1action",
-	"_1gdk_1drag_1context_1list_1targets",
-	"_1gdk_1drag_1status",
-	"_1gdk_1draw_1arc",
-	"_1gdk_1draw_1image",
-	"_1gdk_1draw_1pixbuf",
-	"_1gdk_1draw_1rectangle",
-	"_1gdk_1drawable_1get_1depth",
-	"_1gdk_1drawable_1get_1image",
-	"_1gdk_1drawable_1get_1visible_1region",
-	"_1gdk_1error_1trap_1pop",
-	"_1gdk_1error_1trap_1push",
-	"_1gdk_1event_1copy",
-	"_1gdk_1event_1free",
-	"_1gdk_1event_1get",
-	"_1gdk_1event_1get_1coords",
-	"_1gdk_1event_1get_1event_1type",
-	"_1gdk_1event_1get_1scroll_1deltas",
-	"_1gdk_1event_1get_1seat",
-	"_1gdk_1event_1get_1state",
-	"_1gdk_1event_1get_1time",
-	"_1gdk_1event_1handler_1set",
-	"_1gdk_1event_1new",
-	"_1gdk_1event_1peek",
-	"_1gdk_1event_1put",
-	"_1gdk_1flush",
-	"_1gdk_1gc_1new",
-	"_1gdk_1gc_1set_1fill",
-	"_1gdk_1gc_1set_1foreground",
-	"_1gdk_1gc_1set_1function",
-	"_1gdk_1gc_1set_1stipple",
-	"_1gdk_1gc_1set_1subwindow",
-	"_1gdk_1get_1default_1root_1window",
-	"_1gdk_1keyboard_1ungrab",
-	"_1gdk_1keymap_1get_1default",
-	"_1gdk_1keymap_1get_1entries_1for_1keyval",
-	"_1gdk_1keymap_1translate_1keyboard_1state",
-	"_1gdk_1keyval_1to_1lower",
-	"_1gdk_1keyval_1to_1unicode",
-	"_1gdk_1pango_1context_1get",
-	"_1gdk_1pango_1layout_1get_1clip_1region",
-	"_1gdk_1pixbuf_1copy_1area",
-	"_1gdk_1pixbuf_1get_1from_1drawable",
-	"_1gdk_1pixbuf_1get_1from_1window",
-	"_1gdk_1pixbuf_1get_1has_1alpha",
-	"_1gdk_1pixbuf_1get_1height",
-	"_1gdk_1pixbuf_1get_1pixels",
-	"_1gdk_1pixbuf_1get_1rowstride",
-	"_1gdk_1pixbuf_1get_1width",
-	"_1gdk_1pixbuf_1loader_1close",
-	"_1gdk_1pixbuf_1loader_1get_1pixbuf",
-	"_1gdk_1pixbuf_1loader_1new",
-	"_1gdk_1pixbuf_1loader_1write",
-	"_1gdk_1pixbuf_1new",
-	"_1gdk_1pixbuf_1new_1from_1file",
-	"_1gdk_1pixbuf_1save_1to_1bufferv",
-	"_1gdk_1pixbuf_1scale_1simple",
-	"_1gdk_1pixmap_1get_1size",
-	"_1gdk_1pixmap_1new",
-	"_1gdk_1pointer_1grab",
-	"_1gdk_1pointer_1ungrab",
-	"_1gdk_1property_1get",
-	"_1gdk_1region_1destroy",
-	"_1gdk_1region_1empty",
-	"_1gdk_1region_1get_1clipbox",
-	"_1gdk_1region_1get_1rectangles",
-	"_1gdk_1region_1intersect",
-	"_1gdk_1region_1new",
-	"_1gdk_1region_1offset",
-	"_1gdk_1region_1point_1in",
-	"_1gdk_1region_1polygon",
-	"_1gdk_1region_1rect_1in",
-	"_1gdk_1region_1rectangle",
-	"_1gdk_1region_1subtract",
-	"_1gdk_1region_1union",
-	"_1gdk_1region_1union_1with_1rect",
-	"_1gdk_1rgba_1free",
-	"_1gdk_1rgba_1hash",
-	"_1gdk_1rgba_1parse",
-	"_1gdk_1rgba_1to_1string",
-	"_1gdk_1screen_1get_1active_1window",
-	"_1gdk_1screen_1get_1default",
-	"_1gdk_1screen_1get_1monitor_1at_1point",
-	"_1gdk_1screen_1get_1monitor_1at_1window",
-	"_1gdk_1screen_1get_1monitor_1geometry",
-	"_1gdk_1screen_1get_1monitor_1scale_1factor",
-	"_1gdk_1screen_1get_1monitor_1width_1mm",
-	"_1gdk_1screen_1get_1monitor_1workarea",
-	"_1gdk_1screen_1get_1n_1monitors",
-	"_1gdk_1screen_1get_1primary_1monitor",
-	"_1gdk_1screen_1get_1resolution",
-	"_1gdk_1screen_1height",
-	"_1gdk_1screen_1width",
-	"_1gdk_1screen_1width_1mm",
-	"_1gdk_1seat_1get_1pointer",
-	"_1gdk_1seat_1grab",
-	"_1gdk_1seat_1ungrab",
-	"_1gdk_1selection_1owner_1get",
-	"_1gdk_1selection_1owner_1set",
-	"_1gdk_1set_1program_1class",
-	"_1gdk_1test_1simulate_1button",
-	"_1gdk_1text_1property_1to_1utf8_1list_1for_1display",
-	"_1gdk_1unicode_1to_1keyval",
-	"_1gdk_1utf8_1to_1string_1target",
-	"_1gdk_1visual_1get_1depth",
-	"_1gdk_1visual_1get_1system",
-	"_1gdk_1window_1add_1filter",
-	"_1gdk_1window_1at_1pointer",
-	"_1gdk_1window_1begin_1paint_1rect",
-	"_1gdk_1window_1create_1similar_1surface",
-	"_1gdk_1window_1destroy",
-	"_1gdk_1window_1end_1paint",
-	"_1gdk_1window_1focus",
-	"_1gdk_1window_1get_1children",
-	"_1gdk_1window_1get_1device_1position",
-	"_1gdk_1window_1get_1display",
-	"_1gdk_1window_1get_1events",
-	"_1gdk_1window_1get_1frame_1extents",
-	"_1gdk_1window_1get_1height",
-	"_1gdk_1window_1get_1internal_1paint_1info",
-	"_1gdk_1window_1get_1origin",
-	"_1gdk_1window_1get_1parent",
-	"_1gdk_1window_1get_1pointer",
-	"_1gdk_1window_1get_1position",
-	"_1gdk_1window_1get_1root_1origin",
-	"_1gdk_1window_1get_1user_1data",
-	"_1gdk_1window_1get_1visible_1region",
-	"_1gdk_1window_1get_1width",
-	"_1gdk_1window_1hide",
-	"_1gdk_1window_1invalidate_1rect",
-	"_1gdk_1window_1invalidate_1region",
-	"_1gdk_1window_1is_1visible",
-	"_1gdk_1window_1lower",
-	"_1gdk_1window_1move",
-	"_1gdk_1window_1move_1resize",
-	"_1gdk_1window_1new",
-	"_1gdk_1window_1process_1all_1updates",
-	"_1gdk_1window_1process_1updates",
-	"_1gdk_1window_1raise",
-	"_1gdk_1window_1remove_1filter",
-	"_1gdk_1window_1resize",
-	"_1gdk_1window_1restack",
-	"_1gdk_1window_1set_1back_1pixmap",
-	"_1gdk_1window_1set_1background_1pattern",
-	"_1gdk_1window_1set_1cursor",
-	"_1gdk_1window_1set_1decorations",
-	"_1gdk_1window_1set_1events",
-	"_1gdk_1window_1set_1functions",
-	"_1gdk_1window_1set_1override_1redirect",
-	"_1gdk_1window_1set_1user_1data",
-	"_1gdk_1window_1shape_1combine_1region",
-	"_1gdk_1window_1show",
-	"_1gdk_1window_1show_1unraised",
-	"_1gdk_1x11_1atom_1to_1xatom",
-	"_1gdk_1x11_1display_1get_1xdisplay",
-	"_1gdk_1x11_1display_1utf8_1to_1compound_1text",
-	"_1gdk_1x11_1drawable_1get_1xid",
-	"_1gdk_1x11_1get_1default_1xdisplay",
-	"_1gdk_1x11_1screen_1get_1window_1manager_1name",
-	"_1gdk_1x11_1screen_1lookup_1visual",
-	"_1gdk_1x11_1visual_1get_1xvisual",
-	"_1gdk_1x11_1window_1get_1xid",
-	"_1gdk_1x11_1window_1lookup_1for_1display",
-	"_1getpid",
-	"_1glib_1major_1version",
-	"_1glib_1micro_1version",
-	"_1glib_1minor_1version",
 	"_1gtk_1accel_1group_1new",
 	"_1gtk_1accel_1label_1new",
 	"_1gtk_1accel_1label_1set_1accel",
@@ -1462,6 +924,573 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1window_1set_1type_1hint",
 	"_1gtk_1window_1unfullscreen",
 	"_1gtk_1window_1unmaximize",
+};
+#define NATIVE_FUNCTION_COUNT sizeof(GTK_nativeFunctionNames) / sizeof(char*)
+int GTK_nativeFunctionCount = NATIVE_FUNCTION_COUNT;
+int GTK_nativeFunctionCallCount[NATIVE_FUNCTION_COUNT];
+
+#define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
+
+JNIEXPORT jint JNICALL STATS_NATIVE(GTK_1GetFunctionCount)
+	(JNIEnv *env, jclass that)
+{
+	return GTK_nativeFunctionCount;
+}
+
+JNIEXPORT jstring JNICALL STATS_NATIVE(GTK_1GetFunctionName)
+	(JNIEnv *env, jclass that, jint index)
+{
+	return (*env)->NewStringUTF(env, GTK_nativeFunctionNames[index]);
+}
+
+JNIEXPORT jint JNICALL STATS_NATIVE(GTK_1GetFunctionCallCount)
+	(JNIEnv *env, jclass that, jint index)
+{
+	return GTK_nativeFunctionCallCount[index];
+}
+
+#endif
+#ifdef NATIVE_STATS
+
+char * OS_nativeFunctionNames[] = {
+#ifndef JNI64
+	"Call__IIII",
+#else
+	"Call__JJII",
+#endif
+#ifndef JNI64
+	"Call__IIIJ",
+#else
+	"Call__JJIJ",
+#endif
+	"GDK_1EVENT_1TYPE",
+	"GDK_1EVENT_1WINDOW",
+	"GDK_1IS_1X11_1DISPLAY",
+	"GDK_1WINDOWING_1WAYLAND",
+	"GDK_1WINDOWING_1X11",
+	"GInterfaceInfo_1sizeof",
+	"GPollFD_1sizeof",
+	"GTypeInfo_1sizeof",
+	"GTypeQuery_1sizeof",
+	"G_1OBJECT_1CLASS_1CONSTRUCTOR",
+	"G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR",
+	"G_1TYPE_1BOOLEAN",
+	"G_1TYPE_1DOUBLE",
+	"G_1TYPE_1FLOAT",
+	"G_1TYPE_1INT",
+	"G_1TYPE_1INT64",
+	"G_1VALUE_1TYPE",
+	"GdkColor_1sizeof",
+	"GdkDragContext_1sizeof",
+	"GdkEventAny_1sizeof",
+	"GdkEventButton_1sizeof",
+	"GdkEventCrossing_1sizeof",
+	"GdkEventExpose_1sizeof",
+	"GdkEventFocus_1sizeof",
+	"GdkEventKey_1sizeof",
+	"GdkEventMotion_1sizeof",
+	"GdkEventProperty_1sizeof",
+	"GdkEventScroll_1sizeof",
+	"GdkEventWindowState_1sizeof",
+	"GdkEvent_1sizeof",
+	"GdkGeometry_1sizeof",
+	"GdkKeymapKey_1sizeof",
+	"GdkRGBA_1sizeof",
+	"GdkRectangle_1sizeof",
+	"GdkWindowAttr_1sizeof",
+	"PangoAttrColor_1sizeof",
+	"PangoAttrInt_1sizeof",
+	"PangoAttribute_1sizeof",
+	"PangoItem_1sizeof",
+	"PangoLayoutLine_1sizeof",
+	"PangoLayoutRun_1sizeof",
+	"PangoLogAttr_1sizeof",
+	"PangoRectangle_1sizeof",
+	"RTLD_1GLOBAL",
+	"RTLD_1LAZY",
+	"RTLD_1NOW",
+	"XAnyEvent_1sizeof",
+	"XEvent_1sizeof",
+	"XExposeEvent_1sizeof",
+	"XFocusChangeEvent_1sizeof",
+	"X_1EVENT_1TYPE",
+	"X_1EVENT_1WINDOW",
+	"_1Call",
+	"_1FcConfigAppFontAddFile",
+	"_1GDK_1PIXMAP_1XID",
+	"_1GDK_1TYPE_1COLOR",
+	"_1GDK_1TYPE_1PIXBUF",
+	"_1GDK_1TYPE_1RGBA",
+	"_1GString_1len",
+	"_1GString_1str",
+	"_1G_1OBJECT_1CLASS",
+	"_1G_1OBJECT_1GET_1CLASS",
+	"_1G_1OBJECT_1TYPE",
+	"_1G_1OBJECT_1TYPE_1NAME",
+	"_1G_1TYPE_1CHECK_1INSTANCE_1TYPE",
+	"_1G_1TYPE_1STRING",
+	"_1PANGO_1PIXELS",
+	"_1PANGO_1TYPE_1FONT_1DESCRIPTION",
+	"_1PANGO_1TYPE_1FONT_1FACE",
+	"_1PANGO_1TYPE_1FONT_1FAMILY",
+	"_1PANGO_1TYPE_1LAYOUT",
+	"_1XCheckIfEvent",
+	"_1XDefaultRootWindow",
+	"_1XDefaultScreen",
+	"_1XFlush",
+	"_1XFree",
+	"_1XGetWindowProperty",
+	"_1XKeysymToKeycode",
+	"_1XQueryPointer",
+	"_1XSetErrorHandler",
+	"_1XSetIOErrorHandler",
+	"_1XSetInputFocus",
+	"_1XSetTransientForHint",
+	"_1XSynchronize",
+	"_1XTestFakeKeyEvent",
+	"_1access",
+	"_1cachejvmptr",
+#ifndef JNI64
+	"_1call__IIIII",
+#else
+	"_1call__JJJJJ",
+#endif
+#ifndef JNI64
+	"_1call__IIIIIII",
+#else
+	"_1call__JJJJJJJ",
+#endif
+#ifndef JNI64
+	"_1call__IIIIIIII",
+#else
+	"_1call__JJJJJJJJ",
+#endif
+	"_1call_1get_1size",
+	"_1dlopen",
+	"_1g_1app_1info_1create_1from_1commandline",
+	"_1g_1app_1info_1get_1all",
+	"_1g_1app_1info_1get_1default_1for_1type",
+	"_1g_1app_1info_1get_1executable",
+	"_1g_1app_1info_1get_1icon",
+	"_1g_1app_1info_1get_1name",
+	"_1g_1app_1info_1launch",
+	"_1g_1app_1info_1launch_1default_1for_1uri",
+	"_1g_1app_1info_1should_1show",
+	"_1g_1app_1info_1supports_1uris",
+	"_1g_1bus_1own_1name",
+	"_1g_1bytes_1new",
+	"_1g_1bytes_1unref",
+	"_1g_1cclosure_1new",
+	"_1g_1closure_1ref",
+	"_1g_1closure_1sink",
+	"_1g_1closure_1unref",
+	"_1g_1content_1type_1equals",
+	"_1g_1content_1type_1is_1a",
+	"_1g_1dbus_1connection_1register_1object",
+	"_1g_1dbus_1method_1invocation_1return_1value",
+	"_1g_1dbus_1node_1info_1lookup_1interface",
+	"_1g_1dbus_1node_1info_1new_1for_1xml",
+	"_1g_1error_1free",
+	"_1g_1error_1get_1message",
+	"_1g_1file_1get_1uri",
+	"_1g_1file_1info_1get_1content_1type",
+	"_1g_1file_1new_1for_1commandline_1arg",
+	"_1g_1file_1new_1for_1path",
+	"_1g_1file_1new_1for_1uri",
+	"_1g_1file_1query_1info",
+	"_1g_1file_1test",
+	"_1g_1filename_1display_1name",
+	"_1g_1filename_1from_1uri",
+	"_1g_1filename_1from_1utf8",
+	"_1g_1filename_1to_1uri",
+	"_1g_1filename_1to_1utf8",
+	"_1g_1free",
+	"_1g_1hash_1table_1get_1values",
+	"_1g_1icon_1new_1for_1string",
+	"_1g_1icon_1to_1string",
+	"_1g_1idle_1add",
+	"_1g_1list_1append",
+	"_1g_1list_1data",
+	"_1g_1list_1free",
+	"_1g_1list_1free_11",
+	"_1g_1list_1last",
+	"_1g_1list_1length",
+	"_1g_1list_1next",
+	"_1g_1list_1nth",
+	"_1g_1list_1nth_1data",
+	"_1g_1list_1prepend",
+	"_1g_1list_1previous",
+	"_1g_1list_1remove_1link",
+	"_1g_1list_1set_1next",
+	"_1g_1list_1set_1previous",
+	"_1g_1log_1default_1handler",
+	"_1g_1log_1remove_1handler",
+	"_1g_1log_1set_1handler",
+	"_1g_1main_1context_1acquire",
+	"_1g_1main_1context_1check",
+	"_1g_1main_1context_1default",
+	"_1g_1main_1context_1get_1poll_1func",
+	"_1g_1main_1context_1iteration",
+	"_1g_1main_1context_1prepare",
+	"_1g_1main_1context_1query",
+	"_1g_1main_1context_1release",
+	"_1g_1malloc",
+	"_1g_1object_1class_1find_1property",
+#ifndef JNI64
+	"_1g_1object_1get__I_3B_3II",
+#else
+	"_1g_1object_1get__J_3B_3IJ",
+#endif
+#ifndef JNI64
+	"_1g_1object_1get__I_3B_3JI",
+#else
+	"_1g_1object_1get__J_3B_3JJ",
+#endif
+	"_1g_1object_1get_1qdata",
+	"_1g_1object_1new",
+	"_1g_1object_1notify",
+	"_1g_1object_1ref",
+	"_1g_1object_1ref_1sink",
+#ifndef JNI64
+	"_1g_1object_1set__I_3BFI",
+#else
+	"_1g_1object_1set__J_3BFJ",
+#endif
+#ifndef JNI64
+	"_1g_1object_1set__I_3BII",
+#else
+	"_1g_1object_1set__J_3BIJ",
+#endif
+#ifndef JNI64
+	"_1g_1object_1set__I_3BJI",
+#else
+	"_1g_1object_1set__J_3BJJ",
+#endif
+#ifndef JNI64
+	"_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I",
+#else
+	"_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J",
+#endif
+#ifndef JNI64
+	"_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I",
+#else
+	"_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J",
+#endif
+#ifndef JNI64
+	"_1g_1object_1set__I_3BZI",
+#else
+	"_1g_1object_1set__J_3BZJ",
+#endif
+#ifndef JNI64
+	"_1g_1object_1set__I_3B_3BI",
+#else
+	"_1g_1object_1set__J_3B_3BJ",
+#endif
+	"_1g_1object_1set_1qdata",
+	"_1g_1object_1unref",
+	"_1g_1quark_1from_1string",
+	"_1g_1set_1prgname",
+	"_1g_1signal_1add_1emission_1hook",
+	"_1g_1signal_1connect",
+	"_1g_1signal_1connect_1closure",
+	"_1g_1signal_1connect_1closure_1by_1id",
+#ifndef JNI64
+	"_1g_1signal_1emit_1by_1name__I_3B",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3B",
+#endif
+#ifndef JNI64
+	"_1g_1signal_1emit_1by_1name__I_3BI",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3BJ",
+#endif
+#ifndef JNI64
+	"_1g_1signal_1emit_1by_1name__I_3BII",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3BJJ",
+#endif
+#ifndef JNI64
+	"_1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2",
+#endif
+#ifndef JNI64
+	"_1g_1signal_1emit_1by_1name__I_3B_3B",
+#else
+	"_1g_1signal_1emit_1by_1name__J_3B_3B",
+#endif
+	"_1g_1signal_1handler_1disconnect",
+	"_1g_1signal_1handler_1find",
+	"_1g_1signal_1handlers_1block_1matched",
+	"_1g_1signal_1handlers_1unblock_1matched",
+	"_1g_1signal_1lookup",
+	"_1g_1signal_1remove_1emission_1hook",
+	"_1g_1signal_1stop_1emission_1by_1name",
+	"_1g_1slist_1append",
+	"_1g_1slist_1data",
+	"_1g_1slist_1free",
+	"_1g_1slist_1length",
+	"_1g_1slist_1next",
+	"_1g_1source_1remove",
+	"_1g_1strfreev",
+	"_1g_1string_1free",
+	"_1g_1string_1new_1len",
+	"_1g_1strtod",
+	"_1g_1thread_1init",
+	"_1g_1thread_1supported",
+	"_1g_1timeout_1add",
+	"_1g_1type_1add_1interface_1static",
+	"_1g_1type_1class_1peek",
+	"_1g_1type_1class_1peek_1parent",
+	"_1g_1type_1class_1ref",
+	"_1g_1type_1class_1unref",
+	"_1g_1type_1from_1name",
+	"_1g_1type_1interface_1peek_1parent",
+	"_1g_1type_1is_1a",
+	"_1g_1type_1name",
+	"_1g_1type_1parent",
+	"_1g_1type_1query",
+	"_1g_1type_1register_1static",
+	"_1g_1utf16_1offset_1to_1pointer",
+	"_1g_1utf16_1offset_1to_1utf8_1offset",
+	"_1g_1utf16_1pointer_1to_1offset",
+	"_1g_1utf16_1strlen",
+	"_1g_1utf16_1to_1utf8",
+	"_1g_1utf8_1offset_1to_1utf16_1offset",
+	"_1g_1utf8_1pointer_1to_1offset",
+	"_1g_1utf8_1strlen",
+#ifndef JNI64
+	"_1g_1utf8_1to_1utf16__II_3I_3I_3I",
+#else
+	"_1g_1utf8_1to_1utf16__JJ_3J_3J_3J",
+#endif
+#ifndef JNI64
+	"_1g_1utf8_1to_1utf16___3BI_3I_3I_3I",
+#else
+	"_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J",
+#endif
+	"_1g_1value_1peek_1pointer",
+	"_1g_1variant_1get_1boolean",
+	"_1g_1variant_1get_1byte",
+	"_1g_1variant_1get_1child_1value",
+	"_1g_1variant_1get_1double",
+	"_1g_1variant_1get_1int32",
+	"_1g_1variant_1get_1string",
+	"_1g_1variant_1get_1type",
+	"_1g_1variant_1get_1type_1string",
+	"_1g_1variant_1is_1of_1type",
+	"_1g_1variant_1n_1children",
+	"_1g_1variant_1new_1boolean",
+	"_1g_1variant_1new_1byte",
+	"_1g_1variant_1new_1double",
+	"_1g_1variant_1new_1int32",
+	"_1g_1variant_1new_1string",
+	"_1g_1variant_1new_1tuple",
+	"_1gdk_1atom_1intern",
+	"_1gdk_1atom_1name",
+	"_1gdk_1beep",
+	"_1gdk_1bitmap_1create_1from_1data",
+	"_1gdk_1cairo_1create",
+	"_1gdk_1cairo_1get_1clip_1rectangle",
+	"_1gdk_1cairo_1region",
+	"_1gdk_1cairo_1region_1create_1from_1surface",
+	"_1gdk_1cairo_1reset_1clip",
+	"_1gdk_1cairo_1set_1source_1color",
+	"_1gdk_1cairo_1set_1source_1pixbuf",
+	"_1gdk_1cairo_1set_1source_1pixmap",
+	"_1gdk_1cairo_1set_1source_1rgba",
+	"_1gdk_1cairo_1set_1source_1window",
+	"_1gdk_1color_1free",
+	"_1gdk_1color_1parse",
+	"_1gdk_1color_1white",
+	"_1gdk_1colormap_1alloc_1color",
+	"_1gdk_1colormap_1free_1colors",
+	"_1gdk_1colormap_1get_1system",
+	"_1gdk_1cursor_1new_1for_1display",
+	"_1gdk_1cursor_1new_1from_1name",
+	"_1gdk_1cursor_1new_1from_1pixbuf",
+	"_1gdk_1cursor_1new_1from_1pixmap",
+	"_1gdk_1cursor_1unref",
+	"_1gdk_1device_1get_1associated_1device",
+	"_1gdk_1device_1get_1window_1at_1position",
+	"_1gdk_1device_1grab",
+	"_1gdk_1device_1manager_1get_1client_1pointer",
+	"_1gdk_1device_1ungrab",
+	"_1gdk_1device_1warp",
+	"_1gdk_1display_1get_1default",
+	"_1gdk_1display_1get_1default_1seat",
+	"_1gdk_1display_1get_1device_1manager",
+	"_1gdk_1display_1supports_1cursor_1color",
+	"_1gdk_1display_1warp_1pointer",
+	"_1gdk_1drag_1context_1get_1actions",
+	"_1gdk_1drag_1context_1get_1dest_1window",
+	"_1gdk_1drag_1context_1get_1selected_1action",
+	"_1gdk_1drag_1context_1list_1targets",
+	"_1gdk_1drag_1status",
+	"_1gdk_1draw_1arc",
+	"_1gdk_1draw_1image",
+	"_1gdk_1draw_1pixbuf",
+	"_1gdk_1draw_1rectangle",
+	"_1gdk_1drawable_1get_1depth",
+	"_1gdk_1drawable_1get_1image",
+	"_1gdk_1drawable_1get_1visible_1region",
+	"_1gdk_1error_1trap_1pop",
+	"_1gdk_1error_1trap_1push",
+	"_1gdk_1event_1copy",
+	"_1gdk_1event_1free",
+	"_1gdk_1event_1get",
+	"_1gdk_1event_1get_1coords",
+	"_1gdk_1event_1get_1event_1type",
+	"_1gdk_1event_1get_1scroll_1deltas",
+	"_1gdk_1event_1get_1seat",
+	"_1gdk_1event_1get_1state",
+	"_1gdk_1event_1get_1time",
+	"_1gdk_1event_1handler_1set",
+	"_1gdk_1event_1new",
+	"_1gdk_1event_1peek",
+	"_1gdk_1event_1put",
+	"_1gdk_1flush",
+	"_1gdk_1gc_1new",
+	"_1gdk_1gc_1set_1fill",
+	"_1gdk_1gc_1set_1foreground",
+	"_1gdk_1gc_1set_1function",
+	"_1gdk_1gc_1set_1stipple",
+	"_1gdk_1gc_1set_1subwindow",
+	"_1gdk_1get_1default_1root_1window",
+	"_1gdk_1keyboard_1ungrab",
+	"_1gdk_1keymap_1get_1default",
+	"_1gdk_1keymap_1get_1entries_1for_1keyval",
+	"_1gdk_1keymap_1translate_1keyboard_1state",
+	"_1gdk_1keyval_1to_1lower",
+	"_1gdk_1keyval_1to_1unicode",
+	"_1gdk_1pango_1context_1get",
+	"_1gdk_1pango_1layout_1get_1clip_1region",
+	"_1gdk_1pixbuf_1copy_1area",
+	"_1gdk_1pixbuf_1get_1from_1drawable",
+	"_1gdk_1pixbuf_1get_1from_1window",
+	"_1gdk_1pixbuf_1get_1has_1alpha",
+	"_1gdk_1pixbuf_1get_1height",
+	"_1gdk_1pixbuf_1get_1pixels",
+	"_1gdk_1pixbuf_1get_1rowstride",
+	"_1gdk_1pixbuf_1get_1width",
+	"_1gdk_1pixbuf_1loader_1close",
+	"_1gdk_1pixbuf_1loader_1get_1pixbuf",
+	"_1gdk_1pixbuf_1loader_1new",
+	"_1gdk_1pixbuf_1loader_1write",
+	"_1gdk_1pixbuf_1new",
+	"_1gdk_1pixbuf_1new_1from_1file",
+	"_1gdk_1pixbuf_1save_1to_1bufferv",
+	"_1gdk_1pixbuf_1scale_1simple",
+	"_1gdk_1pixmap_1get_1size",
+	"_1gdk_1pixmap_1new",
+	"_1gdk_1pointer_1grab",
+	"_1gdk_1pointer_1ungrab",
+	"_1gdk_1property_1get",
+	"_1gdk_1region_1destroy",
+	"_1gdk_1region_1empty",
+	"_1gdk_1region_1get_1clipbox",
+	"_1gdk_1region_1get_1rectangles",
+	"_1gdk_1region_1intersect",
+	"_1gdk_1region_1new",
+	"_1gdk_1region_1offset",
+	"_1gdk_1region_1point_1in",
+	"_1gdk_1region_1polygon",
+	"_1gdk_1region_1rect_1in",
+	"_1gdk_1region_1rectangle",
+	"_1gdk_1region_1subtract",
+	"_1gdk_1region_1union",
+	"_1gdk_1region_1union_1with_1rect",
+	"_1gdk_1rgba_1free",
+	"_1gdk_1rgba_1hash",
+	"_1gdk_1rgba_1parse",
+	"_1gdk_1rgba_1to_1string",
+	"_1gdk_1screen_1get_1active_1window",
+	"_1gdk_1screen_1get_1default",
+	"_1gdk_1screen_1get_1monitor_1at_1point",
+	"_1gdk_1screen_1get_1monitor_1at_1window",
+	"_1gdk_1screen_1get_1monitor_1geometry",
+	"_1gdk_1screen_1get_1monitor_1scale_1factor",
+	"_1gdk_1screen_1get_1monitor_1width_1mm",
+	"_1gdk_1screen_1get_1monitor_1workarea",
+	"_1gdk_1screen_1get_1n_1monitors",
+	"_1gdk_1screen_1get_1primary_1monitor",
+	"_1gdk_1screen_1get_1resolution",
+	"_1gdk_1screen_1height",
+	"_1gdk_1screen_1width",
+	"_1gdk_1screen_1width_1mm",
+	"_1gdk_1seat_1get_1pointer",
+	"_1gdk_1seat_1grab",
+	"_1gdk_1seat_1ungrab",
+	"_1gdk_1selection_1owner_1get",
+	"_1gdk_1selection_1owner_1set",
+	"_1gdk_1set_1program_1class",
+	"_1gdk_1test_1simulate_1button",
+	"_1gdk_1text_1property_1to_1utf8_1list_1for_1display",
+	"_1gdk_1unicode_1to_1keyval",
+	"_1gdk_1utf8_1to_1string_1target",
+	"_1gdk_1visual_1get_1depth",
+	"_1gdk_1visual_1get_1system",
+	"_1gdk_1window_1add_1filter",
+	"_1gdk_1window_1at_1pointer",
+	"_1gdk_1window_1begin_1paint_1rect",
+	"_1gdk_1window_1create_1similar_1surface",
+	"_1gdk_1window_1destroy",
+	"_1gdk_1window_1end_1paint",
+	"_1gdk_1window_1focus",
+	"_1gdk_1window_1get_1children",
+	"_1gdk_1window_1get_1device_1position",
+	"_1gdk_1window_1get_1display",
+	"_1gdk_1window_1get_1events",
+	"_1gdk_1window_1get_1frame_1extents",
+	"_1gdk_1window_1get_1height",
+	"_1gdk_1window_1get_1internal_1paint_1info",
+	"_1gdk_1window_1get_1origin",
+	"_1gdk_1window_1get_1parent",
+	"_1gdk_1window_1get_1pointer",
+	"_1gdk_1window_1get_1position",
+	"_1gdk_1window_1get_1root_1origin",
+	"_1gdk_1window_1get_1user_1data",
+	"_1gdk_1window_1get_1visible_1region",
+	"_1gdk_1window_1get_1width",
+	"_1gdk_1window_1hide",
+	"_1gdk_1window_1invalidate_1rect",
+	"_1gdk_1window_1invalidate_1region",
+	"_1gdk_1window_1is_1visible",
+	"_1gdk_1window_1lower",
+	"_1gdk_1window_1move",
+	"_1gdk_1window_1move_1resize",
+	"_1gdk_1window_1new",
+	"_1gdk_1window_1process_1all_1updates",
+	"_1gdk_1window_1process_1updates",
+	"_1gdk_1window_1raise",
+	"_1gdk_1window_1remove_1filter",
+	"_1gdk_1window_1resize",
+	"_1gdk_1window_1restack",
+	"_1gdk_1window_1set_1back_1pixmap",
+	"_1gdk_1window_1set_1background_1pattern",
+	"_1gdk_1window_1set_1cursor",
+	"_1gdk_1window_1set_1decorations",
+	"_1gdk_1window_1set_1events",
+	"_1gdk_1window_1set_1functions",
+	"_1gdk_1window_1set_1override_1redirect",
+	"_1gdk_1window_1set_1user_1data",
+	"_1gdk_1window_1shape_1combine_1region",
+	"_1gdk_1window_1show",
+	"_1gdk_1window_1show_1unraised",
+	"_1gdk_1x11_1atom_1to_1xatom",
+	"_1gdk_1x11_1display_1get_1xdisplay",
+	"_1gdk_1x11_1display_1utf8_1to_1compound_1text",
+	"_1gdk_1x11_1drawable_1get_1xid",
+	"_1gdk_1x11_1get_1default_1xdisplay",
+	"_1gdk_1x11_1screen_1get_1window_1manager_1name",
+	"_1gdk_1x11_1screen_1lookup_1visual",
+	"_1gdk_1x11_1visual_1get_1xvisual",
+	"_1gdk_1x11_1window_1get_1xid",
+	"_1gdk_1x11_1window_1lookup_1for_1display",
+	"_1getpid",
+	"_1glib_1major_1version",
+	"_1glib_1micro_1version",
+	"_1glib_1minor_1version",
 	"_1pango_1attr_1background_1new",
 	"_1pango_1attr_1font_1desc_1new",
 	"_1pango_1attr_1foreground_1new",
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 0b17e4ecd9..5084b210fe 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
@@ -17,38 +17,21 @@
 /* DO NOT EDIT - your changes will be lost. */
 
 #ifdef NATIVE_STATS
-extern int OS_nativeFunctionCount;
-extern int OS_nativeFunctionCallCount[];
-extern char* OS_nativeFunctionNames[];
-#define OS_NATIVE_ENTER(env, that, func) OS_nativeFunctionCallCount[func]++;
-#define OS_NATIVE_EXIT(env, that, func) 
+extern int GTK_nativeFunctionCount;
+extern int GTK_nativeFunctionCallCount[];
+extern char* GTK_nativeFunctionNames[];
+#define GTK_NATIVE_ENTER(env, that, func) GTK_nativeFunctionCallCount[func]++;
+#define GTK_NATIVE_EXIT(env, that, func) 
 #else
-#ifndef OS_NATIVE_ENTER
-#define OS_NATIVE_ENTER(env, that, func) 
+#ifndef GTK_NATIVE_ENTER
+#define GTK_NATIVE_ENTER(env, that, func) 
 #endif
-#ifndef OS_NATIVE_EXIT
-#define OS_NATIVE_EXIT(env, that, func) 
+#ifndef GTK_NATIVE_EXIT
+#define GTK_NATIVE_EXIT(env, that, func) 
 #endif
 #endif
 
 typedef enum {
-#ifndef JNI64
-	Call__IIII_FUNC,
-#else
-	Call__JJII_FUNC,
-#endif
-#ifndef JNI64
-	Call__IIIJ_FUNC,
-#else
-	Call__JJIJ_FUNC,
-#endif
-	GDK_1EVENT_1TYPE_FUNC,
-	GDK_1EVENT_1WINDOW_FUNC,
-	GDK_1IS_1X11_1DISPLAY_FUNC,
-	GDK_1WINDOWING_1WAYLAND_FUNC,
-	GDK_1WINDOWING_1X11_FUNC,
-	GInterfaceInfo_1sizeof_FUNC,
-	GPollFD_1sizeof_FUNC,
 	GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC,
 	GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC,
 	GTK_1ENTRY_1IM_1CONTEXT_FUNC,
@@ -57,34 +40,6 @@ typedef enum {
 	GTK_1WIDGET_1GET_1CLASS_FUNC,
 	GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC,
 	GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC,
-	GTypeInfo_1sizeof_FUNC,
-	GTypeQuery_1sizeof_FUNC,
-	G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC,
-	G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC,
-	G_1TYPE_1BOOLEAN_FUNC,
-	G_1TYPE_1DOUBLE_FUNC,
-	G_1TYPE_1FLOAT_FUNC,
-	G_1TYPE_1INT_FUNC,
-	G_1TYPE_1INT64_FUNC,
-	G_1VALUE_1TYPE_FUNC,
-	GdkColor_1sizeof_FUNC,
-	GdkDragContext_1sizeof_FUNC,
-	GdkEventAny_1sizeof_FUNC,
-	GdkEventButton_1sizeof_FUNC,
-	GdkEventCrossing_1sizeof_FUNC,
-	GdkEventExpose_1sizeof_FUNC,
-	GdkEventFocus_1sizeof_FUNC,
-	GdkEventKey_1sizeof_FUNC,
-	GdkEventMotion_1sizeof_FUNC,
-	GdkEventProperty_1sizeof_FUNC,
-	GdkEventScroll_1sizeof_FUNC,
-	GdkEventWindowState_1sizeof_FUNC,
-	GdkEvent_1sizeof_FUNC,
-	GdkGeometry_1sizeof_FUNC,
-	GdkKeymapKey_1sizeof_FUNC,
-	GdkRGBA_1sizeof_FUNC,
-	GdkRectangle_1sizeof_FUNC,
-	GdkWindowAttr_1sizeof_FUNC,
 	GtkAllocation_1sizeof_FUNC,
 	GtkBorder_1sizeof_FUNC,
 	GtkCellRendererPixbufClass_1sizeof_FUNC,
@@ -97,32 +52,7 @@ typedef enum {
 	GtkTargetEntry_1sizeof_FUNC,
 	GtkTextIter_1sizeof_FUNC,
 	GtkTreeIter_1sizeof_FUNC,
-	PangoAttrColor_1sizeof_FUNC,
-	PangoAttrInt_1sizeof_FUNC,
-	PangoAttribute_1sizeof_FUNC,
-	PangoItem_1sizeof_FUNC,
-	PangoLayoutLine_1sizeof_FUNC,
-	PangoLayoutRun_1sizeof_FUNC,
-	PangoLogAttr_1sizeof_FUNC,
-	PangoRectangle_1sizeof_FUNC,
-	RTLD_1GLOBAL_FUNC,
-	RTLD_1LAZY_FUNC,
-	RTLD_1NOW_FUNC,
-	XAnyEvent_1sizeof_FUNC,
-	XEvent_1sizeof_FUNC,
-	XExposeEvent_1sizeof_FUNC,
-	XFocusChangeEvent_1sizeof_FUNC,
-	X_1EVENT_1TYPE_FUNC,
-	X_1EVENT_1WINDOW_FUNC,
-	_1Call_FUNC,
-	_1FcConfigAppFontAddFile_FUNC,
-	_1GDK_1PIXMAP_1XID_FUNC,
-	_1GDK_1TYPE_1COLOR_FUNC,
-	_1GDK_1TYPE_1PIXBUF_FUNC,
-	_1GDK_1TYPE_1RGBA_FUNC,
 	_1GET_1FUNCTION_1POINTER_1gtk_1false_FUNC,
-	_1GString_1len_FUNC,
-	_1GString_1str_FUNC,
 	_1GTK_1ACCESSIBLE_FUNC,
 	_1GTK_1IS_1ACCEL_1LABEL_FUNC,
 	_1GTK_1IS_1BUTTON_FUNC,
@@ -147,474 +77,6 @@ typedef enum {
 	_1GTK_1TYPE_1WIDGET_FUNC,
 	_1GTK_1WIDGET_1SET_1FLAGS_FUNC,
 	_1GTK_1WIDGET_1UNSET_1FLAGS_FUNC,
-	_1G_1OBJECT_1CLASS_FUNC,
-	_1G_1OBJECT_1GET_1CLASS_FUNC,
-	_1G_1OBJECT_1TYPE_FUNC,
-	_1G_1OBJECT_1TYPE_1NAME_FUNC,
-	_1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC,
-	_1G_1TYPE_1STRING_FUNC,
-	_1PANGO_1PIXELS_FUNC,
-	_1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC,
-	_1PANGO_1TYPE_1FONT_1FACE_FUNC,
-	_1PANGO_1TYPE_1FONT_1FAMILY_FUNC,
-	_1PANGO_1TYPE_1LAYOUT_FUNC,
-	_1XCheckIfEvent_FUNC,
-	_1XDefaultRootWindow_FUNC,
-	_1XDefaultScreen_FUNC,
-	_1XFlush_FUNC,
-	_1XFree_FUNC,
-	_1XGetWindowProperty_FUNC,
-	_1XKeysymToKeycode_FUNC,
-	_1XQueryPointer_FUNC,
-	_1XSetErrorHandler_FUNC,
-	_1XSetIOErrorHandler_FUNC,
-	_1XSetInputFocus_FUNC,
-	_1XSetTransientForHint_FUNC,
-	_1XSynchronize_FUNC,
-	_1XTestFakeKeyEvent_FUNC,
-	_1access_FUNC,
-	_1cachejvmptr_FUNC,
-#ifndef JNI64
-	_1call__IIIII_FUNC,
-#else
-	_1call__JJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1call__IIIIIII_FUNC,
-#else
-	_1call__JJJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1call__IIIIIIII_FUNC,
-#else
-	_1call__JJJJJJJJ_FUNC,
-#endif
-	_1call_1get_1size_FUNC,
-	_1dlopen_FUNC,
-	_1g_1app_1info_1create_1from_1commandline_FUNC,
-	_1g_1app_1info_1get_1all_FUNC,
-	_1g_1app_1info_1get_1default_1for_1type_FUNC,
-	_1g_1app_1info_1get_1executable_FUNC,
-	_1g_1app_1info_1get_1icon_FUNC,
-	_1g_1app_1info_1get_1name_FUNC,
-	_1g_1app_1info_1launch_FUNC,
-	_1g_1app_1info_1launch_1default_1for_1uri_FUNC,
-	_1g_1app_1info_1should_1show_FUNC,
-	_1g_1app_1info_1supports_1uris_FUNC,
-	_1g_1bus_1own_1name_FUNC,
-	_1g_1bytes_1new_FUNC,
-	_1g_1bytes_1unref_FUNC,
-	_1g_1cclosure_1new_FUNC,
-	_1g_1closure_1ref_FUNC,
-	_1g_1closure_1sink_FUNC,
-	_1g_1closure_1unref_FUNC,
-	_1g_1content_1type_1equals_FUNC,
-	_1g_1content_1type_1is_1a_FUNC,
-	_1g_1dbus_1connection_1register_1object_FUNC,
-	_1g_1dbus_1method_1invocation_1return_1value_FUNC,
-	_1g_1dbus_1node_1info_1lookup_1interface_FUNC,
-	_1g_1dbus_1node_1info_1new_1for_1xml_FUNC,
-	_1g_1error_1free_FUNC,
-	_1g_1error_1get_1message_FUNC,
-	_1g_1file_1get_1uri_FUNC,
-	_1g_1file_1info_1get_1content_1type_FUNC,
-	_1g_1file_1new_1for_1commandline_1arg_FUNC,
-	_1g_1file_1new_1for_1path_FUNC,
-	_1g_1file_1new_1for_1uri_FUNC,
-	_1g_1file_1query_1info_FUNC,
-	_1g_1file_1test_FUNC,
-	_1g_1filename_1display_1name_FUNC,
-	_1g_1filename_1from_1uri_FUNC,
-	_1g_1filename_1from_1utf8_FUNC,
-	_1g_1filename_1to_1uri_FUNC,
-	_1g_1filename_1to_1utf8_FUNC,
-	_1g_1free_FUNC,
-	_1g_1hash_1table_1get_1values_FUNC,
-	_1g_1icon_1new_1for_1string_FUNC,
-	_1g_1icon_1to_1string_FUNC,
-	_1g_1idle_1add_FUNC,
-	_1g_1list_1append_FUNC,
-	_1g_1list_1data_FUNC,
-	_1g_1list_1free_FUNC,
-	_1g_1list_1free_11_FUNC,
-	_1g_1list_1last_FUNC,
-	_1g_1list_1length_FUNC,
-	_1g_1list_1next_FUNC,
-	_1g_1list_1nth_FUNC,
-	_1g_1list_1nth_1data_FUNC,
-	_1g_1list_1prepend_FUNC,
-	_1g_1list_1previous_FUNC,
-	_1g_1list_1remove_1link_FUNC,
-	_1g_1list_1set_1next_FUNC,
-	_1g_1list_1set_1previous_FUNC,
-	_1g_1log_1default_1handler_FUNC,
-	_1g_1log_1remove_1handler_FUNC,
-	_1g_1log_1set_1handler_FUNC,
-	_1g_1main_1context_1acquire_FUNC,
-	_1g_1main_1context_1check_FUNC,
-	_1g_1main_1context_1default_FUNC,
-	_1g_1main_1context_1get_1poll_1func_FUNC,
-	_1g_1main_1context_1iteration_FUNC,
-	_1g_1main_1context_1prepare_FUNC,
-	_1g_1main_1context_1query_FUNC,
-	_1g_1main_1context_1release_FUNC,
-	_1g_1malloc_FUNC,
-	_1g_1object_1class_1find_1property_FUNC,
-#ifndef JNI64
-	_1g_1object_1get__I_3B_3II_FUNC,
-#else
-	_1g_1object_1get__J_3B_3IJ_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1object_1get__I_3B_3JI_FUNC,
-#else
-	_1g_1object_1get__J_3B_3JJ_FUNC,
-#endif
-	_1g_1object_1get_1qdata_FUNC,
-	_1g_1object_1new_FUNC,
-	_1g_1object_1notify_FUNC,
-	_1g_1object_1ref_FUNC,
-	_1g_1object_1ref_1sink_FUNC,
-#ifndef JNI64
-	_1g_1object_1set__I_3BFI_FUNC,
-#else
-	_1g_1object_1set__J_3BFJ_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1object_1set__I_3BII_FUNC,
-#else
-	_1g_1object_1set__J_3BIJ_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1object_1set__I_3BJI_FUNC,
-#else
-	_1g_1object_1set__J_3BJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
-#else
-	_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC,
-#else
-	_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1object_1set__I_3BZI_FUNC,
-#else
-	_1g_1object_1set__J_3BZJ_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1object_1set__I_3B_3BI_FUNC,
-#else
-	_1g_1object_1set__J_3B_3BJ_FUNC,
-#endif
-	_1g_1object_1set_1qdata_FUNC,
-	_1g_1object_1unref_FUNC,
-	_1g_1quark_1from_1string_FUNC,
-	_1g_1set_1prgname_FUNC,
-	_1g_1signal_1add_1emission_1hook_FUNC,
-	_1g_1signal_1connect_FUNC,
-	_1g_1signal_1connect_1closure_FUNC,
-	_1g_1signal_1connect_1closure_1by_1id_FUNC,
-#ifndef JNI64
-	_1g_1signal_1emit_1by_1name__I_3B_FUNC,
-#else
-	_1g_1signal_1emit_1by_1name__J_3B_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1signal_1emit_1by_1name__I_3BI_FUNC,
-#else
-	_1g_1signal_1emit_1by_1name__J_3BJ_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1signal_1emit_1by_1name__I_3BII_FUNC,
-#else
-	_1g_1signal_1emit_1by_1name__J_3BJJ_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC,
-#else
-	_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1signal_1emit_1by_1name__I_3B_3B_FUNC,
-#else
-	_1g_1signal_1emit_1by_1name__J_3B_3B_FUNC,
-#endif
-	_1g_1signal_1handler_1disconnect_FUNC,
-	_1g_1signal_1handler_1find_FUNC,
-	_1g_1signal_1handlers_1block_1matched_FUNC,
-	_1g_1signal_1handlers_1unblock_1matched_FUNC,
-	_1g_1signal_1lookup_FUNC,
-	_1g_1signal_1remove_1emission_1hook_FUNC,
-	_1g_1signal_1stop_1emission_1by_1name_FUNC,
-	_1g_1slist_1append_FUNC,
-	_1g_1slist_1data_FUNC,
-	_1g_1slist_1free_FUNC,
-	_1g_1slist_1length_FUNC,
-	_1g_1slist_1next_FUNC,
-	_1g_1source_1remove_FUNC,
-	_1g_1strfreev_FUNC,
-	_1g_1string_1free_FUNC,
-	_1g_1string_1new_1len_FUNC,
-	_1g_1strtod_FUNC,
-	_1g_1thread_1init_FUNC,
-	_1g_1thread_1supported_FUNC,
-	_1g_1timeout_1add_FUNC,
-	_1g_1type_1add_1interface_1static_FUNC,
-	_1g_1type_1class_1peek_FUNC,
-	_1g_1type_1class_1peek_1parent_FUNC,
-	_1g_1type_1class_1ref_FUNC,
-	_1g_1type_1class_1unref_FUNC,
-	_1g_1type_1from_1name_FUNC,
-	_1g_1type_1interface_1peek_1parent_FUNC,
-	_1g_1type_1is_1a_FUNC,
-	_1g_1type_1name_FUNC,
-	_1g_1type_1parent_FUNC,
-	_1g_1type_1query_FUNC,
-	_1g_1type_1register_1static_FUNC,
-	_1g_1utf16_1offset_1to_1pointer_FUNC,
-	_1g_1utf16_1offset_1to_1utf8_1offset_FUNC,
-	_1g_1utf16_1pointer_1to_1offset_FUNC,
-	_1g_1utf16_1strlen_FUNC,
-	_1g_1utf16_1to_1utf8_FUNC,
-	_1g_1utf8_1offset_1to_1utf16_1offset_FUNC,
-	_1g_1utf8_1pointer_1to_1offset_FUNC,
-	_1g_1utf8_1strlen_FUNC,
-#ifndef JNI64
-	_1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC,
-#else
-	_1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC,
-#else
-	_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC,
-#endif
-	_1g_1value_1peek_1pointer_FUNC,
-	_1g_1variant_1get_1boolean_FUNC,
-	_1g_1variant_1get_1byte_FUNC,
-	_1g_1variant_1get_1child_1value_FUNC,
-	_1g_1variant_1get_1double_FUNC,
-	_1g_1variant_1get_1int32_FUNC,
-	_1g_1variant_1get_1string_FUNC,
-	_1g_1variant_1get_1type_FUNC,
-	_1g_1variant_1get_1type_1string_FUNC,
-	_1g_1variant_1is_1of_1type_FUNC,
-	_1g_1variant_1n_1children_FUNC,
-	_1g_1variant_1new_1boolean_FUNC,
-	_1g_1variant_1new_1byte_FUNC,
-	_1g_1variant_1new_1double_FUNC,
-	_1g_1variant_1new_1int32_FUNC,
-	_1g_1variant_1new_1string_FUNC,
-	_1g_1variant_1new_1tuple_FUNC,
-	_1gdk_1atom_1intern_FUNC,
-	_1gdk_1atom_1name_FUNC,
-	_1gdk_1beep_FUNC,
-	_1gdk_1bitmap_1create_1from_1data_FUNC,
-	_1gdk_1cairo_1create_FUNC,
-	_1gdk_1cairo_1get_1clip_1rectangle_FUNC,
-	_1gdk_1cairo_1region_FUNC,
-	_1gdk_1cairo_1region_1create_1from_1surface_FUNC,
-	_1gdk_1cairo_1reset_1clip_FUNC,
-	_1gdk_1cairo_1set_1source_1color_FUNC,
-	_1gdk_1cairo_1set_1source_1pixbuf_FUNC,
-	_1gdk_1cairo_1set_1source_1pixmap_FUNC,
-	_1gdk_1cairo_1set_1source_1rgba_FUNC,
-	_1gdk_1cairo_1set_1source_1window_FUNC,
-	_1gdk_1color_1free_FUNC,
-	_1gdk_1color_1parse_FUNC,
-	_1gdk_1color_1white_FUNC,
-	_1gdk_1colormap_1alloc_1color_FUNC,
-	_1gdk_1colormap_1free_1colors_FUNC,
-	_1gdk_1colormap_1get_1system_FUNC,
-	_1gdk_1cursor_1new_1for_1display_FUNC,
-	_1gdk_1cursor_1new_1from_1name_FUNC,
-	_1gdk_1cursor_1new_1from_1pixbuf_FUNC,
-	_1gdk_1cursor_1new_1from_1pixmap_FUNC,
-	_1gdk_1cursor_1unref_FUNC,
-	_1gdk_1device_1get_1associated_1device_FUNC,
-	_1gdk_1device_1get_1window_1at_1position_FUNC,
-	_1gdk_1device_1grab_FUNC,
-	_1gdk_1device_1manager_1get_1client_1pointer_FUNC,
-	_1gdk_1device_1ungrab_FUNC,
-	_1gdk_1device_1warp_FUNC,
-	_1gdk_1display_1get_1default_FUNC,
-	_1gdk_1display_1get_1default_1seat_FUNC,
-	_1gdk_1display_1get_1device_1manager_FUNC,
-	_1gdk_1display_1supports_1cursor_1color_FUNC,
-	_1gdk_1display_1warp_1pointer_FUNC,
-	_1gdk_1drag_1context_1get_1actions_FUNC,
-	_1gdk_1drag_1context_1get_1dest_1window_FUNC,
-	_1gdk_1drag_1context_1get_1selected_1action_FUNC,
-	_1gdk_1drag_1context_1list_1targets_FUNC,
-	_1gdk_1drag_1status_FUNC,
-	_1gdk_1draw_1arc_FUNC,
-	_1gdk_1draw_1image_FUNC,
-	_1gdk_1draw_1pixbuf_FUNC,
-	_1gdk_1draw_1rectangle_FUNC,
-	_1gdk_1drawable_1get_1depth_FUNC,
-	_1gdk_1drawable_1get_1image_FUNC,
-	_1gdk_1drawable_1get_1visible_1region_FUNC,
-	_1gdk_1error_1trap_1pop_FUNC,
-	_1gdk_1error_1trap_1push_FUNC,
-	_1gdk_1event_1copy_FUNC,
-	_1gdk_1event_1free_FUNC,
-	_1gdk_1event_1get_FUNC,
-	_1gdk_1event_1get_1coords_FUNC,
-	_1gdk_1event_1get_1event_1type_FUNC,
-	_1gdk_1event_1get_1scroll_1deltas_FUNC,
-	_1gdk_1event_1get_1seat_FUNC,
-	_1gdk_1event_1get_1state_FUNC,
-	_1gdk_1event_1get_1time_FUNC,
-	_1gdk_1event_1handler_1set_FUNC,
-	_1gdk_1event_1new_FUNC,
-	_1gdk_1event_1peek_FUNC,
-	_1gdk_1event_1put_FUNC,
-	_1gdk_1flush_FUNC,
-	_1gdk_1gc_1new_FUNC,
-	_1gdk_1gc_1set_1fill_FUNC,
-	_1gdk_1gc_1set_1foreground_FUNC,
-	_1gdk_1gc_1set_1function_FUNC,
-	_1gdk_1gc_1set_1stipple_FUNC,
-	_1gdk_1gc_1set_1subwindow_FUNC,
-	_1gdk_1get_1default_1root_1window_FUNC,
-	_1gdk_1keyboard_1ungrab_FUNC,
-	_1gdk_1keymap_1get_1default_FUNC,
-	_1gdk_1keymap_1get_1entries_1for_1keyval_FUNC,
-	_1gdk_1keymap_1translate_1keyboard_1state_FUNC,
-	_1gdk_1keyval_1to_1lower_FUNC,
-	_1gdk_1keyval_1to_1unicode_FUNC,
-	_1gdk_1pango_1context_1get_FUNC,
-	_1gdk_1pango_1layout_1get_1clip_1region_FUNC,
-	_1gdk_1pixbuf_1copy_1area_FUNC,
-	_1gdk_1pixbuf_1get_1from_1drawable_FUNC,
-	_1gdk_1pixbuf_1get_1from_1window_FUNC,
-	_1gdk_1pixbuf_1get_1has_1alpha_FUNC,
-	_1gdk_1pixbuf_1get_1height_FUNC,
-	_1gdk_1pixbuf_1get_1pixels_FUNC,
-	_1gdk_1pixbuf_1get_1rowstride_FUNC,
-	_1gdk_1pixbuf_1get_1width_FUNC,
-	_1gdk_1pixbuf_1loader_1close_FUNC,
-	_1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC,
-	_1gdk_1pixbuf_1loader_1new_FUNC,
-	_1gdk_1pixbuf_1loader_1write_FUNC,
-	_1gdk_1pixbuf_1new_FUNC,
-	_1gdk_1pixbuf_1new_1from_1file_FUNC,
-	_1gdk_1pixbuf_1save_1to_1bufferv_FUNC,
-	_1gdk_1pixbuf_1scale_1simple_FUNC,
-	_1gdk_1pixmap_1get_1size_FUNC,
-	_1gdk_1pixmap_1new_FUNC,
-	_1gdk_1pointer_1grab_FUNC,
-	_1gdk_1pointer_1ungrab_FUNC,
-	_1gdk_1property_1get_FUNC,
-	_1gdk_1region_1destroy_FUNC,
-	_1gdk_1region_1empty_FUNC,
-	_1gdk_1region_1get_1clipbox_FUNC,
-	_1gdk_1region_1get_1rectangles_FUNC,
-	_1gdk_1region_1intersect_FUNC,
-	_1gdk_1region_1new_FUNC,
-	_1gdk_1region_1offset_FUNC,
-	_1gdk_1region_1point_1in_FUNC,
-	_1gdk_1region_1polygon_FUNC,
-	_1gdk_1region_1rect_1in_FUNC,
-	_1gdk_1region_1rectangle_FUNC,
-	_1gdk_1region_1subtract_FUNC,
-	_1gdk_1region_1union_FUNC,
-	_1gdk_1region_1union_1with_1rect_FUNC,
-	_1gdk_1rgba_1free_FUNC,
-	_1gdk_1rgba_1hash_FUNC,
-	_1gdk_1rgba_1parse_FUNC,
-	_1gdk_1rgba_1to_1string_FUNC,
-	_1gdk_1screen_1get_1active_1window_FUNC,
-	_1gdk_1screen_1get_1default_FUNC,
-	_1gdk_1screen_1get_1monitor_1at_1point_FUNC,
-	_1gdk_1screen_1get_1monitor_1at_1window_FUNC,
-	_1gdk_1screen_1get_1monitor_1geometry_FUNC,
-	_1gdk_1screen_1get_1monitor_1scale_1factor_FUNC,
-	_1gdk_1screen_1get_1monitor_1width_1mm_FUNC,
-	_1gdk_1screen_1get_1monitor_1workarea_FUNC,
-	_1gdk_1screen_1get_1n_1monitors_FUNC,
-	_1gdk_1screen_1get_1primary_1monitor_FUNC,
-	_1gdk_1screen_1get_1resolution_FUNC,
-	_1gdk_1screen_1height_FUNC,
-	_1gdk_1screen_1width_FUNC,
-	_1gdk_1screen_1width_1mm_FUNC,
-	_1gdk_1seat_1get_1pointer_FUNC,
-	_1gdk_1seat_1grab_FUNC,
-	_1gdk_1seat_1ungrab_FUNC,
-	_1gdk_1selection_1owner_1get_FUNC,
-	_1gdk_1selection_1owner_1set_FUNC,
-	_1gdk_1set_1program_1class_FUNC,
-	_1gdk_1test_1simulate_1button_FUNC,
-	_1gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC,
-	_1gdk_1unicode_1to_1keyval_FUNC,
-	_1gdk_1utf8_1to_1string_1target_FUNC,
-	_1gdk_1visual_1get_1depth_FUNC,
-	_1gdk_1visual_1get_1system_FUNC,
-	_1gdk_1window_1add_1filter_FUNC,
-	_1gdk_1window_1at_1pointer_FUNC,
-	_1gdk_1window_1begin_1paint_1rect_FUNC,
-	_1gdk_1window_1create_1similar_1surface_FUNC,
-	_1gdk_1window_1destroy_FUNC,
-	_1gdk_1window_1end_1paint_FUNC,
-	_1gdk_1window_1focus_FUNC,
-	_1gdk_1window_1get_1children_FUNC,
-	_1gdk_1window_1get_1device_1position_FUNC,
-	_1gdk_1window_1get_1display_FUNC,
-	_1gdk_1window_1get_1events_FUNC,
-	_1gdk_1window_1get_1frame_1extents_FUNC,
-	_1gdk_1window_1get_1height_FUNC,
-	_1gdk_1window_1get_1internal_1paint_1info_FUNC,
-	_1gdk_1window_1get_1origin_FUNC,
-	_1gdk_1window_1get_1parent_FUNC,
-	_1gdk_1window_1get_1pointer_FUNC,
-	_1gdk_1window_1get_1position_FUNC,
-	_1gdk_1window_1get_1root_1origin_FUNC,
-	_1gdk_1window_1get_1user_1data_FUNC,
-	_1gdk_1window_1get_1visible_1region_FUNC,
-	_1gdk_1window_1get_1width_FUNC,
-	_1gdk_1window_1hide_FUNC,
-	_1gdk_1window_1invalidate_1rect_FUNC,
-	_1gdk_1window_1invalidate_1region_FUNC,
-	_1gdk_1window_1is_1visible_FUNC,
-	_1gdk_1window_1lower_FUNC,
-	_1gdk_1window_1move_FUNC,
-	_1gdk_1window_1move_1resize_FUNC,
-	_1gdk_1window_1new_FUNC,
-	_1gdk_1window_1process_1all_1updates_FUNC,
-	_1gdk_1window_1process_1updates_FUNC,
-	_1gdk_1window_1raise_FUNC,
-	_1gdk_1window_1remove_1filter_FUNC,
-	_1gdk_1window_1resize_FUNC,
-	_1gdk_1window_1restack_FUNC,
-	_1gdk_1window_1set_1back_1pixmap_FUNC,
-	_1gdk_1window_1set_1background_1pattern_FUNC,
-	_1gdk_1window_1set_1cursor_FUNC,
-	_1gdk_1window_1set_1decorations_FUNC,
-	_1gdk_1window_1set_1events_FUNC,
-	_1gdk_1window_1set_1functions_FUNC,
-	_1gdk_1window_1set_1override_1redirect_FUNC,
-	_1gdk_1window_1set_1user_1data_FUNC,
-	_1gdk_1window_1shape_1combine_1region_FUNC,
-	_1gdk_1window_1show_FUNC,
-	_1gdk_1window_1show_1unraised_FUNC,
-	_1gdk_1x11_1atom_1to_1xatom_FUNC,
-	_1gdk_1x11_1display_1get_1xdisplay_FUNC,
-	_1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC,
-	_1gdk_1x11_1drawable_1get_1xid_FUNC,
-	_1gdk_1x11_1get_1default_1xdisplay_FUNC,
-	_1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC,
-	_1gdk_1x11_1screen_1lookup_1visual_FUNC,
-	_1gdk_1x11_1visual_1get_1xvisual_FUNC,
-	_1gdk_1x11_1window_1get_1xid_FUNC,
-	_1gdk_1x11_1window_1lookup_1for_1display_FUNC,
-	_1getpid_FUNC,
-	_1glib_1major_1version_FUNC,
-	_1glib_1micro_1version_FUNC,
-	_1glib_1minor_1version_FUNC,
 	_1gtk_1accel_1group_1new_FUNC,
 	_1gtk_1accel_1label_1new_FUNC,
 	_1gtk_1accel_1label_1set_1accel_FUNC,
@@ -1472,6 +934,561 @@ typedef enum {
 	_1gtk_1window_1set_1type_1hint_FUNC,
 	_1gtk_1window_1unfullscreen_FUNC,
 	_1gtk_1window_1unmaximize_FUNC,
+} GTK_FUNCS;
+#ifdef NATIVE_STATS
+extern int OS_nativeFunctionCount;
+extern int OS_nativeFunctionCallCount[];
+extern char* OS_nativeFunctionNames[];
+#define OS_NATIVE_ENTER(env, that, func) OS_nativeFunctionCallCount[func]++;
+#define OS_NATIVE_EXIT(env, that, func) 
+#else
+#ifndef OS_NATIVE_ENTER
+#define OS_NATIVE_ENTER(env, that, func) 
+#endif
+#ifndef OS_NATIVE_EXIT
+#define OS_NATIVE_EXIT(env, that, func) 
+#endif
+#endif
+
+typedef enum {
+#ifndef JNI64
+	Call__IIII_FUNC,
+#else
+	Call__JJII_FUNC,
+#endif
+#ifndef JNI64
+	Call__IIIJ_FUNC,
+#else
+	Call__JJIJ_FUNC,
+#endif
+	GDK_1EVENT_1TYPE_FUNC,
+	GDK_1EVENT_1WINDOW_FUNC,
+	GDK_1IS_1X11_1DISPLAY_FUNC,
+	GDK_1WINDOWING_1WAYLAND_FUNC,
+	GDK_1WINDOWING_1X11_FUNC,
+	GInterfaceInfo_1sizeof_FUNC,
+	GPollFD_1sizeof_FUNC,
+	GTypeInfo_1sizeof_FUNC,
+	GTypeQuery_1sizeof_FUNC,
+	G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC,
+	G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC,
+	G_1TYPE_1BOOLEAN_FUNC,
+	G_1TYPE_1DOUBLE_FUNC,
+	G_1TYPE_1FLOAT_FUNC,
+	G_1TYPE_1INT_FUNC,
+	G_1TYPE_1INT64_FUNC,
+	G_1VALUE_1TYPE_FUNC,
+	GdkColor_1sizeof_FUNC,
+	GdkDragContext_1sizeof_FUNC,
+	GdkEventAny_1sizeof_FUNC,
+	GdkEventButton_1sizeof_FUNC,
+	GdkEventCrossing_1sizeof_FUNC,
+	GdkEventExpose_1sizeof_FUNC,
+	GdkEventFocus_1sizeof_FUNC,
+	GdkEventKey_1sizeof_FUNC,
+	GdkEventMotion_1sizeof_FUNC,
+	GdkEventProperty_1sizeof_FUNC,
+	GdkEventScroll_1sizeof_FUNC,
+	GdkEventWindowState_1sizeof_FUNC,
+	GdkEvent_1sizeof_FUNC,
+	GdkGeometry_1sizeof_FUNC,
+	GdkKeymapKey_1sizeof_FUNC,
+	GdkRGBA_1sizeof_FUNC,
+	GdkRectangle_1sizeof_FUNC,
+	GdkWindowAttr_1sizeof_FUNC,
+	PangoAttrColor_1sizeof_FUNC,
+	PangoAttrInt_1sizeof_FUNC,
+	PangoAttribute_1sizeof_FUNC,
+	PangoItem_1sizeof_FUNC,
+	PangoLayoutLine_1sizeof_FUNC,
+	PangoLayoutRun_1sizeof_FUNC,
+	PangoLogAttr_1sizeof_FUNC,
+	PangoRectangle_1sizeof_FUNC,
+	RTLD_1GLOBAL_FUNC,
+	RTLD_1LAZY_FUNC,
+	RTLD_1NOW_FUNC,
+	XAnyEvent_1sizeof_FUNC,
+	XEvent_1sizeof_FUNC,
+	XExposeEvent_1sizeof_FUNC,
+	XFocusChangeEvent_1sizeof_FUNC,
+	X_1EVENT_1TYPE_FUNC,
+	X_1EVENT_1WINDOW_FUNC,
+	_1Call_FUNC,
+	_1FcConfigAppFontAddFile_FUNC,
+	_1GDK_1PIXMAP_1XID_FUNC,
+	_1GDK_1TYPE_1COLOR_FUNC,
+	_1GDK_1TYPE_1PIXBUF_FUNC,
+	_1GDK_1TYPE_1RGBA_FUNC,
+	_1GString_1len_FUNC,
+	_1GString_1str_FUNC,
+	_1G_1OBJECT_1CLASS_FUNC,
+	_1G_1OBJECT_1GET_1CLASS_FUNC,
+	_1G_1OBJECT_1TYPE_FUNC,
+	_1G_1OBJECT_1TYPE_1NAME_FUNC,
+	_1G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC,
+	_1G_1TYPE_1STRING_FUNC,
+	_1PANGO_1PIXELS_FUNC,
+	_1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC,
+	_1PANGO_1TYPE_1FONT_1FACE_FUNC,
+	_1PANGO_1TYPE_1FONT_1FAMILY_FUNC,
+	_1PANGO_1TYPE_1LAYOUT_FUNC,
+	_1XCheckIfEvent_FUNC,
+	_1XDefaultRootWindow_FUNC,
+	_1XDefaultScreen_FUNC,
+	_1XFlush_FUNC,
+	_1XFree_FUNC,
+	_1XGetWindowProperty_FUNC,
+	_1XKeysymToKeycode_FUNC,
+	_1XQueryPointer_FUNC,
+	_1XSetErrorHandler_FUNC,
+	_1XSetIOErrorHandler_FUNC,
+	_1XSetInputFocus_FUNC,
+	_1XSetTransientForHint_FUNC,
+	_1XSynchronize_FUNC,
+	_1XTestFakeKeyEvent_FUNC,
+	_1access_FUNC,
+	_1cachejvmptr_FUNC,
+#ifndef JNI64
+	_1call__IIIII_FUNC,
+#else
+	_1call__JJJJJ_FUNC,
+#endif
+#ifndef JNI64
+	_1call__IIIIIII_FUNC,
+#else
+	_1call__JJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
+	_1call__IIIIIIII_FUNC,
+#else
+	_1call__JJJJJJJJ_FUNC,
+#endif
+	_1call_1get_1size_FUNC,
+	_1dlopen_FUNC,
+	_1g_1app_1info_1create_1from_1commandline_FUNC,
+	_1g_1app_1info_1get_1all_FUNC,
+	_1g_1app_1info_1get_1default_1for_1type_FUNC,
+	_1g_1app_1info_1get_1executable_FUNC,
+	_1g_1app_1info_1get_1icon_FUNC,
+	_1g_1app_1info_1get_1name_FUNC,
+	_1g_1app_1info_1launch_FUNC,
+	_1g_1app_1info_1launch_1default_1for_1uri_FUNC,
+	_1g_1app_1info_1should_1show_FUNC,
+	_1g_1app_1info_1supports_1uris_FUNC,
+	_1g_1bus_1own_1name_FUNC,
+	_1g_1bytes_1new_FUNC,
+	_1g_1bytes_1unref_FUNC,
+	_1g_1cclosure_1new_FUNC,
+	_1g_1closure_1ref_FUNC,
+	_1g_1closure_1sink_FUNC,
+	_1g_1closure_1unref_FUNC,
+	_1g_1content_1type_1equals_FUNC,
+	_1g_1content_1type_1is_1a_FUNC,
+	_1g_1dbus_1connection_1register_1object_FUNC,
+	_1g_1dbus_1method_1invocation_1return_1value_FUNC,
+	_1g_1dbus_1node_1info_1lookup_1interface_FUNC,
+	_1g_1dbus_1node_1info_1new_1for_1xml_FUNC,
+	_1g_1error_1free_FUNC,
+	_1g_1error_1get_1message_FUNC,
+	_1g_1file_1get_1uri_FUNC,
+	_1g_1file_1info_1get_1content_1type_FUNC,
+	_1g_1file_1new_1for_1commandline_1arg_FUNC,
+	_1g_1file_1new_1for_1path_FUNC,
+	_1g_1file_1new_1for_1uri_FUNC,
+	_1g_1file_1query_1info_FUNC,
+	_1g_1file_1test_FUNC,
+	_1g_1filename_1display_1name_FUNC,
+	_1g_1filename_1from_1uri_FUNC,
+	_1g_1filename_1from_1utf8_FUNC,
+	_1g_1filename_1to_1uri_FUNC,
+	_1g_1filename_1to_1utf8_FUNC,
+	_1g_1free_FUNC,
+	_1g_1hash_1table_1get_1values_FUNC,
+	_1g_1icon_1new_1for_1string_FUNC,
+	_1g_1icon_1to_1string_FUNC,
+	_1g_1idle_1add_FUNC,
+	_1g_1list_1append_FUNC,
+	_1g_1list_1data_FUNC,
+	_1g_1list_1free_FUNC,
+	_1g_1list_1free_11_FUNC,
+	_1g_1list_1last_FUNC,
+	_1g_1list_1length_FUNC,
+	_1g_1list_1next_FUNC,
+	_1g_1list_1nth_FUNC,
+	_1g_1list_1nth_1data_FUNC,
+	_1g_1list_1prepend_FUNC,
+	_1g_1list_1previous_FUNC,
+	_1g_1list_1remove_1link_FUNC,
+	_1g_1list_1set_1next_FUNC,
+	_1g_1list_1set_1previous_FUNC,
+	_1g_1log_1default_1handler_FUNC,
+	_1g_1log_1remove_1handler_FUNC,
+	_1g_1log_1set_1handler_FUNC,
+	_1g_1main_1context_1acquire_FUNC,
+	_1g_1main_1context_1check_FUNC,
+	_1g_1main_1context_1default_FUNC,
+	_1g_1main_1context_1get_1poll_1func_FUNC,
+	_1g_1main_1context_1iteration_FUNC,
+	_1g_1main_1context_1prepare_FUNC,
+	_1g_1main_1context_1query_FUNC,
+	_1g_1main_1context_1release_FUNC,
+	_1g_1malloc_FUNC,
+	_1g_1object_1class_1find_1property_FUNC,
+#ifndef JNI64
+	_1g_1object_1get__I_3B_3II_FUNC,
+#else
+	_1g_1object_1get__J_3B_3IJ_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1object_1get__I_3B_3JI_FUNC,
+#else
+	_1g_1object_1get__J_3B_3JJ_FUNC,
+#endif
+	_1g_1object_1get_1qdata_FUNC,
+	_1g_1object_1new_FUNC,
+	_1g_1object_1notify_FUNC,
+	_1g_1object_1ref_FUNC,
+	_1g_1object_1ref_1sink_FUNC,
+#ifndef JNI64
+	_1g_1object_1set__I_3BFI_FUNC,
+#else
+	_1g_1object_1set__J_3BFJ_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1object_1set__I_3BII_FUNC,
+#else
+	_1g_1object_1set__J_3BIJ_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1object_1set__I_3BJI_FUNC,
+#else
+	_1g_1object_1set__J_3BJJ_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
+#else
+	_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC,
+#else
+	_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkRGBA_2J_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1object_1set__I_3BZI_FUNC,
+#else
+	_1g_1object_1set__J_3BZJ_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1object_1set__I_3B_3BI_FUNC,
+#else
+	_1g_1object_1set__J_3B_3BJ_FUNC,
+#endif
+	_1g_1object_1set_1qdata_FUNC,
+	_1g_1object_1unref_FUNC,
+	_1g_1quark_1from_1string_FUNC,
+	_1g_1set_1prgname_FUNC,
+	_1g_1signal_1add_1emission_1hook_FUNC,
+	_1g_1signal_1connect_FUNC,
+	_1g_1signal_1connect_1closure_FUNC,
+	_1g_1signal_1connect_1closure_1by_1id_FUNC,
+#ifndef JNI64
+	_1g_1signal_1emit_1by_1name__I_3B_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3B_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1signal_1emit_1by_1name__I_3BI_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3BJ_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1signal_1emit_1by_1name__I_3BII_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3BJJ_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1signal_1emit_1by_1name__I_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1signal_1emit_1by_1name__I_3B_3B_FUNC,
+#else
+	_1g_1signal_1emit_1by_1name__J_3B_3B_FUNC,
+#endif
+	_1g_1signal_1handler_1disconnect_FUNC,
+	_1g_1signal_1handler_1find_FUNC,
+	_1g_1signal_1handlers_1block_1matched_FUNC,
+	_1g_1signal_1handlers_1unblock_1matched_FUNC,
+	_1g_1signal_1lookup_FUNC,
+	_1g_1signal_1remove_1emission_1hook_FUNC,
+	_1g_1signal_1stop_1emission_1by_1name_FUNC,
+	_1g_1slist_1append_FUNC,
+	_1g_1slist_1data_FUNC,
+	_1g_1slist_1free_FUNC,
+	_1g_1slist_1length_FUNC,
+	_1g_1slist_1next_FUNC,
+	_1g_1source_1remove_FUNC,
+	_1g_1strfreev_FUNC,
+	_1g_1string_1free_FUNC,
+	_1g_1string_1new_1len_FUNC,
+	_1g_1strtod_FUNC,
+	_1g_1thread_1init_FUNC,
+	_1g_1thread_1supported_FUNC,
+	_1g_1timeout_1add_FUNC,
+	_1g_1type_1add_1interface_1static_FUNC,
+	_1g_1type_1class_1peek_FUNC,
+	_1g_1type_1class_1peek_1parent_FUNC,
+	_1g_1type_1class_1ref_FUNC,
+	_1g_1type_1class_1unref_FUNC,
+	_1g_1type_1from_1name_FUNC,
+	_1g_1type_1interface_1peek_1parent_FUNC,
+	_1g_1type_1is_1a_FUNC,
+	_1g_1type_1name_FUNC,
+	_1g_1type_1parent_FUNC,
+	_1g_1type_1query_FUNC,
+	_1g_1type_1register_1static_FUNC,
+	_1g_1utf16_1offset_1to_1pointer_FUNC,
+	_1g_1utf16_1offset_1to_1utf8_1offset_FUNC,
+	_1g_1utf16_1pointer_1to_1offset_FUNC,
+	_1g_1utf16_1strlen_FUNC,
+	_1g_1utf16_1to_1utf8_FUNC,
+	_1g_1utf8_1offset_1to_1utf16_1offset_FUNC,
+	_1g_1utf8_1pointer_1to_1offset_FUNC,
+	_1g_1utf8_1strlen_FUNC,
+#ifndef JNI64
+	_1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC,
+#else
+	_1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC,
+#endif
+#ifndef JNI64
+	_1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC,
+#else
+	_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC,
+#endif
+	_1g_1value_1peek_1pointer_FUNC,
+	_1g_1variant_1get_1boolean_FUNC,
+	_1g_1variant_1get_1byte_FUNC,
+	_1g_1variant_1get_1child_1value_FUNC,
+	_1g_1variant_1get_1double_FUNC,
+	_1g_1variant_1get_1int32_FUNC,
+	_1g_1variant_1get_1string_FUNC,
+	_1g_1variant_1get_1type_FUNC,
+	_1g_1variant_1get_1type_1string_FUNC,
+	_1g_1variant_1is_1of_1type_FUNC,
+	_1g_1variant_1n_1children_FUNC,
+	_1g_1variant_1new_1boolean_FUNC,
+	_1g_1variant_1new_1byte_FUNC,
+	_1g_1variant_1new_1double_FUNC,
+	_1g_1variant_1new_1int32_FUNC,
+	_1g_1variant_1new_1string_FUNC,
+	_1g_1variant_1new_1tuple_FUNC,
+	_1gdk_1atom_1intern_FUNC,
+	_1gdk_1atom_1name_FUNC,
+	_1gdk_1beep_FUNC,
+	_1gdk_1bitmap_1create_1from_1data_FUNC,
+	_1gdk_1cairo_1create_FUNC,
+	_1gdk_1cairo_1get_1clip_1rectangle_FUNC,
+	_1gdk_1cairo_1region_FUNC,
+	_1gdk_1cairo_1region_1create_1from_1surface_FUNC,
+	_1gdk_1cairo_1reset_1clip_FUNC,
+	_1gdk_1cairo_1set_1source_1color_FUNC,
+	_1gdk_1cairo_1set_1source_1pixbuf_FUNC,
+	_1gdk_1cairo_1set_1source_1pixmap_FUNC,
+	_1gdk_1cairo_1set_1source_1rgba_FUNC,
+	_1gdk_1cairo_1set_1source_1window_FUNC,
+	_1gdk_1color_1free_FUNC,
+	_1gdk_1color_1parse_FUNC,
+	_1gdk_1color_1white_FUNC,
+	_1gdk_1colormap_1alloc_1color_FUNC,
+	_1gdk_1colormap_1free_1colors_FUNC,
+	_1gdk_1colormap_1get_1system_FUNC,
+	_1gdk_1cursor_1new_1for_1display_FUNC,
+	_1gdk_1cursor_1new_1from_1name_FUNC,
+	_1gdk_1cursor_1new_1from_1pixbuf_FUNC,
+	_1gdk_1cursor_1new_1from_1pixmap_FUNC,
+	_1gdk_1cursor_1unref_FUNC,
+	_1gdk_1device_1get_1associated_1device_FUNC,
+	_1gdk_1device_1get_1window_1at_1position_FUNC,
+	_1gdk_1device_1grab_FUNC,
+	_1gdk_1device_1manager_1get_1client_1pointer_FUNC,
+	_1gdk_1device_1ungrab_FUNC,
+	_1gdk_1device_1warp_FUNC,
+	_1gdk_1display_1get_1default_FUNC,
+	_1gdk_1display_1get_1default_1seat_FUNC,
+	_1gdk_1display_1get_1device_1manager_FUNC,
+	_1gdk_1display_1supports_1cursor_1color_FUNC,
+	_1gdk_1display_1warp_1pointer_FUNC,
+	_1gdk_1drag_1context_1get_1actions_FUNC,
+	_1gdk_1drag_1context_1get_1dest_1window_FUNC,
+	_1gdk_1drag_1context_1get_1selected_1action_FUNC,
+	_1gdk_1drag_1context_1list_1targets_FUNC,
+	_1gdk_1drag_1status_FUNC,
+	_1gdk_1draw_1arc_FUNC,
+	_1gdk_1draw_1image_FUNC,
+	_1gdk_1draw_1pixbuf_FUNC,
+	_1gdk_1draw_1rectangle_FUNC,
+	_1gdk_1drawable_1get_1depth_FUNC,
+	_1gdk_1drawable_1get_1image_FUNC,
+	_1gdk_1drawable_1get_1visible_1region_FUNC,
+	_1gdk_1error_1trap_1pop_FUNC,
+	_1gdk_1error_1trap_1push_FUNC,
+	_1gdk_1event_1copy_FUNC,
+	_1gdk_1event_1free_FUNC,
+	_1gdk_1event_1get_FUNC,
+	_1gdk_1event_1get_1coords_FUNC,
+	_1gdk_1event_1get_1event_1type_FUNC,
+	_1gdk_1event_1get_1scroll_1deltas_FUNC,
+	_1gdk_1event_1get_1seat_FUNC,
+	_1gdk_1event_1get_1state_FUNC,
+	_1gdk_1event_1get_1time_FUNC,
+	_1gdk_1event_1handler_1set_FUNC,
+	_1gdk_1event_1new_FUNC,
+	_1gdk_1event_1peek_FUNC,
+	_1gdk_1event_1put_FUNC,
+	_1gdk_1flush_FUNC,
+	_1gdk_1gc_1new_FUNC,
+	_1gdk_1gc_1set_1fill_FUNC,
+	_1gdk_1gc_1set_1foreground_FUNC,
+	_1gdk_1gc_1set_1function_FUNC,
+	_1gdk_1gc_1set_1stipple_FUNC,
+	_1gdk_1gc_1set_1subwindow_FUNC,
+	_1gdk_1get_1default_1root_1window_FUNC,
+	_1gdk_1keyboard_1ungrab_FUNC,
+	_1gdk_1keymap_1get_1default_FUNC,
+	_1gdk_1keymap_1get_1entries_1for_1keyval_FUNC,
+	_1gdk_1keymap_1translate_1keyboard_1state_FUNC,
+	_1gdk_1keyval_1to_1lower_FUNC,
+	_1gdk_1keyval_1to_1unicode_FUNC,
+	_1gdk_1pango_1context_1get_FUNC,
+	_1gdk_1pango_1layout_1get_1clip_1region_FUNC,
+	_1gdk_1pixbuf_1copy_1area_FUNC,
+	_1gdk_1pixbuf_1get_1from_1drawable_FUNC,
+	_1gdk_1pixbuf_1get_1from_1window_FUNC,
+	_1gdk_1pixbuf_1get_1has_1alpha_FUNC,
+	_1gdk_1pixbuf_1get_1height_FUNC,
+	_1gdk_1pixbuf_1get_1pixels_FUNC,
+	_1gdk_1pixbuf_1get_1rowstride_FUNC,
+	_1gdk_1pixbuf_1get_1width_FUNC,
+	_1gdk_1pixbuf_1loader_1close_FUNC,
+	_1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC,
+	_1gdk_1pixbuf_1loader_1new_FUNC,
+	_1gdk_1pixbuf_1loader_1write_FUNC,
+	_1gdk_1pixbuf_1new_FUNC,
+	_1gdk_1pixbuf_1new_1from_1file_FUNC,
+	_1gdk_1pixbuf_1save_1to_1bufferv_FUNC,
+	_1gdk_1pixbuf_1scale_1simple_FUNC,
+	_1gdk_1pixmap_1get_1size_FUNC,
+	_1gdk_1pixmap_1new_FUNC,
+	_1gdk_1pointer_1grab_FUNC,
+	_1gdk_1pointer_1ungrab_FUNC,
+	_1gdk_1property_1get_FUNC,
+	_1gdk_1region_1destroy_FUNC,
+	_1gdk_1region_1empty_FUNC,
+	_1gdk_1region_1get_1clipbox_FUNC,
+	_1gdk_1region_1get_1rectangles_FUNC,
+	_1gdk_1region_1intersect_FUNC,
+	_1gdk_1region_1new_FUNC,
+	_1gdk_1region_1offset_FUNC,
+	_1gdk_1region_1point_1in_FUNC,
+	_1gdk_1region_1polygon_FUNC,
+	_1gdk_1region_1rect_1in_FUNC,
+	_1gdk_1region_1rectangle_FUNC,
+	_1gdk_1region_1subtract_FUNC,
+	_1gdk_1region_1union_FUNC,
+	_1gdk_1region_1union_1with_1rect_FUNC,
+	_1gdk_1rgba_1free_FUNC,
+	_1gdk_1rgba_1hash_FUNC,
+	_1gdk_1rgba_1parse_FUNC,
+	_1gdk_1rgba_1to_1string_FUNC,
+	_1gdk_1screen_1get_1active_1window_FUNC,
+	_1gdk_1screen_1get_1default_FUNC,
+	_1gdk_1screen_1get_1monitor_1at_1point_FUNC,
+	_1gdk_1screen_1get_1monitor_1at_1window_FUNC,
+	_1gdk_1screen_1get_1monitor_1geometry_FUNC,
+	_1gdk_1screen_1get_1monitor_1scale_1factor_FUNC,
+	_1gdk_1screen_1get_1monitor_1width_1mm_FUNC,
+	_1gdk_1screen_1get_1monitor_1workarea_FUNC,
+	_1gdk_1screen_1get_1n_1monitors_FUNC,
+	_1gdk_1screen_1get_1primary_1monitor_FUNC,
+	_1gdk_1screen_1get_1resolution_FUNC,
+	_1gdk_1screen_1height_FUNC,
+	_1gdk_1screen_1width_FUNC,
+	_1gdk_1screen_1width_1mm_FUNC,
+	_1gdk_1seat_1get_1pointer_FUNC,
+	_1gdk_1seat_1grab_FUNC,
+	_1gdk_1seat_1ungrab_FUNC,
+	_1gdk_1selection_1owner_1get_FUNC,
+	_1gdk_1selection_1owner_1set_FUNC,
+	_1gdk_1set_1program_1class_FUNC,
+	_1gdk_1test_1simulate_1button_FUNC,
+	_1gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC,
+	_1gdk_1unicode_1to_1keyval_FUNC,
+	_1gdk_1utf8_1to_1string_1target_FUNC,
+	_1gdk_1visual_1get_1depth_FUNC,
+	_1gdk_1visual_1get_1system_FUNC,
+	_1gdk_1window_1add_1filter_FUNC,
+	_1gdk_1window_1at_1pointer_FUNC,
+	_1gdk_1window_1begin_1paint_1rect_FUNC,
+	_1gdk_1window_1create_1similar_1surface_FUNC,
+	_1gdk_1window_1destroy_FUNC,
+	_1gdk_1window_1end_1paint_FUNC,
+	_1gdk_1window_1focus_FUNC,
+	_1gdk_1window_1get_1children_FUNC,
+	_1gdk_1window_1get_1device_1position_FUNC,
+	_1gdk_1window_1get_1display_FUNC,
+	_1gdk_1window_1get_1events_FUNC,
+	_1gdk_1window_1get_1frame_1extents_FUNC,
+	_1gdk_1window_1get_1height_FUNC,
+	_1gdk_1window_1get_1internal_1paint_1info_FUNC,
+	_1gdk_1window_1get_1origin_FUNC,
+	_1gdk_1window_1get_1parent_FUNC,
+	_1gdk_1window_1get_1pointer_FUNC,
+	_1gdk_1window_1get_1position_FUNC,
+	_1gdk_1window_1get_1root_1origin_FUNC,
+	_1gdk_1window_1get_1user_1data_FUNC,
+	_1gdk_1window_1get_1visible_1region_FUNC,
+	_1gdk_1window_1get_1width_FUNC,
+	_1gdk_1window_1hide_FUNC,
+	_1gdk_1window_1invalidate_1rect_FUNC,
+	_1gdk_1window_1invalidate_1region_FUNC,
+	_1gdk_1window_1is_1visible_FUNC,
+	_1gdk_1window_1lower_FUNC,
+	_1gdk_1window_1move_FUNC,
+	_1gdk_1window_1move_1resize_FUNC,
+	_1gdk_1window_1new_FUNC,
+	_1gdk_1window_1process_1all_1updates_FUNC,
+	_1gdk_1window_1process_1updates_FUNC,
+	_1gdk_1window_1raise_FUNC,
+	_1gdk_1window_1remove_1filter_FUNC,
+	_1gdk_1window_1resize_FUNC,
+	_1gdk_1window_1restack_FUNC,
+	_1gdk_1window_1set_1back_1pixmap_FUNC,
+	_1gdk_1window_1set_1background_1pattern_FUNC,
+	_1gdk_1window_1set_1cursor_FUNC,
+	_1gdk_1window_1set_1decorations_FUNC,
+	_1gdk_1window_1set_1events_FUNC,
+	_1gdk_1window_1set_1functions_FUNC,
+	_1gdk_1window_1set_1override_1redirect_FUNC,
+	_1gdk_1window_1set_1user_1data_FUNC,
+	_1gdk_1window_1shape_1combine_1region_FUNC,
+	_1gdk_1window_1show_FUNC,
+	_1gdk_1window_1show_1unraised_FUNC,
+	_1gdk_1x11_1atom_1to_1xatom_FUNC,
+	_1gdk_1x11_1display_1get_1xdisplay_FUNC,
+	_1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC,
+	_1gdk_1x11_1drawable_1get_1xid_FUNC,
+	_1gdk_1x11_1get_1default_1xdisplay_FUNC,
+	_1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC,
+	_1gdk_1x11_1screen_1lookup_1visual_FUNC,
+	_1gdk_1x11_1visual_1get_1xvisual_FUNC,
+	_1gdk_1x11_1window_1get_1xid_FUNC,
+	_1gdk_1x11_1window_1lookup_1for_1display_FUNC,
+	_1getpid_FUNC,
+	_1glib_1major_1version_FUNC,
+	_1glib_1micro_1version_FUNC,
+	_1glib_1minor_1version_FUNC,
 	_1pango_1attr_1background_1new_FUNC,
 	_1pango_1attr_1font_1desc_1new_FUNC,
 	_1pango_1attr_1foreground_1new_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
new file mode 100644
index 0000000000..4afb3eecc6
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
@@ -0,0 +1,9831 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Red Hat Inc. and others. All rights reserved.
+ * The contents of this file are made available under the terms
+ * of the GNU Lesser General Public License (LGPL) Version 2.1 that
+ * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
+ * available at http://www.gnu.org/licenses/lgpl.html.  If the version
+ * of the LGPL at http://www.gnu.org is different to the version of
+ * the LGPL accompanying this distribution and there is any conflict
+ * between the two license versions, the terms of the LGPL accompanying
+ * this distribution shall govern.
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.internal.gtk;
+
+public class GTK extends OS {
+
+	/** Constants */
+	public static final int GTK_ACCEL_VISIBLE = 0x1;
+	public static final int GTK_ARROW_DOWN = 0x1; //GtkArrowType Enum. In general, for gtk3 GtkAlign enum is favored.
+	public static final int GTK_ARROW_LEFT = 0x2;
+	public static final int GTK_ARROW_RIGHT = 0x3;
+	public static final int GTK_ARROW_UP = 0x0;
+	public static final int GTK_ALIGN_FILL = 0x0; //Gtk3 GtkAlign Enum
+	public static final int GTK_ALIGN_START = 0x1;
+	public static final int GTK_ALIGN_END = 0x2;
+	public static final int GTK_ALIGN_CENTER = 0x3;
+	public static final int GTK_ALIGN_BASELINE = 0x4;
+	public static final int GTK_CALENDAR_SHOW_HEADING = 1 << 0;
+	public static final int GTK_CALENDAR_SHOW_DAY_NAMES = 1 << 1;
+	public static final int GTK_CALENDAR_NO_MONTH_CHANGE = 1 << 2;
+	public static final int GTK_CALENDAR_SHOW_WEEK_NUMBERS = 1 << 3;
+	public static final int GTK_CALENDAR_WEEK_START_MONDAY = 1 << 4;
+	public static final int GTK_CAN_DEFAULT = 0x2000;
+	public static final int GTK_CAN_FOCUS = 0x800;
+	public static final int GTK_CELL_RENDERER_MODE_ACTIVATABLE = 1;
+	public static final int GTK_CELL_RENDERER_SELECTED = 1 << 0;
+	public static final int GTK_CELL_RENDERER_FOCUSED = 1 << 4;
+	public static final int GTK_CLIST_SHOW_TITLES = 0x4;
+	public static final int GTK_CORNER_TOP_LEFT = 0x0;
+	public static final int GTK_CORNER_TOP_RIGHT = 0x2;
+	public static final int GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1;
+	public static final int GTK_DIALOG_MODAL = 1 << 0;
+	public static final int GTK_DIR_TAB_FORWARD = 0;
+	public static final int GTK_DIR_TAB_BACKWARD = 1;
+	public static final int GTK_ENTRY_ICON_PRIMARY = 0;
+	public static final int GTK_ENTRY_ICON_SECONDARY = 1;
+	public static final int GTK_FILE_CHOOSER_ACTION_OPEN = 0;
+	public static final int GTK_FILE_CHOOSER_ACTION_SAVE = 1;
+	public static final int GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER = 2;
+	public static final int GTK_FRAME_LABEL_PAD = 1;
+	public static final int GTK_FRAME_LABEL_SIDE_PAD = 2;
+	public static final int GTK_HAS_FOCUS = 1 << 12;
+	public static final int GTK_ICON_SIZE_MENU = 1;
+	public static final int GTK_ICON_SIZE_SMALL_TOOLBAR = 2;
+	public static final int GTK_ICON_SIZE_LARGE_TOOLBAR = 3;
+	public static final int GTK_ICON_SIZE_DIALOG = 6;
+	public static final int GTK_ICON_LOOKUP_FORCE_SIZE = 4;
+	public static final int GTK_JUSTIFY_CENTER = 0x2;
+	public static final int GTK_JUSTIFY_LEFT = 0x0;
+	public static final int GTK_JUSTIFY_RIGHT = 0x1;
+	public static final int GTK_MAPPED = 1 << 7;
+	public static final int GTK_MESSAGE_INFO = 0;
+	public static final int GTK_MESSAGE_WARNING = 1;
+	public static final int GTK_MESSAGE_QUESTION = 2;
+	public static final int GTK_MESSAGE_ERROR = 3;
+	public static final int GTK_MOVEMENT_VISUAL_POSITIONS = 1;
+	public static final int GTK_NO_WINDOW = 1 << 5;
+	public static final int GTK_ORIENTATION_HORIZONTAL = 0x0;
+	public static final int GTK_ORIENTATION_VERTICAL = 0x1;
+	public static final int GTK_PACK_END = 1;
+	public static final int GTK_PACK_START = 0;
+	public static final int GTK_PAGE_ORIENTATION_PORTRAIT = 0;
+	public static final int GTK_PAGE_ORIENTATION_LANDSCAPE = 1;
+	public static final int GTK_POLICY_ALWAYS = 0x0;
+	public static final int GTK_POLICY_AUTOMATIC = 0x1;
+	public static final int GTK_POLICY_NEVER = 0x2;
+	public static final int GTK_POLICY_EXTERNAL = 0x3;
+	public static final int GTK_POS_TOP = 0x2;
+	public static final int GTK_POS_BOTTOM = 0x3;
+	public static final int GTK_PRINT_CAPABILITY_PAGE_SET     = 1 << 0;
+	public static final int GTK_PRINT_CAPABILITY_COPIES       = 1 << 1;
+	public static final int GTK_PRINT_CAPABILITY_COLLATE      = 1 << 2;
+	public static final int GTK_PRINT_CAPABILITY_REVERSE      = 1 << 3;
+	public static final int GTK_PRINT_CAPABILITY_SCALE        = 1 << 4;
+	public static final int GTK_PRINT_CAPABILITY_GENERATE_PDF = 1 << 5;
+	public static final int GTK_PRINT_CAPABILITY_GENERATE_PS  = 1 << 6;
+	public static final int GTK_PRINT_CAPABILITY_PREVIEW      = 1 << 7;
+	public static final int GTK_PRINT_PAGES_ALL = 0;
+	public static final int GTK_PRINT_PAGES_CURRENT = 1;
+	public static final int GTK_PRINT_PAGES_RANGES = 2;
+	public static final int GTK_PRINT_DUPLEX_SIMPLEX = 0;
+	public static final int GTK_PRINT_DUPLEX_HORIZONTAL = 1;
+	public static final int GTK_PRINT_DUPLEX_VERTICAL = 2;
+	public static final int GTK_PROGRESS_CONTINUOUS = 0x0;
+	public static final int GTK_PROGRESS_DISCRETE = 0x1;
+	public static final int GTK_PROGRESS_LEFT_TO_RIGHT = 0x0;
+	public static final int GTK_PROGRESS_BOTTOM_TO_TOP = 0x2;
+	public static final int GTK_RECEIVES_DEFAULT = 1 << 20;
+	public static final int GTK_RELIEF_NONE = 0x2;
+	public static final int GTK_RELIEF_NORMAL = 0;
+	public static final int GTK_RC_BG = 1 << 1;
+	public static final int GTK_RC_FG = 1 << 0;
+	public static final int GTK_RC_TEXT = 1 << 2;
+	public static final int GTK_RC_BASE = 1 << 3;
+	public static final int GTK_RESPONSE_APPLY = 0xfffffff6;
+	public static final int GTK_RESPONSE_CANCEL = 0xfffffffa;
+	public static final int GTK_RESPONSE_OK = 0xfffffffb;
+	public static final int GTK_SCROLL_NONE = 0;
+	public static final int GTK_SCROLL_JUMP = 1;
+	public static final int GTK_SCROLL_STEP_BACKWARD = 2;
+	public static final int GTK_SCROLL_STEP_FORWARD = 3;
+	public static final int GTK_SCROLL_PAGE_BACKWARD = 4;
+	public static final int GTK_SCROLL_PAGE_FORWARD = 5;
+	public static final int GTK_SCROLL_STEP_UP = 6;
+	public static final int GTK_SCROLL_STEP_DOWN = 7;
+	public static final int GTK_SCROLL_PAGE_UP = 8;
+	public static final int GTK_SCROLL_PAGE_DOWN = 9;
+	public static final int GTK_SCROLL_STEP_LEFT = 10;
+	public static final int GTK_SCROLL_STEP_RIGHT = 11;
+	public static final int GTK_SCROLL_PAGE_LEFT = 12;
+	public static final int GTK_SCROLL_PAGE_RIGHT = 13;
+	public static final int GTK_SCROLL_START = 14;
+	public static final int GTK_SCROLL_END = 15;
+	public static final int GTK_SELECTION_BROWSE = 0x2;
+	public static final int GTK_SELECTION_MULTIPLE = 0x3;
+	public static final int GTK_SENSITIVE = 0x200;
+	public static final int GTK_SHADOW_ETCHED_IN = 0x3;
+	public static final int GTK_SHADOW_ETCHED_OUT = 0x4;
+	public static final int GTK_SHADOW_IN = 0x1;
+	public static final int GTK_SHADOW_NONE = 0x0;
+	public static final int GTK_SHADOW_OUT = 0x2;
+	public static final int GTK_STATE_ACTIVE = 0x1;
+	public static final int GTK_STATE_INSENSITIVE = 0x4;
+	public static final int GTK_STATE_NORMAL = 0x0;
+	public static final int GTK_STATE_PRELIGHT = 0x2;
+	public static final int GTK_STATE_SELECTED = 0x3;
+	public static final int GTK_STATE_FLAG_NORMAL = 0;
+	public static final int GTK_STATE_FLAG_ACTIVE = 1 << 0;
+	public static final int GTK_STATE_FLAG_PRELIGHT = 1 << 1;
+	public static final int GTK_STATE_FLAG_SELECTED = 1 << 2;
+	public static final int GTK_STATE_FLAG_INSENSITIVE = 1 << 3;
+	public static final int GTK_STATE_FLAG_INCONSISTENT = 1 << 4;
+	public static final int GTK_STATE_FLAG_FOCUSED = 1 << 5;
+	public static final int GTK_STATE_FLAG_BACKDROP  = 1 << 6;
+	public static final int GTK_TEXT_DIR_LTR = 1;
+	public static final int GTK_TEXT_DIR_NONE = 0 ;
+	public static final int GTK_TEXT_DIR_RTL = 2;
+	public static final int GTK_TEXT_WINDOW_TEXT = 2;
+	public static final int GTK_TOOLBAR_CHILD_BUTTON = 0x1;
+	public static final int GTK_TOOLBAR_CHILD_RADIOBUTTON = 0x3;
+	public static final int GTK_TOOLBAR_CHILD_TOGGLEBUTTON = 0x2;
+	public static final int GTK_TOOLBAR_ICONS = 0;
+	public static final int GTK_TOOLBAR_TEXT = 1;
+	public static final int GTK_TOOLBAR_BOTH = 2;
+	public static final int GTK_TOOLBAR_BOTH_HORIZ = 3;
+	public static final int GTK_TREE_VIEW_COLUMN_GROW_ONLY = 0;
+	public static final int GTK_TREE_VIEW_COLUMN_AUTOSIZE = 1;
+	public static final int GTK_TREE_VIEW_COLUMN_FIXED = 2;
+	public static final int GTK_TREE_VIEW_DROP_BEFORE = 0;
+	public static final int GTK_TREE_VIEW_DROP_AFTER = 1;
+	public static final int GTK_TREE_VIEW_DROP_INTO_OR_BEFORE = 2;
+	public static final int GTK_TREE_VIEW_DROP_INTO_OR_AFTER = 3;
+	public static final int GTK_TREE_VIEW_GRID_LINES_NONE = 0;
+	public static final int GTK_TREE_VIEW_GRID_LINES_HORIZONTAL = 1;
+	public static final int GTK_TREE_VIEW_GRID_LINES_VERTICAL = 2;
+	public static final int GTK_TREE_VIEW_GRID_LINES_BOTH = 3;
+	public static final int GTK_STYLE_PROVIDER_PRIORITY_APPLICATION = 600;
+	public static final int GTK_STYLE_PROVIDER_PRIORITY_USER = 800;
+	public static final int GTK_UNIT_PIXEL = 0;
+	public static final int GTK_UNIT_POINTS = 1;
+	public static final int GTK_UNIT_INCH = 2;
+	public static final int GTK_UNIT_MM = 3;
+	public static final int GTK_VISIBLE = 0x100;
+	public static final int GTK_WINDOW_POPUP = 0x1;
+	public static final int GTK_WINDOW_TOPLEVEL = 0x0;
+	public static final int GTK_WRAP_NONE = 0;
+	public static final int GTK_WRAP_WORD = 2;
+	public static final int GTK_WRAP_WORD_CHAR = 3;
+	public static final int GTK_EXPANDER_COLAPSED = 0;
+	public static final int GTK_EXPANDER_SEMI_COLLAPSED = 1;
+	public static final int GTK_EXPANDER_SEMI_EXPANDED = 2;
+	public static final int GTK_EXPANDER_EXPANDED = 3;
+
+	/** Classes */
+	public static final byte[] GTK_STYLE_CLASS_TOOLTIP = OS.ascii("tooltip");
+	public static final byte[] GTK_STYLE_CLASS_VIEW = OS.ascii("view");
+	public static final byte[] GTK_STYLE_CLASS_CELL = OS.ascii("cell");
+	public static final byte[] GTK_STYLE_CLASS_PANE_SEPARATOR = OS.ascii("pane-separator");
+	public static final byte[] GTK_STYLE_CLASS_FRAME = OS.ascii("frame");
+
+	/** Properties */
+	public static final byte[] gtk_alternative_button_order = OS.ascii("gtk-alternative-button-order");
+	public static final byte[] gtk_color_palette = OS.ascii("gtk-color-palette");
+	public static final byte[] gtk_cursor_blink = OS.ascii("gtk-cursor-blink");
+	public static final byte[] gtk_cursor_blink_time = OS.ascii("gtk-cursor-blink-time");
+	public static final byte[] gtk_double_click_time = OS.ascii("gtk-double-click-time");
+	public static final byte[] gtk_entry_select_on_focus = OS.ascii("gtk-entry-select-on-focus");
+	public static final byte[] gtk_show_input_method_menu = OS.ascii("gtk-show-input-method-menu");
+	public static final byte[] gtk_style_property_font = OS.ascii("font");
+	public static final byte[] gtk_menu_bar_accel = OS.ascii("gtk-menu-bar-accel");
+	public static final byte[] gtk_menu_images = OS.ascii("gtk-menu-images");
+	public static final byte[] gtk_theme_name = OS.ascii("gtk-theme-name");
+
+
+	/** Misc **/
+	public static final byte[] GTK_PRINT_SETTINGS_OUTPUT_URI = OS.ascii("output-uri");
+
+	/**
+	 * Needed to tell GTK 3 to prefer a dark or light theme in the UI.
+	 * Improves the look of the Eclipse Dark theme in GTK 3 systems.
+	 */
+	public static final byte[] gtk_application_prefer_dark_theme = OS.ascii("gtk-application-prefer-dark-theme");
+
+	/** Named icons.
+	 * See https://docs.google.com/spreadsheet/pub?key=0AsPAM3pPwxagdGF4THNMMUpjUW5xMXZfdUNzMXhEa2c&output=html
+	 * See http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html#names
+	 * Icon preview tool: gtk3-icon-browser
+	 * Snippets often demonstrate usage of these. E.x 309, 258.
+	 * */
+	public static final byte[] GTK_NAMED_ICON_FIND = OS.ascii("system-search-symbolic");  //Replacement of GTK_STOCK_FIND
+	public static final byte[] GTK_NAMED_ICON_CLEAR = OS.ascii("edit-clear-symbolic"); //Replacement of GTK_STOCK_CLEAR
+	public static final byte[] GTK_NAMED_ICON_GO_UP = OS.ascii ("go-up-symbolic");
+	public static final byte[] GTK_NAMED_ICON_GO_DOWN = OS.ascii ("go-down-symbolic");
+	public static final byte[] GTK_NAMED_ICON_GO_NEXT = OS.ascii ("go-next-symbolic");
+	public static final byte[] GTK_NAMED_ICON_GO_PREVIOUS = OS.ascii ("go-previous-symbolic");
+	public static final byte[] GTK_NAMED_LABEL_OK = OS.ascii("_OK");
+	public static final byte[] GTK_NAMED_LABEL_CANCEL = OS.ascii("_Cancel");
+
+	public static final int GTK_VERSION = OS.VERSION(GTK.gtk_major_version(), GTK.gtk_minor_version(), GTK.gtk_micro_version());
+	public static final boolean GTK3 = GTK_VERSION >= OS.VERSION(3, 0, 0);
+
+	/** SWT Tools translates TYPE_sizeof() into sizeof(TYPE) at native level. os.c will have a binding to functions auto-generated in os_structs.h */
+	public static final native int GtkAllocation_sizeof();
+	public static final native int GtkBorder_sizeof();
+	public static final native int GtkRequisition_sizeof();
+	public static final native int GtkTargetEntry_sizeof();
+	public static final native int GtkTextIter_sizeof();
+	public static final native int GtkCellRendererText_sizeof();
+	public static final native int GtkCellRendererTextClass_sizeof();
+	public static final native int GtkCellRendererPixbuf_sizeof();
+	public static final native int GtkCellRendererPixbufClass_sizeof();
+	public static final native int GtkCellRendererToggle_sizeof();
+	public static final native int GtkCellRendererToggleClass_sizeof();
+	public static final native int GtkTreeIter_sizeof();
+
+
+
+	/**
+	 * Macros.
+	 *
+	 * Some of these are not found in dev documentation, only in the sources.
+	 */
+
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ GTK_WIDGET_GET_CLASS(long /*int*/ widget);
+
+	/**
+	 * @param acce_label cast=(GtkAccelLabel *)
+	 * @param string cast=(gchar *)
+	 */
+	public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(long /*int*/ acce_label, long /*int*/ string);
+	/** @param acce_label cast=(GtkAccelLabel *) */
+	public static final native long /*int*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(long /*int*/ acce_label);
+	/** @param widget cast=(GtkEntry *) */
+	public static final native long /*int*/ GTK_ENTRY_IM_CONTEXT(long /*int*/ widget);
+	/** @param widget cast=(GtkTextView *) */
+	public static final native long /*int*/ GTK_TEXTVIEW_IM_CONTEXT(long /*int*/ widget);
+	/** @param widget cast=(GtkWidget *) */
+	public static final native int GTK_WIDGET_REQUISITION_WIDTH(long /*int*/ widget);
+	/** @param widget cast=(GtkWidget *) */
+	public static final native int GTK_WIDGET_REQUISITION_HEIGHT(long /*int*/ widget);
+	/** @method flags=const */
+	public static final native long /*int*/ GTK_TYPE_ACCESSIBLE ();
+	public static final native long /*int*/ _GTK_ACCESSIBLE (long /*int*/ handle);
+	public static final native boolean _GTK_IS_ACCEL_LABEL(long /*int*/ obj);
+	public static final boolean GTK_IS_ACCEL_LABEL(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_ACCEL_LABEL(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_BUTTON(long /*int*/ obj);
+	public static final boolean GTK_IS_BUTTON(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_BUTTON(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_LABEL(long /*int*/ obj);
+	public static final boolean GTK_IS_LABEL(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_LABEL(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_SCROLLED_WINDOW(long /*int*/ obj);
+	public static final boolean GTK_IS_SCROLLED_WINDOW(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_SCROLLED_WINDOW(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_WINDOW(long /*int*/ obj);
+	public static final boolean GTK_IS_WINDOW(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_WINDOW(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj);
+	public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_CELL_RENDERER_PIXBUF(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj);
+	public static final boolean GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_CELL_RENDERER_TEXT(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj);
+	public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_CELL_RENDERER_TOGGLE(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_CONTAINER(long /*int*/ obj);
+	public static final boolean GTK_IS_CONTAINER(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_CONTAINER(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj);
+	public static final boolean GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_IMAGE_MENU_ITEM(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_MENU_ITEM(long /*int*/ obj);
+	public static final boolean GTK_IS_MENU_ITEM(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_MENU_ITEM(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native boolean _GTK_IS_PLUG(long /*int*/ obj);
+	public static final boolean GTK_IS_PLUG(long /*int*/ obj) {
+		lock.lock();
+		try {
+			return _GTK_IS_PLUG(obj);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_STOCK_CANCEL();
+	public static final long /*int*/ GTK_STOCK_CANCEL() {
+		lock.lock();
+		try {
+			return _GTK_STOCK_CANCEL();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_STOCK_OK();
+	public static final long /*int*/ GTK_STOCK_OK() {
+		lock.lock();
+		try {
+			return _GTK_STOCK_OK();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TEXT();
+	public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TEXT() {
+		lock.lock();
+		try {
+			return _GTK_TYPE_CELL_RENDERER_TEXT();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();
+	public static final long /*int*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
+		lock.lock();
+		try {
+			return _GTK_TYPE_CELL_RENDERER_PIXBUF();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();
+	public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
+		lock.lock();
+		try {
+			return _GTK_TYPE_CELL_RENDERER_TOGGLE();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_TYPE_IM_MULTICONTEXT();
+	public static final long /*int*/ GTK_TYPE_IM_MULTICONTEXT() {
+		lock.lock();
+		try {
+			return _GTK_TYPE_IM_MULTICONTEXT();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_TYPE_FIXED();
+	public static final long /*int*/ GTK_TYPE_FIXED() {
+		lock.lock();
+		try {
+			return _GTK_TYPE_FIXED();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_TYPE_MENU();
+	public static final long /*int*/ GTK_TYPE_MENU() {
+		lock.lock();
+		try {
+			return _GTK_TYPE_MENU();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native long /*int*/ _GTK_TYPE_WIDGET();
+	public static final long /*int*/ GTK_TYPE_WIDGET() {
+		lock.lock();
+		try {
+			return _GTK_TYPE_WIDGET();
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native void _GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag);
+	public static final void GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag) {
+		lock.lock();
+		try {
+			_GTK_WIDGET_SET_FLAGS(wid, flag);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native void _GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag);
+	public static final void GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag) {
+		lock.lock();
+		try {
+			_GTK_WIDGET_UNSET_FLAGS(wid, flag);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	// See os_custom.h
+	// Dynamically get's the function pointer to gtk_false(). Gtk2/Gtk3.
+	public static final native long /*int*/ _GET_FUNCTION_POINTER_gtk_false();
+	public static final long /*int*/ GET_FUNCTION_POINTER_gtk_false() {
+		lock.lock();
+		try {
+			return _GET_FUNCTION_POINTER_gtk_false();
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_has_default(long /*int*/ widget);
+	public static final boolean gtk_widget_has_default(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_has_default(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_get_sensitive(long /*int*/ widget);
+	public static final boolean gtk_widget_get_sensitive(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_sensitive(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ _gtk_widget_get_name(long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_name(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_name(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/** @method flags=dynamic
+	 *  @param widget_class cast=(GtkWidgetClass *)
+	 */
+	public static final native long /*int*/ _gtk_widget_class_get_css_name(long /*int*/ widget_class);
+	public static final long /*int*/ gtk_widget_class_get_css_name(long /*int*/ widget_class) {
+		lock.lock();
+		try {
+			return _gtk_widget_class_get_css_name(widget_class);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/** @param button cast=(GtkButton *) */
+	public static final native void _gtk_button_clicked(long /*int*/ button);
+	public static final void gtk_button_clicked(long /*int*/ button) {
+		lock.lock();
+		try {
+			_gtk_button_clicked(button);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	public static final native long /*int*/ _gtk_button_new();
+	public static final long /*int*/ gtk_button_new() {
+		lock.lock();
+		try {
+			return _gtk_button_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/**
+	 * @param button cast=(GtkButton *)
+	 * @param image cast=(GtkWidget *)
+	 */
+	public static final native void /*int*/ _gtk_button_set_image(long /*int*/ button, long /*int*/ image);
+	public static final void /*int*/ gtk_button_set_image(long /*int*/ button, long /*int*/ image) {
+		lock.lock();
+		try {
+			_gtk_button_set_image(button, image);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	/**
+	 * @method flags=dynamic
+	 * @param accel_label cast=(GtkAccelLabel *)
+	 * @param accel_key cast=(guint)
+	 * @param accel_mods cast=(GdkModifierType)
+	 */
+	public static final native void _gtk_accel_label_set_accel(long /*int*/ accel_label, int accel_key, int accel_mods);
+	public static final void gtk_accel_label_set_accel(long /*int*/ accel_label, int accel_key, int accel_mods) {
+		lock.lock();
+		try {
+			_gtk_accel_label_set_accel(accel_label, accel_key, accel_mods);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native int _gtk_accelerator_get_default_mod_mask();
+	public static final int gtk_accelerator_get_default_mod_mask() {
+		lock.lock();
+		try {
+			return _gtk_accelerator_get_default_mod_mask();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param accelerator cast=(const gchar *)
+	 * @param accelerator_key cast=(guint *)
+	 * @param accelerator_mods cast=(GdkModifierType *)
+	 */
+	public static final native void _gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods);
+	public static final void gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods) {
+		lock.lock();
+		try {
+			_gtk_accelerator_parse(accelerator, accelerator_key, accelerator_mods);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_accel_group_new();
+	public static final long /*int*/ gtk_accel_group_new() {
+		lock.lock();
+		try {
+			return _gtk_accel_group_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param accel_label cast=(GtkAccelLabel *)
+	 * @param accel_widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget);
+	public static final void gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget) {
+		lock.lock();
+		try {
+			_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param label cast=(const gchar *) */
+	public static final native long /*int*/ _gtk_accel_label_new(byte[] label);
+	public static final long /*int*/ gtk_accel_label_new(byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_accel_label_new(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param accessible cast=(GtkAccessible *)
+	 */
+	public static final native long /*int*/ _gtk_accessible_get_widget(long /*int*/ accessible);
+	public static final long /*int*/ gtk_accessible_get_widget(long /*int*/ accessible) {
+		lock.lock();
+		try {
+			return _gtk_accessible_get_widget(accessible);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native void _gtk_adjustment_configure(long /*int*/ adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size);
+	public static final void gtk_adjustment_configure(long /*int*/ adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size) {
+		lock.lock();
+		try {
+			_gtk_adjustment_configure(adjustment, value, lower, upper, step_increment, page_increment, page_size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param value cast=(gdouble)
+	 * @param lower cast=(gdouble)
+	 * @param upper cast=(gdouble)
+	 * @param step_increment cast=(gdouble)
+	 * @param page_increment cast=(gdouble)
+	 */
+	public static final native long /*int*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
+	public static final long /*int*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) {
+		lock.lock();
+		try {
+			return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native double _gtk_adjustment_get_lower(long /*int*/ adjustment);
+	public static final double gtk_adjustment_get_lower(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_adjustment_get_lower(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native double _gtk_adjustment_get_page_increment(long /*int*/ adjustment);
+	public static final double gtk_adjustment_get_page_increment(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_adjustment_get_page_increment(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native double _gtk_adjustment_get_page_size(long /*int*/ adjustment);
+	public static final double gtk_adjustment_get_page_size(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_adjustment_get_page_size(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native double _gtk_adjustment_get_step_increment(long /*int*/ adjustment);
+	public static final double gtk_adjustment_get_step_increment(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_adjustment_get_step_increment(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native double _gtk_adjustment_get_upper(long /*int*/ adjustment);
+	public static final double gtk_adjustment_get_upper(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_adjustment_get_upper(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native double _gtk_adjustment_get_value(long /*int*/ adjustment);
+	public static final double gtk_adjustment_get_value(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_adjustment_get_value(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 * @param value cast=(gdouble)
+	 */
+	public static final native void _gtk_adjustment_set_value(long /*int*/ adjustment, double value);
+	public static final void gtk_adjustment_set_value(long /*int*/ adjustment, double value) {
+		lock.lock();
+		try {
+			_gtk_adjustment_set_value(adjustment, value);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 * @param value cast=(gdouble)
+	 */
+	public static final native void _gtk_adjustment_set_step_increment(long /*int*/ adjustment, double value);
+	public static final void gtk_adjustment_set_step_increment(long /*int*/ adjustment, double value) {
+		lock.lock();
+		try {
+			_gtk_adjustment_set_step_increment(adjustment, value);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param adjustment cast=(GtkAdjustment *)
+	 * @param value cast=(gdouble)
+	 */
+	public static final native void _gtk_adjustment_set_page_increment(long /*int*/ adjustment, double value);
+	public static final void gtk_adjustment_set_page_increment(long /*int*/ adjustment, double value) {
+		lock.lock();
+		try {
+			_gtk_adjustment_set_page_increment(adjustment, value);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param adjustment cast=(GtkAdjustment *)
+	 * */
+	public static final native void _gtk_adjustment_value_changed(long /*int*/ adjustment);
+	/**  [GTK2/GTK3; 3.18 deprecated] */
+	public static final void gtk_adjustment_value_changed(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			_gtk_adjustment_value_changed(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param arrow_type cast=(GtkArrowType)
+	 * @param shadow_type cast=(GtkShadowType)
+	 */
+	public static final native long /*int*/ _gtk_arrow_new(int arrow_type, int shadow_type);
+	/** [GTK2/GTK3; 3.14 deprecated] */
+	public static final long /*int*/ gtk_arrow_new(int arrow_type, int shadow_type) {
+		lock.lock();
+		try {
+			return _gtk_arrow_new(arrow_type, shadow_type);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param arrow cast=(GtkArrow *)
+	 * @param arrow_type cast=(GtkArrowType)
+	 * @param shadow_type cast=(GtkShadowType)
+	 */
+	public static final native void _gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type);
+	/** [GTK2/GTK3; 3.14 deprecated] */
+	public static final void gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type) {
+		lock.lock();
+		try {
+			_gtk_arrow_set(arrow, arrow_type, shadow_type);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param bin cast=(GtkBin *) */
+	public static final native long /*int*/ _gtk_bin_get_child(long /*int*/ bin);
+	public static final long /*int*/ gtk_bin_get_child(long /*int*/ bin) {
+		lock.lock();
+		try {
+			return _gtk_bin_get_child(bin);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param border cast=(GtkBorder *) */
+	public static final native void _gtk_border_free(long /*int*/ border);
+	public static final void gtk_border_free(long /*int*/ border) {
+		lock.lock();
+		try {
+			_gtk_border_free(border);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param box cast=(GtkBox *) */
+	public static final native void _gtk_box_set_spacing(long /*int*/ box, int spacing);
+	public static final void gtk_box_set_spacing(long /*int*/ box, int spacing) {
+		lock.lock();
+		try {
+			_gtk_box_set_spacing(box, spacing);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param box cast=(GtkBox *)
+	 * @param child cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type);
+	public static final void gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type) {
+		lock.lock();
+		try {
+			_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_calendar_new();
+	public static final long /*int*/ gtk_calendar_new() {
+		lock.lock();
+		try {
+			return _gtk_calendar_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param calendar cast=(GtkCalendar *)
+	 * @param month cast=(guint)
+	 * @param year cast=(guint)
+	 */
+	public static final native void /*long*/ _gtk_calendar_select_month(long /*int*/ calendar, int month, int year);
+	public static final void /*long*/ gtk_calendar_select_month(long /*int*/ calendar, int month, int year) {
+		lock.lock();
+		try {
+			_gtk_calendar_select_month(calendar, month, year);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param calendar cast=(GtkCalendar *)
+	 * @param day cast=(guint)
+	 */
+	public static final native void _gtk_calendar_select_day(long /*int*/ calendar, int day);
+	public static final void gtk_calendar_select_day(long /*int*/ calendar, int day) {
+		lock.lock();
+		try {
+			_gtk_calendar_select_day(calendar, day);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param calendar cast=(GtkCalendar *)
+	 * @param day cast=(guint)
+	 */
+	public static final native void _gtk_calendar_mark_day(long /*int*/ calendar, int day);
+	public static final void gtk_calendar_mark_day(long /*int*/ calendar, int day) {
+		lock.lock();
+		try {
+			_gtk_calendar_mark_day(calendar, day);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param calendar cast=(GtkCalendar *)
+	 */
+	public static final native void _gtk_calendar_clear_marks(long /*int*/ calendar);
+	public static final void gtk_calendar_clear_marks(long /*int*/ calendar) {
+		lock.lock();
+		try {
+			_gtk_calendar_clear_marks(calendar);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param calendar cast=(GtkCalendar *)
+	 * @param flags cast=(GtkCalendarDisplayOptions)
+	 */
+	public static final native void _gtk_calendar_set_display_options(long /*int*/ calendar, int flags);
+	public static final void gtk_calendar_set_display_options(long /*int*/ calendar, int flags) {
+		lock.lock();
+		try {
+			_gtk_calendar_set_display_options(calendar, flags);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param calendar cast=(GtkCalendar *)
+	 * @param year cast=(guint *)
+	 * @param month cast=(guint *)
+	 * @param day cast=(guint *)
+	 */
+	public static final native void _gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day);
+	public static final void gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day) {
+		lock.lock();
+		try {
+			_gtk_calendar_get_date(calendar, year, month, day);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param cell_layout cast=(GtkCellLayout *) */
+	public static final native void _gtk_cell_layout_clear(long /*int*/ cell_layout);
+	public static final void gtk_cell_layout_clear(long /*int*/ cell_layout) {
+		lock.lock();
+		try {
+			_gtk_cell_layout_clear(cell_layout);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param cell_layout cast=(GtkCellLayout *) */
+	public static final native long /*int*/ _gtk_cell_layout_get_cells(long /*int*/ cell_layout);
+	public static final long /*int*/ gtk_cell_layout_get_cells(long /*int*/ cell_layout) {
+		lock.lock();
+		try {
+			return _gtk_cell_layout_get_cells(cell_layout);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param cell_layout cast=(GtkCellLayout *)
+	 * @param cell cast=(GtkCellRenderer *)
+	 * @param sentinel cast=(const gchar *),flags=sentinel
+	 */
+	public static final native void _gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel);
+	public static final void gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel) {
+		lock.lock();
+		try {
+			_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param cell_layout cast=(GtkCellLayout *)
+	 * @param cell cast=(GtkCellRenderer *)
+	 */
+	public static final native void _gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand);
+	public static final void gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand) {
+		lock.lock();
+		try {
+			_gtk_cell_layout_pack_start(cell_layout, cell, expand);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param cell cast=(GtkCellRenderer *)
+	 * @param widget cast=(GtkWidget *)
+	 * @param area cast=(GdkRectangle *),flags=no_in
+	 * @param x_offset cast=(gint *)
+	 * @param y_offset cast=(gint *)
+	 * @param width cast=(gint *)
+	 * @param height cast=(gint *)
+	 */
+	public static final native void _gtk_cell_renderer_get_size(long /*int*/ cell, long /*int*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height);
+	/**  [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_cell_renderer_get_size(long /*int*/ cell, long /*int*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
+		lock.lock();
+		try {
+			_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param cell cast=(GtkCellRenderer *)
+	 * @param widget cast=(GtkWidget *)
+	 * @param minimum_size cast=(GtkRequisition *)
+	 * @param natural_size cast=(GtkRequisition *)
+	 */
+	public static final native void _gtk_cell_renderer_get_preferred_size(long /*int*/ cell, long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size);
+	public static final void gtk_cell_renderer_get_preferred_size(long /*int*/ cell, long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size) {
+		lock.lock();
+		try {
+			_gtk_cell_renderer_get_preferred_size(cell, widget, minimum_size, natural_size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param cell cast=(GtkCellRenderer *)
+	 */
+	public static final native void _gtk_cell_renderer_get_preferred_height_for_width(long /*int*/ cell, long /*int*/ widget, int width, int[] minimum_height, int[] natural_height);
+	public static final void gtk_cell_renderer_get_preferred_height_for_width(long /*int*/ cell, long /*int*/ widget, int width, int[] minimum_height, int[] natural_height) {
+		lock.lock();
+		try {
+			_gtk_cell_renderer_get_preferred_height_for_width(cell, widget, width, minimum_height, natural_height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param cell cast=(GtkCellRenderer *)
+	 * @param width cast=(gint)
+	 * @param height cast=(gint)
+	 */
+	public static final native void _gtk_cell_renderer_set_fixed_size(long /*int*/ cell, int width, int height);
+	public static final void gtk_cell_renderer_set_fixed_size (long /*int*/ cell, int width, int height) {
+		lock.lock();
+		try {
+			_gtk_cell_renderer_set_fixed_size(cell, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param cell cast=(GtkCellRenderer *)
+	 * @param width cast=(gint *)
+	 * @param height cast=(gint *)
+	 */
+	public static final native void _gtk_cell_renderer_get_fixed_size(long /*int*/ cell, int[] width, int[] height);
+	public static final void gtk_cell_renderer_get_fixed_size (long /*int*/ cell, int[] width, int[] height) {
+		lock.lock();
+		try {
+			_gtk_cell_renderer_get_fixed_size(cell, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param minimum_size cast=(GtkRequisition *)
+	 * @param natural_size cast=(GtkRequisition *)
+	 */
+	public static final native void _gtk_widget_get_preferred_size(long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size);
+	public static final void gtk_widget_get_preferred_size(long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size) {
+		lock.lock();
+		try {
+			_gtk_widget_get_preferred_size(widget, minimum_size, natural_size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_widget_get_preferred_height_for_width(long /*int*/ widget, int width, int[] minimum_size, int[] natural_size);
+	public static final void gtk_widget_get_preferred_height_for_width(long /*int*/ widget, int width, int[] minimum_size, int[] natural_size) {
+		lock.lock();
+		try {
+			_gtk_widget_get_preferred_height_for_width(widget, width, minimum_size, natural_size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_widget_get_preferred_width_for_height(long /*int*/ widget, int height, int[] minimum_size, int[] natural_size);
+	public static final void gtk_widget_get_preferred_width_for_height(long /*int*/ widget, int height, int[] minimum_size, int[] natural_size) {
+		lock.lock();
+		try {
+			_gtk_widget_get_preferred_width_for_height(widget, height, minimum_size, natural_size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_cell_renderer_pixbuf_new();
+	public static final long /*int*/ gtk_cell_renderer_pixbuf_new() {
+		lock.lock();
+		try {
+			return _gtk_cell_renderer_pixbuf_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_cell_renderer_text_new();
+	public static final long /*int*/ gtk_cell_renderer_text_new() {
+		lock.lock();
+		try {
+			return _gtk_cell_renderer_text_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_cell_renderer_toggle_new();
+	public static final long /*int*/ gtk_cell_renderer_toggle_new() {
+		lock.lock();
+		try {
+			return _gtk_cell_renderer_toggle_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_check_button_new();
+	public static final long /*int*/ gtk_check_button_new() {
+		lock.lock();
+		try {
+			return _gtk_check_button_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param check_menu_item cast=(GtkCheckMenuItem *) */
+	public static final native boolean _gtk_check_menu_item_get_active(long /*int*/ check_menu_item);
+	public static final boolean gtk_check_menu_item_get_active(long /*int*/ check_menu_item) {
+		lock.lock();
+		try {
+			return _gtk_check_menu_item_get_active(check_menu_item);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param label cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_image_menu_item_new_with_label(byte[] label);
+	/** [GTK2/GTK3; 3.10 deprecated] */
+	public static final long /*int*/ gtk_image_menu_item_new_with_label(byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_image_menu_item_new_with_label(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param label cast=(const gchar *) */
+	public static final native long /*int*/ _gtk_check_menu_item_new_with_label(byte[] label);
+	public static final long /*int*/ gtk_check_menu_item_new_with_label(byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_check_menu_item_new_with_label(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_check_menu_item_new();
+	public static final long /*int*/ gtk_check_menu_item_new() {
+		lock.lock();
+		try {
+			return _gtk_check_menu_item_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param wid cast=(GtkCheckMenuItem *)
+	 * @param active cast=(gboolean)
+	 */
+	public static final native void _gtk_check_menu_item_set_active(long /*int*/ wid, boolean active);
+	public static final void gtk_check_menu_item_set_active(long /*int*/ wid, boolean active) {
+		lock.lock();
+		try {
+			_gtk_check_menu_item_set_active(wid, active);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_check_version(int required_major, int required_minor, int required_micro);
+	public static final long /*int*/ gtk_check_version(int required_major, int required_minor, int required_micro) {
+		lock.lock();
+		try {
+			return _gtk_check_version(required_major, required_minor, required_micro);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param clipboard cast=(GtkClipboard *) */
+	public static final native void _gtk_clipboard_clear(long /*int*/ clipboard);
+	public static final void gtk_clipboard_clear(long /*int*/ clipboard) {
+		lock.lock();
+		try {
+			_gtk_clipboard_clear(clipboard);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param selection cast=(GdkAtom) */
+	public static final native long /*int*/ _gtk_clipboard_get(long /*int*/ selection);
+	public static final long /*int*/ gtk_clipboard_get(long /*int*/ selection) {
+		lock.lock();
+		try {
+			return _gtk_clipboard_get(selection);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param clipboard cast=(GtkClipboard *)
+	 * @param target cast=(const GtkTargetEntry *)
+	 * @param n_targets cast=(guint)
+	 * @param get_func cast=(GtkClipboardGetFunc)
+	 * @param clear_func cast=(GtkClipboardClearFunc)
+	 * @param user_data cast=(GObject *)
+	 */
+	public static final native boolean _gtk_clipboard_set_with_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data);
+	public static final boolean gtk_clipboard_set_with_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data) {
+		lock.lock();
+		try {
+			return _gtk_clipboard_set_with_owner(clipboard, target, n_targets, get_func, clear_func, user_data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param clipboard cast=(GtkClipboard *)
+	 * @param targets cast=(const GtkTargetEntry *)
+	 * @param n_targets cast=(gint)
+	 */
+	public static final native void _gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets);
+	public static final void gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets) {
+		lock.lock();
+		try {
+			_gtk_clipboard_set_can_store(clipboard, targets, n_targets);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param clipboard cast=(GtkClipboard *)
+	 */
+	public static final native void _gtk_clipboard_store(long /*int*/ clipboard);
+	public static final void gtk_clipboard_store(long /*int*/ clipboard) {
+		lock.lock();
+		try {
+			_gtk_clipboard_store(clipboard);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param clipboard cast=(GtkClipboard *)
+	 * @param target cast=(GdkAtom)
+	 */
+	public static final native long /*int*/ _gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target);
+	public static final long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) {
+		lock.lock();
+		try {
+			return _gtk_clipboard_wait_for_contents(clipboard, target);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param title cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_color_selection_dialog_new(byte[] title);
+	/** [GTK2/GTK3; 3.6 deprecated] */
+	public static final long /*int*/ gtk_color_selection_dialog_new(byte[] title) {
+		lock.lock();
+		try {
+			return _gtk_color_selection_dialog_new(title);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param chooser cast=(GtkColorChooser *)
+	 * @param orientation cast=(GtkOrientation)
+	 * @param colors cast=(GdkRGBA *)
+	 */
+	public static final native long /*int*/ _gtk_color_chooser_add_palette(long /*int*/ chooser, int orientation, int colors_per_line, int n_colors, long /*int*/ colors);
+	public static final long /*int*/ gtk_color_chooser_add_palette(long /*int*/ chooser, int orientation, int colors_per_line, int n_colors, long /*int*/ colors) {
+		lock.lock();
+		try {
+			return _gtk_color_chooser_add_palette(chooser, orientation, colors_per_line, n_colors, colors);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param title cast=(const gchar *)
+	 * @param parent cast=(GtkWindow *)
+	 */
+	public static final native long /*int*/ _gtk_color_chooser_dialog_new (byte[] title, long /*int*/ parent);
+	public static final long /*int*/  gtk_color_chooser_dialog_new (byte[] title, long /*int*/ parent) {
+		lock.lock();
+		try {
+			return _gtk_color_chooser_dialog_new (title, parent);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_color_chooser_set_use_alpha (long /*int*/ chooser, boolean use_alpha);
+	public static final void  gtk_color_chooser_set_use_alpha (long /*int*/ chooser, boolean use_alpha) {
+		lock.lock();
+		try {
+			 _gtk_color_chooser_set_use_alpha (chooser, use_alpha);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native boolean _gtk_color_chooser_get_use_alpha (long /*int*/ chooser);
+	public static final boolean  gtk_color_chooser_get_use_alpha (long /*int*/ chooser) {
+		lock.lock();
+		try {
+			 return _gtk_color_chooser_get_use_alpha (chooser);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param color_dialog cast=(GtkColorSelectionDialog *)
+	 */
+	public static final native long /*int*/ _gtk_color_selection_dialog_get_color_selection(long /*int*/ color_dialog);
+	/** [GTK2/GTK3; 3.6 deprecated] */
+	public static final long /*int*/ gtk_color_selection_dialog_get_color_selection(long /*int*/ color_dialog) {
+		lock.lock();
+		try {
+			return _gtk_color_selection_dialog_get_color_selection(color_dialog);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_color_chooser_set_rgba(long /*int*/ chooser, GdkRGBA color);
+	public static final void  gtk_color_chooser_get_rgba(long /*int*/ chooser, GdkRGBA color) {
+		lock.lock();
+		try {
+			 _gtk_color_chooser_get_rgba(chooser, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_color_chooser_get_rgba(long /*int*/ chooser, GdkRGBA color);
+	public static final void  gtk_color_chooser_set_rgba(long /*int*/ chooser, GdkRGBA color) {
+		lock.lock();
+		try {
+			 _gtk_color_chooser_set_rgba(chooser, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param color flags=no_in
+	 */
+	public static final native void _gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color);
+	/** [GTK2/GTK3; 3.4 deprecated] */
+	public static final void gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_color_selection_get_current_color(colorsel, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_color_selection_palette_to_string(long /*int*/ colors, int n_colors);
+	/** [GTK2/GTK3; 3.6 deprecated] */
+	public static final long /*int*/ gtk_color_selection_palette_to_string(long /*int*/ colors, int n_colors) {
+		lock.lock();
+		try {
+			return _gtk_color_selection_palette_to_string(colors, n_colors);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param color flags=no_out
+	 */
+	public static final native void _gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color);
+	/** [GTK2/GTK3; 3.4 deprecated] */
+	public static final void gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_color_selection_set_current_color(colorsel, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette);
+	/** [GTK2/GTK3; 3.6 deprecated] */
+	public static final void gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette) {
+		lock.lock();
+		try {
+			_gtk_color_selection_set_has_palette(colorsel, has_palette);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param combo cast=(GtkComboBox *)
+	 * @param val cast=(gboolean)
+	 */
+	public static final native void _gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val);
+	/** [GTK2/GTK3; 3.20 deprecated] */
+	public static final void gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val) {
+		lock.lock();
+		try {
+			_gtk_combo_box_set_focus_on_click(combo, val);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_combo_box_text_new();
+	public static final long /*int*/ gtk_combo_box_text_new() {
+		lock.lock();
+		try {
+			return _gtk_combo_box_text_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_combo_box_text_new_with_entry();
+	public static final long /*int*/ gtk_combo_box_text_new_with_entry() {
+		lock.lock();
+		try {
+			return _gtk_combo_box_text_new_with_entry();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_combo_box_text_insert(long /*int*/ combo_box, int position, byte[] id, byte[] text);
+	public static final void gtk_combo_box_text_insert(long /*int*/ combo_box, int position, byte[] id, byte[] text) {
+		lock.lock();
+		try {
+			_gtk_combo_box_text_insert(combo_box, position, id, text);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param combo_box cast=(GtkComboBoxText *)
+	 * @param position cast=(gint)
+	 * @param text cast=(const gchar *)
+	 */
+	public static final native void _gtk_combo_box_text_insert_text(long /*int*/ combo_box, int position, byte[] text);
+	public static final void gtk_combo_box_text_insert_text(long /*int*/ combo_box, int position, byte[] text) {
+		lock.lock();
+		try {
+			_gtk_combo_box_text_insert_text(combo_box, position, text);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param combo_box cast=(GtkComboBoxText *) */
+	public static final native void _gtk_combo_box_text_remove(long /*int*/ combo_box, int position);
+	public static final void gtk_combo_box_text_remove(long /*int*/ combo_box, int position) {
+		lock.lock();
+		try {
+			_gtk_combo_box_text_remove(combo_box, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_combo_box_text_remove_all(long /*int*/ combo_box);
+	public static final void gtk_combo_box_text_remove_all(long /*int*/ combo_box) {
+		lock.lock();
+		try {
+			_gtk_combo_box_text_remove_all(combo_box);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	* @param combo_box cast=(GtkComboBox *)
+	*/
+	public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box);
+	public static final int gtk_combo_box_get_active(long /*int*/ combo_box) {
+		lock.lock();
+		try {
+			return _gtk_combo_box_get_active(combo_box);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	* @param combo_box cast=(GtkComboBox *)
+	*/
+	public static final native long /*int*/ _gtk_combo_box_get_model(long /*int*/ combo_box);
+	public static final long /*int*/ gtk_combo_box_get_model(long /*int*/ combo_box) {
+		lock.lock();
+		try {
+			return _gtk_combo_box_get_model(combo_box);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	* @param combo_box cast=(GtkComboBox *)
+	* @param index cast=(gint)
+	*/
+	public static final native void _gtk_combo_box_set_active(long /*int*/ combo_box, int index);
+	public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int index) {
+		lock.lock();
+		try {
+			_gtk_combo_box_set_active(combo_box, index);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param combo_box cast=(GtkComboBox *)
+	 * @param width cast=(gint)
+	 */
+	public static final native void _gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width);
+	public static final void gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width) {
+		lock.lock();
+		try {
+			_gtk_combo_box_set_wrap_width(combo_box, width);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	* @param combo_box cast=(GtkComboBox *)
+	*/
+	public static final native void _gtk_combo_box_popup(long /*int*/ combo_box);
+	public static final void gtk_combo_box_popup(long /*int*/ combo_box) {
+		lock.lock();
+		try {
+			_gtk_combo_box_popup(combo_box);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	* @param combo_box cast=(GtkComboBox *)
+	*/
+	public static final native void _gtk_combo_box_popdown(long /*int*/ combo_box);
+	public static final void gtk_combo_box_popdown(long /*int*/ combo_box) {
+		lock.lock();
+		try {
+			_gtk_combo_box_popdown(combo_box);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param container cast=(GtkContainer *)
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_container_add(long /*int*/ container, long /*int*/ widget);
+	public static final void gtk_container_add(long /*int*/ container, long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_container_add(container, widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	//Do not confuse this function with gtk_container_foreach(..).
+	//Make sure you know what you are doing when using this. Please be attentive to swt_fixed_forall(..)
+	// found in os_custom.c, which overrides this function for swtFixed container with custom behaviour.
+	/**
+	 * @param container cast=(GtkContainer *)
+	 * @param callback cast=(GtkCallback)
+	 * @param callback_data cast=(gpointer)
+	 */
+	public static final native void _gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data);
+	public static final void gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data) {
+		lock.lock();
+		try {
+			_gtk_container_forall(container, callback, callback_data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param container cast=(GtkContainer *) */
+	public static final native int _gtk_container_get_border_width(long /*int*/ container);
+	public static final int gtk_container_get_border_width(long /*int*/ container) {
+		lock.lock();
+		try {
+			return _gtk_container_get_border_width(container);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param container cast=(GtkContainer *) */
+	public static final native long /*int*/ _gtk_container_get_children(long /*int*/ container);
+	public static final long /*int*/ gtk_container_get_children(long /*int*/ container) {
+		lock.lock();
+		try {
+			return _gtk_container_get_children(container);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param container cast=(GtkContainer *)
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_container_remove(long /*int*/ container, long /*int*/ widget);
+	public static final void gtk_container_remove(long /*int*/ container, long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_container_remove(container, widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param container cast=(GtkContainer *)
+	 * @param border_width cast=(guint)
+	 */
+	public static final native void _gtk_container_set_border_width(long /*int*/ container, int border_width);
+	public static final void gtk_container_set_border_width(long /*int*/ container, int border_width) {
+		lock.lock();
+		try {
+			_gtk_container_set_border_width(container, border_width);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkDialog *)
+	 * @param button_text cast=(const gchar *)
+	 * @param response_id cast=(gint)
+	 */
+	public static final native long /*int*/ _gtk_dialog_add_button(long /*int*/ dialog, byte[]  button_text, int response_id);
+	public static final long /*int*/ gtk_dialog_add_button(long /*int*/ dialog, byte[]  button_text, int response_id) {
+		lock.lock();
+		try {
+			return _gtk_dialog_add_button(dialog, button_text, response_id);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param dialog cast=(GtkDialog *) */
+	public static final native int _gtk_dialog_run(long /*int*/ dialog);
+	public static final int gtk_dialog_run(long /*int*/ dialog) {
+		lock.lock();
+		try {
+			return _gtk_dialog_run(dialog);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param targets cast=(GtkTargetList *)
+	 * @param actions cast=(GdkDragAction)
+	 * @param button cast=(gint)
+	 * @param event cast=(GdkEvent *)
+	 */
+	public static final native long /*int*/ _gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event);
+	/** [GTK2/GTK3; 3.10 deprecated] */
+	public static final long /*int*/ gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event) {
+		lock.lock();
+		try {
+			return _gtk_drag_begin(widget, targets, actions, button, event);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param targets cast=(GtkTargetList *)
+	 * @param actions cast=(GdkDragAction)
+	 * @param button cast=(gint)
+	 * @param event cast=(GdkEvent *)
+	 * @param x cast=(gint)
+	 * @param y cast=(gint)
+	 */
+	public static final native long /*int*/ _gtk_drag_begin_with_coordinates(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event, int x, int y);
+	public static final long /*int*/ gtk_drag_begin_with_coordinates(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event, int x, int y) {
+		lock.lock();
+		try {
+			return _gtk_drag_begin_with_coordinates(widget, targets, actions, button, event, x, y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param start_x cast=(gint)
+	 * @param start_y cast=(gint)
+	 * @param current_x cast=(gint)
+	 * @param current_y cast=(gint)
+	 */
+	public static final native boolean _gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y);
+	public static final boolean gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y) {
+		lock.lock();
+		try {
+			return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param context cast=(GdkDragContext *)
+	 * @param target_list cast=(GtkTargetList *)
+	 */
+	public static final native long /*int*/ _gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list);
+	public static final long /*int*/ gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list) {
+		lock.lock();
+		try {
+			return _gtk_drag_dest_find_target(widget, context, target_list);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param flags cast=(GtkDestDefaults)
+	 * @param targets cast=(const GtkTargetEntry *)
+	 * @param n_targets cast=(gint)
+	 * @param actions cast=(GdkDragAction)
+	 */
+	public static final native void _gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions);
+	public static final void gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions) {
+		lock.lock();
+		try {
+			_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_drag_dest_unset(long /*int*/ widget);
+	public static final void gtk_drag_dest_unset(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_drag_dest_unset(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param context cast=(GdkDragContext *)
+	 * @param success cast=(gboolean)
+	 * @param delete cast=(gboolean)
+	 * @param time cast=(guint32)
+	 */
+	public static final native void _gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time);
+	public static final void gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time) {
+		lock.lock();
+		try {
+			_gtk_drag_finish(context, success, delete, time);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param context cast=(GdkDragContext *)
+	 * @param target cast=(GdkAtom)
+	 * @param time cast=(guint32)
+	 */
+	public static final native void _gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time);
+	public static final void gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time) {
+		lock.lock();
+		try {
+			_gtk_drag_get_data(widget, context, target, time);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param context cast=(GdkDragContext *)
+	 * @param pixbuf cast=(GdkPixbuf *)
+	 */
+	public static final native void _gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y);
+	public static final void gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y) {
+		lock.lock();
+		try {
+			_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_drag_set_icon_surface(long /*int*/ context, long /*int*/ surface);
+	public static final void gtk_drag_set_icon_surface(long /*int*/ context, long /*int*/ surface) {
+		lock.lock();
+		try {
+			_gtk_drag_set_icon_surface(context, surface);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param editable cast=(GtkEditable *) */
+	public static final native void _gtk_editable_copy_clipboard(long /*int*/ editable);
+	public static final void gtk_editable_copy_clipboard(long /*int*/ editable) {
+		lock.lock();
+		try {
+			_gtk_editable_copy_clipboard(editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param editable cast=(GtkEditable *) */
+	public static final native void _gtk_editable_cut_clipboard(long /*int*/ editable);
+	public static final void gtk_editable_cut_clipboard(long /*int*/ editable) {
+		lock.lock();
+		try {
+			_gtk_editable_cut_clipboard(editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param editable cast=(GtkEditable *) */
+	public static final native void _gtk_editable_delete_selection(long /*int*/ editable);
+	public static final void gtk_editable_delete_selection(long /*int*/ editable) {
+		lock.lock();
+		try {
+			_gtk_editable_delete_selection(editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param editable cast=(GtkEditable *)
+	 * @param start_pos cast=(gint)
+	 * @param end_pos cast=(gint)
+	 */
+	public static final native void _gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos);
+	public static final void gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos) {
+		lock.lock();
+		try {
+			_gtk_editable_delete_text(editable, start_pos, end_pos);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param editable cast=(GtkEditable *) */
+	public static final native boolean _gtk_editable_get_editable(long /*int*/ editable);
+	public static final boolean gtk_editable_get_editable(long /*int*/ editable) {
+		lock.lock();
+		try {
+			return _gtk_editable_get_editable(editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param editable cast=(GtkEditable *) */
+	public static final native int _gtk_editable_get_position(long /*int*/ editable);
+	public static final int gtk_editable_get_position(long /*int*/ editable) {
+		lock.lock();
+		try {
+			return _gtk_editable_get_position(editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param editable cast=(GtkEditable *)
+	 * @param start cast=(gint *)
+	 * @param end cast=(gint *)
+	 */
+	public static final native boolean _gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end);
+	public static final boolean gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end) {
+		lock.lock();
+		try {
+			return _gtk_editable_get_selection_bounds(editable, start, end);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param editable cast=(GtkEditable *)
+	 * @param new_text cast=(gchar *)
+	 * @param new_text_length cast=(gint)
+	 * @param position cast=(gint *)
+	 */
+	public static final native void _gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position);
+	public static final void gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position) {
+		lock.lock();
+		try {
+			_gtk_editable_insert_text(editable, new_text, new_text_length, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param editable cast=(GtkEditable *) */
+	public static final native void _gtk_editable_paste_clipboard(long /*int*/ editable);
+	public static final void gtk_editable_paste_clipboard(long /*int*/ editable) {
+		lock.lock();
+		try {
+			_gtk_editable_paste_clipboard(editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param editable cast=(GtkEditable *)
+	 * @param start cast=(gint)
+	 * @param end cast=(gint)
+	 */
+	public static final native void _gtk_editable_select_region(long /*int*/ editable, int start, int end);
+	public static final void gtk_editable_select_region(long /*int*/ editable, int start, int end) {
+		lock.lock();
+		try {
+			_gtk_editable_select_region(editable, start, end);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEditable *)
+	 * @param editable cast=(gboolean)
+	 */
+	public static final native void _gtk_editable_set_editable(long /*int*/ entry, boolean editable);
+	public static final void gtk_editable_set_editable(long /*int*/ entry, boolean editable) {
+		lock.lock();
+		try {
+			_gtk_editable_set_editable(entry, editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param editable cast=(GtkEditable *)
+	 * @param position cast=(gint)
+	 */
+	public static final native void _gtk_editable_set_position(long /*int*/ editable, int position);
+	public static final void gtk_editable_set_position(long /*int*/ editable, int position) {
+		lock.lock();
+		try {
+			_gtk_editable_set_position(editable, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_entry_get_inner_border (long /*int*/ entry);
+	/** [GTK2/GTK3; 3.4 deprecated] */
+	public static final long /*int*/ gtk_entry_get_inner_border (long /*int*/ entry) {
+		lock.lock();
+		try {
+			return _gtk_entry_get_inner_border(entry);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param self cast=(GtkEntry *)
+	 * @param n_chars cast=(gint)
+	 */
+	public static final native void  _gtk_entry_set_width_chars (long /*int*/ self, int n_chars);
+	public static final void  gtk_entry_set_width_chars (long /*int*/ self, int n_chars) {
+		lock.lock();
+		try {
+			_gtk_entry_set_width_chars(self, n_chars);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param entry cast=(GtkEntry *) */
+	public static final native char _gtk_entry_get_invisible_char(long /*int*/ entry);
+	public static final char gtk_entry_get_invisible_char(long /*int*/ entry) {
+		lock.lock();
+		try {
+			return _gtk_entry_get_invisible_char(entry);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param entry cast=(GtkEntry *) */
+	public static final native long /*int*/ _gtk_entry_get_layout (long /*int*/ entry);
+	public static final long /*int*/ gtk_entry_get_layout (long /*int*/ entry) {
+		lock.lock();
+		try {
+			return _gtk_entry_get_layout(entry);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param x cast=(gint *)
+	 * @param y cast=(gint *)
+	 */
+	public static final native void _gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y);
+	public static final void gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y) {
+		lock.lock();
+		try {
+			_gtk_entry_get_layout_offsets(entry, x, y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param index cast=(gint)
+	 */
+	public static final native int _gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index);
+	public static final int gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index) {
+		lock.lock();
+		try {
+			return _gtk_entry_text_index_to_layout_index(entry, index);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param entry cast=(GtkEntry *)
+	 */
+	public static final native int _gtk_entry_get_icon_area(long /*int*/ entry, int icon_pos, GdkRectangle icon_area);
+	public static final int gtk_entry_get_icon_area(long /*int*/ entry, int icon_pos, GdkRectangle icon_area) {
+		lock.lock();
+		try {
+			return _gtk_entry_get_icon_area(entry, icon_pos, icon_area);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param entry cast=(GtkEntry *) */
+	public static final native int _gtk_entry_get_max_length(long /*int*/ entry);
+	public static final int gtk_entry_get_max_length(long /*int*/ entry) {
+		lock.lock();
+		try {
+			return _gtk_entry_get_max_length(entry);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param entry cast=(GtkEntry *) */
+	public static final native long /*int*/ _gtk_entry_get_text(long /*int*/ entry);
+	public static final long /*int*/ gtk_entry_get_text(long /*int*/ entry) {
+		lock.lock();
+		try {
+			return _gtk_entry_get_text(entry);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param entry cast=(GtkEntry *) */
+	public static final native boolean _gtk_entry_get_visibility(long /*int*/ entry);
+	public static final boolean gtk_entry_get_visibility(long /*int*/ entry) {
+		lock.lock();
+		try {
+			return _gtk_entry_get_visibility(entry);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_entry_new();
+	public static final long /*int*/ gtk_entry_new() {
+		lock.lock();
+		try {
+			return _gtk_entry_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param xalign cast=(gfloat)
+	 */
+	public static final native void _gtk_entry_set_alignment(long /*int*/ entry, float xalign);
+	public static final void gtk_entry_set_alignment(long /*int*/ entry, float xalign) {
+		lock.lock();
+		try {
+			_gtk_entry_set_alignment(entry, xalign);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param setting cast=(gboolean)
+	 */
+	public static final native void _gtk_entry_set_has_frame(long /*int*/ entry, boolean setting);
+	public static final void gtk_entry_set_has_frame(long /*int*/ entry, boolean setting) {
+		lock.lock();
+		try {
+			_gtk_entry_set_has_frame(entry, setting);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param iconPos cast=(gint)
+	 * @param stock cast=(const gchar *)
+	 */
+	public static final native void _gtk_entry_set_icon_from_icon_name(long /*int*/ entry, int iconPos, byte[] stock);
+	public static final void gtk_entry_set_icon_from_icon_name(long /*int*/ entry, int iconPos, byte[] iconName) {
+		lock.lock();
+		try {
+			_gtk_entry_set_icon_from_icon_name(entry, iconPos, iconName);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param icon_pos cast=(GtkEntryIconPosition)
+	 * @param sensitive cast=(gboolean)
+	 */
+	public static final native void _gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive);
+	public static final void gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive) {
+		lock.lock();
+		try {
+			_gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param ch cast=(gint)
+	 */
+	public static final native void _gtk_entry_set_invisible_char(long /*int*/ entry, char ch);
+	public static final void gtk_entry_set_invisible_char(long /*int*/ entry, char ch) {
+		lock.lock();
+		try {
+			_gtk_entry_set_invisible_char(entry, ch);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param max cast=(gint)
+	 */
+	public static final native void _gtk_entry_set_max_length(long /*int*/ entry, int max);
+	public static final void gtk_entry_set_max_length(long /*int*/ entry, int max) {
+		lock.lock();
+		try {
+			_gtk_entry_set_max_length(entry, max);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param text cast=(const gchar *)
+	 */
+	public static final native void _gtk_entry_set_text(long /*int*/ entry, byte[] text);
+	public static final void gtk_entry_set_text(long /*int*/ entry, byte[] text) {
+		lock.lock();
+		try {
+			_gtk_entry_set_text(entry, text);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param entry cast=(GtkEntry *)
+	 * @param text cast=(const gchar *)
+	 */
+	public static final native void _gtk_entry_set_placeholder_text(long /*int*/ entry, byte[] text);
+	public static final void gtk_entry_set_placeholder_text(long /*int*/ entry, byte[] text) {
+		lock.lock();
+		try {
+			_gtk_entry_set_placeholder_text(entry, text);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param entry cast=(GtkEntry *)
+	 * @param visible cast=(gboolean)
+	 */
+	public static final native void _gtk_entry_set_visibility(long /*int*/ entry, boolean visible);
+	public static final void gtk_entry_set_visibility(long /*int*/ entry, boolean visible) {
+		lock.lock();
+		try {
+			_gtk_entry_set_visibility(entry, visible);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param expander cast=(GtkExpander *) */
+	public static final native boolean _gtk_expander_get_expanded(long /*int*/ expander);
+	public static final boolean gtk_expander_get_expanded(long /*int*/ expander) {
+		lock.lock();
+		try {
+			return _gtk_expander_get_expanded(expander);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param label cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_expander_new(byte[] label);
+	public static final long /*int*/ gtk_expander_new(byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_expander_new(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param expander cast=(GtkExpander *) */
+	public static final native void _gtk_expander_set_expanded(long /*int*/ expander, boolean expanded);
+	public static final void gtk_expander_set_expanded(long /*int*/ expander, boolean expanded) {
+		lock.lock();
+		try {
+			_gtk_expander_set_expanded(expander, expanded);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param expander cast=(GtkExpander *)
+	 * @param label_widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget);
+	public static final void  gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget) {
+		lock.lock();
+		try {
+			_gtk_expander_set_label_widget(expander, label_widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param filter cast=(GtkFileFilter *)
+	 */
+	public static final native void _gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter);
+	public static final void gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_add_filter(chooser, filter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param title cast=(const gchar *),flags=no_out
+	 * @param parent cast=(GtkWindow *)
+	 * @param first_button_text cast=(const gchar *),flags=no_out
+	 * @param terminator cast=(const gchar *),flags=sentinel
+	 */
+	public static final native long /*int*/ _gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long /*int*/ terminator);
+	public static final long /*int*/ gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long /*int*/ terminator) {
+		lock.lock();
+		try {
+			return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param title cast=(const gchar *),flags=no_out
+	 * @param parent cast=(GtkWindow *)
+	 * @param first_button_text cast=(const gchar *),flags=no_out
+	 * @param terminator cast=(const gchar *),flags=sentinel
+	 */
+	public static final native long /*int*/ _gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator);
+	public static final long /*int*/ gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator) {
+		lock.lock();
+		try {
+			return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param chooser cast=(GtkFileChooser *) */
+	public static final native long /*int*/ _gtk_file_chooser_get_filename(long /*int*/ chooser);
+	public static final long /*int*/ gtk_file_chooser_get_filename(long /*int*/ chooser) {
+		lock.lock();
+		try {
+			return _gtk_file_chooser_get_filename(chooser);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**  @param chooser cast=(GtkFileChooser *) */
+	public static final native long /*int*/ _gtk_file_chooser_get_filenames(long /*int*/ chooser);
+	public static final long /*int*/ gtk_file_chooser_get_filenames(long /*int*/ chooser) {
+		lock.lock();
+		try {
+			return _gtk_file_chooser_get_filenames(chooser);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param chooser cast=(GtkFileChooser *) */
+	public static final native long /*int*/ _gtk_file_chooser_get_uri(long /*int*/ chooser);
+	public static final long /*int*/ gtk_file_chooser_get_uri(long /*int*/ chooser) {
+		lock.lock();
+		try {
+			return _gtk_file_chooser_get_uri(chooser);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param chooser cast=(GtkFileChooser *) */
+	public static final native long /*int*/ _gtk_file_chooser_get_uris(long /*int*/ chooser);
+	public static final long /*int*/ gtk_file_chooser_get_uris(long /*int*/ chooser) {
+		lock.lock();
+		try {
+			return _gtk_file_chooser_get_uris(chooser);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param chooser cast=(GtkFileChooser *) */
+	public static final native long /*int*/ _gtk_file_chooser_get_filter(long /*int*/ chooser);
+	public static final long /*int*/ gtk_file_chooser_get_filter(long /*int*/ chooser) {
+		lock.lock();
+		try {
+			return _gtk_file_chooser_get_filter(chooser);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param filename cast=(const gchar *)
+	 */
+	public static final native void _gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename);
+	public static final void gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_current_folder(chooser, filename);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param uri cast=(const gchar *)
+	 */
+	public static final native void _gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri);
+	public static final void gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_current_folder_uri(chooser, uri);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param name cast=(const gchar *)
+	 */
+	public static final native void _gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name);
+	public static final void gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_current_name(chooser, name);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param local_only cast=(gboolean)
+	 */
+	public static final native void _gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only);
+	public static final void gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_local_only(chooser, local_only);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param do_overwrite_confirmation cast=(gboolean)
+	 */
+	public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation);
+	public static final void gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param extra_widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget);
+	public static final void gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param name cast=(const gchar *)
+	 */
+	public static final native void _gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name);
+	public static final void gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_filename(chooser, name);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param filter cast=(GtkFileFilter *)
+	 */
+	public static final native void _gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter);
+	public static final void gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_filter(chooser, filter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param uri cast=(const char *)
+	 */
+	public static final native void _gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri);
+	public static final void gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_uri(chooser, uri);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param chooser cast=(GtkFileChooser *)
+	 * @param select_multiple cast=(gboolean)
+	 */
+	public static final native void _gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple);
+	public static final void gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple) {
+		lock.lock();
+		try {
+			_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_event_controller_set_propagation_phase(long /*int*/ controller, int phase);
+	public static final void gtk_event_controller_set_propagation_phase(long /*int*/ controller, int phase) {
+	        lock.lock();
+	        try {
+	                _gtk_event_controller_set_propagation_phase(controller, phase);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_event_controller_handle_event(long /*int*/ gesture, long /*int*/ event);
+	public static final void gtk_event_controller_handle_event(long /*int*/ gesture, long /*int*/ event) {
+	        lock.lock();
+	        try {
+	                _gtk_event_controller_handle_event(gesture, event);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @param filter cast=(GtkFileFilter *)
+	 * @param pattern cast=(const gchar *)
+	 */
+	public static final native void _gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern);
+	public static final void gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern) {
+		lock.lock();
+		try {
+			_gtk_file_filter_add_pattern(filter, pattern);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_file_filter_new();
+	public static final long /*int*/ gtk_file_filter_new() {
+		lock.lock();
+		try {
+			return _gtk_file_filter_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param filter cast=(GtkFileFilter *) */
+	public static final native long /*int*/ _gtk_file_filter_get_name(long /*int*/ filter);
+	public static final long /*int*/ gtk_file_filter_get_name(long /*int*/ filter) {
+		lock.lock();
+		try {
+			return _gtk_file_filter_get_name(filter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param filter cast=(GtkFileFilter *)
+	 * @param name cast=(const gchar *)
+	 */
+	public static final native void _gtk_file_filter_set_name(long /*int*/ filter, byte[] name);
+	public static final void gtk_file_filter_set_name(long /*int*/ filter, byte[] name) {
+		lock.lock();
+		try {
+			_gtk_file_filter_set_name(filter, name);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param fixed cast=(GtkFixed *)
+	 * @param widget cast=(GtkWidget *)
+	 * @param x cast=(gint)
+	 * @param y cast=(gint)
+	 */
+	public static final native void _gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y);
+	public static final void gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y) {
+		lock.lock();
+		try {
+			_gtk_fixed_move(fixed, widget, x, y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_fixed_new();
+	public static final long /*int*/ gtk_fixed_new() {
+		lock.lock();
+		try {
+			return _gtk_fixed_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native boolean _gtk_gesture_drag_get_start_point(long /*int*/ gesture, double[] x, double [] y);
+	public static final boolean gtk_gesture_drag_get_start_point(long /*int*/ gesture, double[] x, double [] y) {
+		lock.lock();
+		try {
+			return _gtk_gesture_drag_get_start_point(gesture, x, y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native boolean _gtk_gesture_is_recognized(long /*int*/ gesture);
+	public static final boolean gtk_gesture_is_recognized(long /*int*/ gesture) {
+		lock.lock();
+		try {
+			return _gtk_gesture_is_recognized(gesture);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native long /*int*/ _gtk_gesture_drag_new(long /*int*/ widget);
+	public static final long /*int*/ gtk_gesture_drag_new(long /*int*/ widget) {
+	        lock.lock();
+	        try {
+	                return _gtk_gesture_drag_new(widget);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native long /*int*/ _gtk_gesture_get_last_event(long /*int*/ gesture, long /*int*/ sequence);
+	public static final long /*int*/ gtk_gesture_get_last_event(long /*int*/ gesture, long /*int*/ sequence) {
+			lock.lock();
+			try {
+				return _gtk_gesture_get_last_event(gesture,sequence);
+			} finally {
+				lock.unlock();
+			}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native long /*int*/ _gtk_gesture_get_last_updated_sequence(long /*int*/ gesture);
+	public static final long /*int*/ gtk_gesture_get_last_updated_sequence(long /*int*/ gesture) {
+			lock.lock();
+			try {
+				return _gtk_gesture_get_last_updated_sequence(gesture);
+			} finally {
+				lock.unlock();
+			}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native boolean _gtk_gesture_get_point(long /*int*/ gesture, long /*int*/ sequence, double[] x, double [] y);
+	public static final boolean gtk_gesture_get_point(long /*int*/ gesture, long /*int*/ sequence, double[] x, double [] y) {
+			lock.lock();
+			try {
+				return _gtk_gesture_get_point(gesture, sequence, x, y);
+			} finally {
+				lock.unlock();
+			}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native long /*int*/ _gtk_gesture_get_sequences(long /*int*/ gesture);
+	public static final long /*int*/ gtk_gesture_get_sequences(long /*int*/ gesture) {
+			lock.lock();
+			try {
+				return _gtk_gesture_get_sequences(gesture);
+			} finally {
+				lock.unlock();
+			}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_gesture_group (long /*int*/ group_gesture, long /*int*/ gesture);
+	public static final void gtk_gesture_group (long /*int*/ group_gesture, long /*int*/ gesture) {
+	        lock.lock();
+	        try {
+	                 _gtk_gesture_group(group_gesture, gesture);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_gesture_pan_set_orientation(long /*int*/ orientation);
+	public static final void gtk_gesture_pan_set_orientation(long /*int*/ orientation) {
+		lock.lock();
+		try {
+			 _gtk_gesture_pan_set_orientation(orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native long /*int*/ _gtk_gesture_pan_get_orientation(long /*int*/ gesture);
+	public static final long /*int*/ gtk_gesture_pan_get_orientation(long /*int*/ gesture) {
+		lock.lock();
+		try {
+			return _gtk_gesture_pan_get_orientation(gesture);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_gesture_pan_new (long /*int*/ widget, long /*int*/ orientation);
+	public static final void gtk_gesture_pan_new (long /*int*/ widget, long /*int*/ orientation) {
+		lock.lock();
+		try {
+			_gtk_gesture_pan_new(widget, orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_gesture_single_set_button(long /*int*/ gesture, int button);
+	public static final void gtk_gesture_single_set_button(long /*int*/ gesture, int button) {
+	        lock.lock();
+	        try {
+	                 _gtk_gesture_single_set_button(gesture, button);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native boolean _gtk_gesture_swipe_get_velocity(long /*int*/ gesture, double [] velocity_x, double[] velocity_y);
+	public static final boolean gtk_gesture_swipe_get_velocity(long /*int*/ gesture, double [] velocity_x, double[] velocity_y) {
+		lock.lock();
+		try {
+			return _gtk_gesture_swipe_get_velocity(gesture, velocity_x, velocity_y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native long /*int*/ _gtk_gesture_swipe_new (long /*int*/ widget);
+	public static final long /*int*/ gtk_gesture_swipe_new (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_gesture_swipe_new(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_gesture_drag_get_offset(long /*int*/ gesture, double[] x, double[] y);
+	public static final void gtk_gesture_drag_get_offset(long /*int*/ gesture, double[] x, double[] y) {
+	        lock.lock();
+	        try {
+	                _gtk_gesture_drag_get_offset(gesture, x, y);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+
+	public static final native double _gtk_gesture_rotate_get_angle_delta (long /*int*/ gesture);
+	public static final double gtk_gesture_rotate_get_angle_delta (long /*int*/ gesture) {
+		lock.lock();
+		try {
+				return _gtk_gesture_rotate_get_angle_delta(gesture);
+		} finally {
+				lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+
+	public static final native long /*int*/ _gtk_gesture_rotate_new(long /*int*/ widget);
+	public static final long /*int*/ gtk_gesture_rotate_new(long /*int*/ widget) {
+	        lock.lock();
+	        try {
+	                return _gtk_gesture_rotate_new(widget);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native long /*int*/ _gtk_gesture_zoom_new(long /*int*/ widget);
+	public static final long /*int*/ gtk_gesture_zoom_new(long /*int*/ widget) {
+	        lock.lock();
+	        try {
+	                return _gtk_gesture_zoom_new(widget);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native double _gtk_gesture_zoom_get_scale_delta (long /*int*/ gesture);
+	public static final double gtk_gesture_zoom_get_scale_delta (long /*int*/ gesture) {
+	        lock.lock();
+	        try {
+	                return _gtk_gesture_zoom_get_scale_delta(gesture);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param has_window cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_has_window(long /*int*/ widget, boolean has_window);
+	public static final void gtk_widget_set_has_window(long /*int*/ widget, boolean has_window) {
+		lock.lock();
+		try {
+			_gtk_widget_set_has_window(widget, has_window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	//since Gtk 3.16. For pre-gtk3.16, use gtk_misc_set_alignment(..)
+	/**
+	 * @method flags=dynamic
+	 * @param label cast=(GtkLabel *)
+	 * @param xalign cast=(gfloat)
+	 *
+	 */
+	public static final native void _gtk_label_set_xalign(long /*int*/ label, float xalign);
+	public static final void gtk_label_set_xalign(long /*int*/ label, float xalign) {
+		lock.lock();
+		try {
+			_gtk_label_set_xalign(label, xalign);
+		} finally {
+			lock.unlock();
+		}
+	}
+	//since Gtk 3.16. For pre-gtk3.16, use gtk_misc_set_alignment(..)
+	/**
+	* @method flags=dynamic
+	* @param label cast=(GtkLabel *)
+	* @param yalign cast=(gfloat)
+	*
+	*/
+	public static final native void _gtk_label_set_yalign(long /*int*/ label, float yalign);
+	public static final void gtk_label_set_yalign(long /*int*/ label, float yalign) {
+		lock.lock();
+		try {
+			_gtk_label_set_yalign(label, yalign);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 *
+	 */ //Omited enum: @param gtk_align cast=(GtkAlign) as is causes build errors on gtk2 as GtkAlign doesn't exist there.
+	public static final native void _gtk_widget_set_halign(long /*int*/ widget, int gtk_align);
+	public static final void gtk_widget_set_halign(long /*int*/ widget, int gtk_align) {
+		lock.lock();
+		try {
+			_gtk_widget_set_halign(widget, gtk_align);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */ //Omited enum: @param gtk_align cast=(GtkAlign) as is causes build errors on gtk2 as GtkAlign doesn't exist there.
+	public static final native void _gtk_widget_set_valign(long /*int*/ widget, int gtk_align);
+	public static final void gtk_widget_set_valign(long /*int*/ widget, int gtk_align ) {
+		lock.lock();
+		try {
+			_gtk_widget_set_valign(widget, gtk_align);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_font_selection_dialog_get_font_name(long /*int*/ fsd);
+	/** [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_font_selection_dialog_get_font_name(long /*int*/ fsd) {
+		lock.lock();
+		try {
+			return _gtk_font_selection_dialog_get_font_name(fsd);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param title cast=(const gchar *)
+	 * @param parent cast=(GtkWindow *)
+	 */
+	public static final native long /*int*/ _gtk_font_chooser_dialog_new(byte[] title, long /*int*/ parent);
+	public static final long /*int*/ gtk_font_chooser_dialog_new(byte[] title, long /*int*/ parent) {
+		lock.lock();
+		try {
+			return _gtk_font_chooser_dialog_new(title, parent);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_font_chooser_get_font(long /*int*/ fontchooser);
+	public static final long /*int*/ gtk_font_chooser_get_font(long /*int*/ fontchooser) {
+		lock.lock();
+		try {
+			return _gtk_font_chooser_get_font(fontchooser);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param fontname cast=(const gchar *)
+	 */
+	public static final native void _gtk_font_chooser_set_font(long /*int*/ fsd, byte[] fontname);
+	public static final void gtk_font_chooser_set_font(long /*int*/ fsd, byte[] fontname) {
+		lock.lock();
+		try {
+			_gtk_font_chooser_set_font(fsd, fontname);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param title cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_font_selection_dialog_new(byte[] title);
+	/** [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_font_selection_dialog_new(byte[] title) {
+		lock.lock();
+		try {
+			return _gtk_font_selection_dialog_new(title);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param fontname cast=(const gchar *)
+	 */
+	public static final native boolean _gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname);
+	/** [GTK2/GTK3; 2.x/3.2 deprecated] */
+	public static final boolean gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname) {
+		lock.lock();
+		try {
+			return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param label cast=(const gchar *) */
+	public static final native long /*int*/ _gtk_frame_new(byte[] label);
+	public static final long /*int*/ gtk_frame_new(byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_frame_new(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param frame cast=(GtkFrame *) */
+	public static final native long /*int*/ _gtk_frame_get_label_widget(long /*int*/ frame);
+	public static final long /*int*/ gtk_frame_get_label_widget(long /*int*/ frame) {
+		lock.lock();
+		try {
+			return _gtk_frame_get_label_widget(frame);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param frame cast=(GtkFrame *)
+	 * @param label_widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget);
+	public static final void gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget) {
+		lock.lock();
+		try {
+			_gtk_frame_set_label_widget(frame, label_widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param frame cast=(GtkFrame *)
+	 * @param type cast=(GtkShadowType)
+	 */
+	public static final native void _gtk_frame_set_shadow_type(long /*int*/ frame, int type);
+	public static final void gtk_frame_set_shadow_type(long /*int*/ frame, int type) {
+		lock.lock();
+		try {
+			_gtk_frame_set_shadow_type(frame, type);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_get_current_event();
+	public static final long /*int*/ gtk_get_current_event() {
+		lock.lock();
+		try {
+			return _gtk_get_current_event();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param state cast=(GdkModifierType*) */
+	public static final native boolean _gtk_get_current_event_state (int[] state);
+	public static final boolean gtk_get_current_event_state (int[] state) {
+		lock.lock();
+		try {
+			return _gtk_get_current_event_state(state);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_get_default_language();
+	public static final long /*int*/ gtk_get_default_language() {
+		lock.lock();
+		try {
+			return _gtk_get_default_language();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param event cast=(GdkEvent *) */
+	public static final native long /*int*/ _gtk_get_event_widget(long /*int*/ event);
+	public static final long /*int*/ gtk_get_event_widget(long /*int*/ event) {
+		lock.lock();
+		try {
+			return _gtk_get_event_widget(event);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_grab_add(long /*int*/ widget);
+	public static final void gtk_grab_add(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_grab_add(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_grab_get_current();
+	public static final long /*int*/ gtk_grab_get_current() {
+		lock.lock();
+		try {
+			return _gtk_grab_get_current();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_grab_remove(long /*int*/ widget);
+	public static final void gtk_grab_remove(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_grab_remove(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param homogeneous cast=(gboolean)
+	 * @param spacing cast=(gint)
+	 */
+	public static final native long /*int*/ _gtk_hbox_new(boolean homogeneous, int spacing);
+	/** [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_hbox_new(boolean homogeneous, int spacing) {
+		lock.lock();
+		try {
+			return _gtk_hbox_new(homogeneous, spacing);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param h cast=(gdouble)
+	 * @param s cast=(gdouble)
+	 * @param v cast=(gdouble)
+	 * @param r cast=(gdouble *)
+	 * @param g cast=(gdouble *)
+	 * @param b cast=(gdouble *)
+	 */
+	public static final native void _gtk_hsv_to_rgb(double h, double s, double v, double[] r, double[] g, double[] b);
+	public static final void gtk_hsv_to_rgb(double h, double s, double v, double[] r, double[] g, double[] b) {
+		lock.lock();
+		try {
+			_gtk_hsv_to_rgb(h, s, v, r, g, b);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param r cast=(gdouble)
+	 * @param g cast=(gdouble)
+	 * @param b cast=(gdouble)
+	 * @param h cast=(gdouble *)
+	 * @param s cast=(gdouble *)
+	 * @param v cast=(gdouble *)
+	 */
+	public static final native void _gtk_rgb_to_hsv(double r, double g, double b, double[] h, double[] s, double[] v);
+	public static final void gtk_rgb_to_hsv(double r, double g, double b, double[] h, double[] s, double[] v) {
+		lock.lock();
+		try {
+			_gtk_rgb_to_hsv(r, g, b, h, s, v);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param orientation cast=(GtkOrientation)
+	 */
+	public static final native long /*int*/ _gtk_box_new(int orientation, int spacing);
+	public static final long /*int*/ gtk_box_new(int orientation, int spacing) {
+		lock.lock();
+		try {
+			return _gtk_box_new(orientation, spacing);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param box cast=(GtkBox *)
+	 * @param widget cast=(GtkWidget *)
+	 * @param expand cast=(gboolean)
+	 * @param fill cast=(gboolean)
+	 * @param padding cast=(guint)
+	 */
+	public static final native void /*int*/ _gtk_box_pack_end(long /*int*/ box, long /*int*/ widget,
+			boolean expand, boolean fill, int padding);
+	public static final void /*int*/ gtk_box_pack_end(long /*int*/ box, long /*int*/ widget,
+			boolean expand, boolean fill, int padding) {
+		lock.lock();
+		try {
+			_gtk_box_pack_end(box, widget, expand, fill, padding);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param box cast=(GtkBox *)
+	 * @param child cast=(GtkWidget *)
+	 * @param position cast=(gint)
+	 */
+	public static final native void /*int*/ _gtk_box_reorder_child(long /*int*/ box, long /*int*/ child, int position);
+	public static final void /*int*/ gtk_box_reorder_child(long /*int*/ box, long /*int*/ child, int position) {
+		lock.lock();
+		try {
+			_gtk_box_reorder_child(box, child, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param box cast=(GtkBox *)
+	 * @param homogeneous cast=(gboolean)
+	 */
+	public static final native void _gtk_box_set_homogeneous(long /*int*/ box, boolean homogeneous);
+	public static final void gtk_box_set_homogeneous(long /*int*/ box, boolean homogeneous) {
+		lock.lock();
+		try {
+			_gtk_box_set_homogeneous(box, homogeneous);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_event_box_new();
+	public static final long /*int*/ gtk_event_box_new() {
+		lock.lock();
+		try {
+			return _gtk_event_box_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 *  @method flags=dynamic
+	 *  @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native long /*int*/ _gtk_hscale_new(long /*int*/ adjustment);
+	/** [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_hscale_new(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_hscale_new(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 *  @method flags=dynamic
+	 *  @param orientation cast=(GtkOrientation)
+	 *  @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native long /*int*/ _gtk_scale_new(int orientation, long /*int*/ adjustment);
+	public static final long /*int*/ gtk_scale_new(int orientation, long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_scale_new(orientation, adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	* @method flags=dynamic
+	* @param adjustment cast=(GtkAdjustment *)
+	*/
+	public static final native long /*int*/ _gtk_hscrollbar_new(long /*int*/ adjustment);
+	/** [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_hscrollbar_new(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_hscrollbar_new(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param orientation cast=(GtkOrientation)
+	 * @param adjustment cast=(GtkAdjustment *)
+	 * */
+	public static final native long /*int*/ _gtk_scrollbar_new(int orientation, long /*int*/ adjustment);
+	public static final long /*int*/ gtk_scrollbar_new(int orientation, long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_scrollbar_new(orientation, adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_hseparator_new();
+	public static final long /*int*/ gtk_hseparator_new() {
+		lock.lock();
+		try {
+			return _gtk_hseparator_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param orientation cast=(GtkOrientation)
+	 */
+	public static final native long /*int*/ _gtk_separator_new(int orientation);
+	public static final long /*int*/ gtk_separator_new(int orientation) {
+		lock.lock();
+		try {
+			return _gtk_separator_new(orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	// Get function pointer to gtk_status_icon_position_menu
+	// See os_custom.h
+	public static final native long /*int*/ _gtk_status_icon_position_menu_func();
+	public static final long /*int*/ gtk_status_icon_position_menu_func() {
+		lock.lock();
+		try {
+			return _gtk_status_icon_position_menu_func();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_icon_info_free(long /*int*/ icon_info);
+	/** [GTK2/GTK3; 3.8 deprecated] */
+	public static final void gtk_icon_info_free(long /*int*/ icon_info) {
+		lock.lock();
+		try {
+			_gtk_icon_info_free(icon_info);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @return cast=(GtkIconTheme *) */
+	public static final native long /*int*/ _gtk_icon_theme_get_default();
+	public static final long /*int*/ gtk_icon_theme_get_default() {
+		lock.lock();
+		try {
+			return _gtk_icon_theme_get_default ();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param icon_theme cast=(GtkIconTheme *)
+	 * @param icon cast=(GIcon *)
+	 * @param size cast=(gint)
+	 * @param flags cast=(GtkIconLookupFlags)
+	 */
+	public static final native long /*int*/ _gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags);
+	public static final long /*int*/ gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags) {
+		lock.lock();
+		try {
+			return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param icon_theme cast=(GtkIconTheme *)
+	 * @param icon_name cast=(const gchar *)
+	 * @param size cast=(gint)
+	 * @param flags cast=(GtkIconLookupFlags)
+	 * @param error cast=(GError **)
+	 */
+	public static final native long /*int*/ _gtk_icon_theme_load_icon(long /*int*/ icon_theme, byte[] icon_name, int size, int flags, long /*int*/ error);
+	public static final long /*int*/ gtk_icon_theme_load_icon(long /*int*/ icon_theme, byte[] icon_name, int size, int flags, long /*int*/ error) {
+		lock.lock();
+		try {
+			return _gtk_icon_theme_load_icon (icon_theme, icon_name, size, flags, error);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param icon_info cast=(GtkIconInfo *)
+	 * @param error cast=(GError **)
+	 */
+	public static final native long /*int*/ _gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]);
+	public static final long /*int*/ gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]) {
+		lock.lock();
+		try {
+			return _gtk_icon_info_load_icon(icon_info, error);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param context cast=(GtkIMContext *)
+	 * @param event cast=(GdkEventKey *)
+	 */
+	public static final native boolean _gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event);
+	public static final boolean gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event) {
+		lock.lock();
+		try {
+			return _gtk_im_context_filter_keypress(context, event);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param context cast=(GtkIMContext *) */
+	public static final native void _gtk_im_context_focus_in(long /*int*/ context);
+	public static final void gtk_im_context_focus_in(long /*int*/ context) {
+		lock.lock();
+		try {
+			_gtk_im_context_focus_in(context);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param context cast=(GtkIMContext *) */
+	public static final native void _gtk_im_context_focus_out(long /*int*/ context);
+	public static final void gtk_im_context_focus_out(long /*int*/ context) {
+		lock.lock();
+		try {
+			_gtk_im_context_focus_out(context);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param context cast=(GtkIMContext *)
+	 * @param str cast=(gchar **)
+	 * @param attrs cast=(PangoAttrList **)
+	 * @param cursor_pos cast=(gint *)
+	 */
+	public static final native void _gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos);
+	public static final void gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos) {
+		lock.lock();
+		try {
+			_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_im_context_get_type();
+	public static final long /*int*/ gtk_im_context_get_type() {
+		lock.lock();
+		try {
+			return _gtk_im_context_get_type();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param context cast=(GtkIMContext *) */
+	public static final native void _gtk_im_context_reset(long /*int*/ context);
+	public static final void gtk_im_context_reset(long /*int*/ context) {
+		lock.lock();
+		try {
+			_gtk_im_context_reset(context);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param context cast=(GtkIMContext *)
+	 * @param window cast=(GdkWindow *)
+	 */
+	public static final native void _gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window);
+	public static final void gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window) {
+		lock.lock();
+		try {
+			_gtk_im_context_set_client_window(context, window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param context cast=(GtkIMContext *)
+	 * @param area cast=(GdkRectangle *),flags=no_out
+	 */
+	public static final native void _gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area);
+	public static final void gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area) {
+		lock.lock();
+		try {
+			_gtk_im_context_set_cursor_location(context, area);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param context cast=(GtkIMMulticontext *)
+	 * @param menushell cast=(GtkMenuShell *)
+	 */
+	public static final native void _gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell);
+	public static final void gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell) {
+		lock.lock();
+		try {
+			_gtk_im_multicontext_append_menuitems(context, menushell);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_im_multicontext_new();
+	public static final long /*int*/ gtk_im_multicontext_new() {
+		lock.lock();
+		try {
+			return _gtk_im_multicontext_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param menu_item cast=(GtkImageMenuItem *)
+	 * @param image cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image);
+	/** [GTK2/GTK3; 3.10 deprecated] */
+	public static final void gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image) {
+		lock.lock();
+		try {
+			_gtk_image_menu_item_set_image(menu_item, image);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_image_new();
+	public static final long /*int*/ gtk_image_new() {
+		lock.lock();
+		try {
+			return _gtk_image_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param image cast=(GtkImage *)
+	 * @param pixel_size cast=(gint)
+	 */
+	public static final native void /*int*/ _gtk_image_set_pixel_size(long /*int*/ image, int pixel_size);
+	public static final void /*int*/ gtk_image_set_pixel_size(long /*int*/ image, int pixel_size) {
+		lock.lock();
+		try {
+			_gtk_image_set_pixel_size(image, pixel_size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param pixbuf cast=(GdkPixbuf *) */
+	public static final native long /*int*/ _gtk_image_new_from_pixbuf(long /*int*/ pixbuf);
+	public static final long /*int*/ gtk_image_new_from_pixbuf(long /*int*/ pixbuf) {
+		lock.lock();
+		try {
+			return _gtk_image_new_from_pixbuf(pixbuf);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param image cast=(GtkImage *)
+	 * @param pixbuf cast=(GdkPixbuf *)
+	 */
+	public static final native void _gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf);
+	public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf) {
+		lock.lock();
+		try {
+			_gtk_image_set_from_pixbuf(image, pixbuf);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param image cast=(GtkImage *)
+	 * @param gicon cast=(GIcon *)
+	 * @param size cast=(GtkIconSize)
+	 */
+	public static final native void _gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size);
+	public static final void gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size) {
+		lock.lock();
+		try {
+			_gtk_image_set_from_gicon(image, gicon, size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param icon_name cast=(const gchar *)
+	 * @param size cast=(GtkIconSize)
+	 */
+	public static final native long /*int*/ _gtk_image_new_from_icon_name (byte[] icon_name, int size);
+	public static final long /*int*/ gtk_image_new_from_icon_name (byte[] icon_name, int size) {
+		lock.lock();
+		try {
+			return _gtk_image_new_from_icon_name (icon_name, size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param image cast=(GtkImage *)
+	 * @param icon_name cast=(const gchar *)
+	 * @param size cast=(GtkIconSize)
+	 */
+	public static final native void _gtk_image_set_from_icon_name (long /*int*/ image, byte[] icon_name, int size);
+	public static final void gtk_image_set_from_icon_name (long /*int*/ image, byte[] icon_name, int size) {
+		lock.lock();
+		try {
+			_gtk_image_set_from_icon_name (image, icon_name, size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param argc cast=(int *)
+	 * @param argv cast=(char ***)
+	 */
+	public static final native boolean _gtk_init_check(long /*int*/[] argc, long /*int*/[] argv);
+	public static final boolean gtk_init_check(long /*int*/[] argc, long /*int*/[] argv) {
+		lock.lock();
+		try {
+			return _gtk_init_check(argc, argv);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param label cast=(GtkLabel *) */
+	public static final native long /*int*/ _gtk_label_get_layout(long /*int*/ label);
+	public static final long /*int*/ gtk_label_get_layout(long /*int*/ label) {
+		lock.lock();
+		try {
+			return _gtk_label_get_layout(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param label cast=(GtkLabel *) */
+	public static final native int _gtk_label_get_mnemonic_keyval(long /*int*/ label);
+	public static final int gtk_label_get_mnemonic_keyval(long /*int*/ label) {
+		lock.lock();
+		try {
+			return _gtk_label_get_mnemonic_keyval(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param label cast=(const gchar *) */
+	public static final native long /*int*/ _gtk_label_new(byte[] label);
+	public static final long /*int*/ gtk_label_new(byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_label_new(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param str cast=(const gchar *) */
+	public static final native long /*int*/ _gtk_label_new_with_mnemonic(byte[] str);
+	public static final long /*int*/ gtk_label_new_with_mnemonic(byte[] str) {
+		lock.lock();
+		try {
+			return _gtk_label_new_with_mnemonic(str);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param label cast=(GtkLabel *)
+	 * @param attrs cast=(PangoAttrList *)
+	 */
+	public static final native void _gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs);
+	public static final void gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs) {
+		lock.lock();
+		try {
+			_gtk_label_set_attributes(label, attrs);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param label cast=(GtkLabel *)
+	 * @param jtype cast=(GtkJustification)
+	 */
+	public static final native void _gtk_label_set_justify(long /*int*/ label, int jtype);
+	public static final void gtk_label_set_justify(long /*int*/ label, int jtype) {
+		lock.lock();
+		try {
+			_gtk_label_set_justify(label, jtype);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param label cast=(GtkLabel *)
+	 * @param wrap cast=(gboolean)
+	 */
+	public static final native void _gtk_label_set_line_wrap(long /*int*/ label, boolean wrap);
+	public static final void gtk_label_set_line_wrap(long /*int*/ label, boolean wrap) {
+		lock.lock();
+		try {
+			_gtk_label_set_line_wrap(label, wrap);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param label cast=(GtkLabel *)
+	 * @param wrap_mode cast=(PangoWrapMode)
+	 */
+	public static final native void _gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode);
+	public static final void gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode) {
+		lock.lock();
+		try {
+			_gtk_label_set_line_wrap_mode(label, wrap_mode);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param label cast=(GtkLabel *)
+	 * @param str cast=(const gchar *)
+	 */
+	public static final native void _gtk_label_set_text(long /*int*/ label, long /*int*/ str);
+	public static final void gtk_label_set_text(long /*int*/ label, long /*int*/ str) {
+		lock.lock();
+		try {
+			_gtk_label_set_text(label, str);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param label cast=(GtkLabel *)
+	 * @param str cast=(const gchar *)
+	 */
+	public static final native void _gtk_label_set_text(long /*int*/ label, byte[] str);
+	public static final void gtk_label_set_text(long /*int*/ label, byte[] str) {
+		lock.lock();
+		try {
+			_gtk_label_set_text(label, str);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param label cast=(GtkLabel *)
+	 * @param str cast=(const gchar *)
+	 */
+	public static final native void _gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str);
+	public static final void gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str) {
+		lock.lock();
+		try {
+			_gtk_label_set_text_with_mnemonic(label, str);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param list_store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter);
+	public static final void gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter) {
+		lock.lock();
+		try {
+			_gtk_list_store_append(list_store, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param store cast=(GtkListStore *) */
+	public static final native void _gtk_list_store_clear(long /*int*/ store);
+	public static final void gtk_list_store_clear(long /*int*/ store) {
+		lock.lock();
+		try {
+			_gtk_list_store_clear(store);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param list_store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param position cast=(gint)
+	 */
+	public static final native void _gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position);
+	public static final void gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position) {
+		lock.lock();
+		try {
+			_gtk_list_store_insert(list_store, iter, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param numColumns cast=(gint)
+	 * @param types cast=(GType *)
+	 */
+	public static final native long /*int*/ _gtk_list_store_newv(int numColumns, long /*int*/[] types);
+	public static final long /*int*/ gtk_list_store_newv(int numColumns, long /*int*/[] types) {
+		lock.lock();
+		try {
+			return _gtk_list_store_newv(numColumns, types);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param data cast=(const gchar *)
+	 * @param length cast=(gssize)
+	 * @param error cast=(GError **)
+	 */
+	public static final native boolean _gtk_css_provider_load_from_data(long /*int*/ css_provider, byte[] data, long /*int*/ length, long /*int*/ error[]);
+	public static final boolean gtk_css_provider_load_from_data(long /*int*/ css_provider, byte[] data, long /*int*/ length, long /*int*/ error[] ) {
+		lock.lock();
+		try {
+			return _gtk_css_provider_load_from_data(css_provider, data, length, error);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_css_provider_new();
+	public static final long /*int*/gtk_css_provider_new() {
+		lock.lock();
+		try {
+			return _gtk_css_provider_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_css_provider_to_string(long /*int*/ provider);
+	public static final long /*int*/gtk_css_provider_to_string(long /*int*/ provider) {
+		lock.lock();
+		try {
+			return _gtk_css_provider_to_string(provider);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic
+	 *  @param name cast=(const gchar *)
+	 *  @param variant cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_css_provider_get_named (byte[] name, byte[] variant);
+	public static final long /*int*/gtk_css_provider_get_named(byte[] name, byte[] variant) {
+		lock.lock();
+		try {
+			return _gtk_css_provider_get_named(name, variant);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param screen cast=(GdkScreen *)
+	 * @param priority cast=(guint)
+	 */
+	public static final native void _gtk_style_context_add_provider_for_screen (long /*int*/ screen, long /*int*/ provider, int priority);
+	public static final void gtk_style_context_add_provider_for_screen(long /*int*/ screen, long /*int*/ provider, int priority) {
+		lock.lock();
+		try {
+			_gtk_style_context_add_provider_for_screen(screen, provider, priority);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	* @method flags=dynamic
+	* @param priority cast=(guint)
+	*/
+	public static final native void _gtk_style_context_add_provider (long /*int*/ context, long /*int*/ provider, int priority);
+	public static final void gtk_style_context_add_provider(
+		long /*int*/context, long /*int*/provider, int priority) {
+		lock.lock();
+		try {
+			_gtk_style_context_add_provider(context, provider, priority);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param list_store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter);
+	public static final void gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter) {
+		lock.lock();
+		try {
+			_gtk_list_store_remove(list_store, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator);
+	public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_list_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator);
+	public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_list_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator);
+	public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_list_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param value flags=no_out
+	 */
+	public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator);
+	public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator) {
+		lock.lock();
+		assert !GTK3 : "GTK2 code was run by GTK3";
+		try {
+			_gtk_list_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param value flags=no_out
+	 */
+	public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator);
+	public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator) {
+		lock.lock();
+		assert GTK3 : "GTK3 code was run by GTK2";
+		try {
+			_gtk_list_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkListStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator);
+	public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_list_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native int _gtk_major_version();
+	public static final int gtk_major_version() {
+		lock.lock();
+		try {
+			return _gtk_major_version();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native int _gtk_minor_version();
+	public static final int gtk_minor_version() {
+		lock.lock();
+		try {
+			return _gtk_minor_version();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=const */
+	public static final native int _gtk_micro_version();
+	public static final int gtk_micro_version() {
+		lock.lock();
+		try {
+			return _gtk_micro_version();
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native void _gtk_main();
+	public static final void gtk_main() {
+		lock.lock();
+		try {
+			_gtk_main();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param event cast=(GdkEvent *) */
+	public static final native void _gtk_main_do_event(long /*int*/ event);
+	public static final void gtk_main_do_event(long /*int*/ event) {
+		lock.lock();
+		try {
+			_gtk_main_do_event(event);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_menu_bar_new();
+	public static final long /*int*/ gtk_menu_bar_new() {
+		lock.lock();
+		try {
+			return _gtk_menu_bar_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param menu_item cast=(GtkMenuItem *) */
+	public static final native long /*int*/ _gtk_menu_item_get_submenu(long /*int*/ menu_item);
+	public static final long /*int*/ gtk_menu_item_get_submenu(long /*int*/ menu_item) {
+		lock.lock();
+		try {
+			return _gtk_menu_item_get_submenu(menu_item);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param label cast=(const gchar *) */
+	public static final native long /*int*/ _gtk_menu_item_new_with_label(byte[] label);
+	public static final long /*int*/ gtk_menu_item_new_with_label(byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_menu_item_new_with_label(label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_menu_item_new();
+	public static final long /*int*/ gtk_menu_item_new() {
+		lock.lock();
+		try {
+			return _gtk_menu_item_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param menu_item cast=(GtkMenuItem *)
+	 * @param submenu cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu);
+	public static final void gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu) {
+		lock.lock();
+		try {
+			_gtk_menu_item_set_submenu(menu_item, submenu);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_menu_new();
+	public static final long /*int*/ gtk_menu_new() {
+		lock.lock();
+		try {
+			return _gtk_menu_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param menu cast=(GtkMenu *) */
+	public static final native void _gtk_menu_popdown(long /*int*/ menu);
+	public static final void gtk_menu_popdown(long /*int*/ menu) {
+		lock.lock();
+		try {
+			_gtk_menu_popdown(menu);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param menu cast=(GtkMenu *)
+	 * @param parent_menu_shell cast=(GtkWidget *)
+	 * @param parent_menu_item cast=(GtkWidget *)
+	 * @param func cast=(GtkMenuPositionFunc)
+	 * @param data cast=(gpointer)
+	 * @param button cast=(guint)
+	 * @param activate_time cast=(guint32)
+	 */
+	public static final native void _gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time);
+	/** [GTK2/GTK3; 3.22 deprecated] */
+	public static final void gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time) {
+		lock.lock();
+		try {
+			_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 *  @method flags=dynamic
+	 */
+	public static final native void _gtk_menu_popup_at_pointer(long /*int*/ menu, long /*int*/ trigger_event);
+	public static void gtk_menu_popup_at_pointer(long /*int*/ menu, long /*int*/ trigger_event) {
+		lock.lock();
+		try {
+			_gtk_menu_popup_at_pointer(menu, trigger_event);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param menu_shell cast=(GtkMenuShell *) */
+	public static final native void _gtk_menu_shell_deactivate(long /*int*/ menu_shell);
+	public static final void gtk_menu_shell_deactivate(long /*int*/ menu_shell) {
+		lock.lock();
+		try {
+			_gtk_menu_shell_deactivate(menu_shell);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param menu_shell cast=(GtkMenuShell *)
+	 * @param child cast=(GtkWidget *)
+	 * @param position cast=(gint)
+	 */
+	public static final native void _gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position);
+	public static final void gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position) {
+		lock.lock();
+		try {
+			_gtk_menu_shell_insert(menu_shell, child, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param menu_shell cast=(GtkMenuShell *)
+	 * @param take_focus cast=(gboolean)
+	 */
+	public static final native void _gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus);
+	public static final void gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus) {
+		lock.lock();
+		try {
+			_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param icon_widget cast=(GtkWidget *)
+	 * @param label cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label);
+	public static final long /*int*/ gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_menu_tool_button_new(icon_widget, label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param parent cast=(GtkWindow *)
+	 * @param flags cast=(GtkDialogFlags)
+	 * @param type cast=(GtkMessageType)
+	 * @param buttons cast=(GtkButtonsType)
+	 * @param message_format cast=(const gchar *)
+	 * @param arg cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format, byte[] arg);
+	public static final long /*int*/ gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format, byte[] arg) {
+		lock.lock();
+		try {
+			return _gtk_message_dialog_new(parent, flags, type, buttons, message_format, arg);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param misc cast=(GtkMisc *)
+	 * @param xalign cast=(gfloat)
+	 * @param yalign cast=(gfloat)
+	 */
+	public static final native void _gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign);
+	/** [GTK2/GTK3; 3.14 deprecated] */
+	public static final void gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign) {
+		lock.lock();
+		try {
+			_gtk_misc_set_alignment(misc, xalign, yalign);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param notebook cast=(GtkNotebook *) */
+	public static final native int _gtk_notebook_get_current_page(long /*int*/ notebook);
+	public static final int gtk_notebook_get_current_page(long /*int*/ notebook) {
+		lock.lock();
+		try {
+			return _gtk_notebook_get_current_page(notebook);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param notebook cast=(GtkNotebook *) */
+	public static final native boolean _gtk_notebook_get_scrollable(long /*int*/ notebook);
+	public static final boolean gtk_notebook_get_scrollable(long /*int*/ notebook) {
+		lock.lock();
+		try {
+			return _gtk_notebook_get_scrollable(notebook);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param notebook cast=(GtkNotebook *)
+	 * @param child cast=(GtkWidget *)
+	 * @param tab_label cast=(GtkWidget *)
+	 * @param position cast=(gint)
+	 */
+	public static final native void _gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position);
+	public static final void gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position) {
+		lock.lock();
+		try {
+			_gtk_notebook_insert_page(notebook, child, tab_label, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_notebook_new();
+	public static final long /*int*/ gtk_notebook_new() {
+		lock.lock();
+		try {
+			return _gtk_notebook_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param notebook cast=(GtkNotebook *) */
+	public static final native void _gtk_notebook_next_page(long /*int*/ notebook);
+	public static final void gtk_notebook_next_page(long /*int*/ notebook) {
+		lock.lock();
+		try {
+			_gtk_notebook_next_page(notebook);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param notebook cast=(GtkNotebook *) */
+	public static final native void _gtk_notebook_prev_page(long /*int*/ notebook);
+	public static final void gtk_notebook_prev_page(long /*int*/ notebook) {
+		lock.lock();
+		try {
+			_gtk_notebook_prev_page(notebook);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param notebook cast=(GtkNotebook *)
+	 * @param page_num cast=(gint)
+	 */
+	public static final native void _gtk_notebook_remove_page(long /*int*/ notebook, int page_num);
+	public static final void gtk_notebook_remove_page(long /*int*/ notebook, int page_num) {
+		lock.lock();
+		try {
+			_gtk_notebook_remove_page(notebook, page_num);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param notebook cast=(GtkNotebook *)
+	 * @param page_num cast=(gint)
+	 */
+	public static final native void _gtk_notebook_set_current_page(long /*int*/ notebook, int page_num);
+	public static final void gtk_notebook_set_current_page(long /*int*/ notebook, int page_num) {
+		lock.lock();
+		try {
+			_gtk_notebook_set_current_page(notebook, page_num);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param notebook cast=(GtkNotebook *)
+	 * @param scrollable cast=(gboolean)
+	 */
+	public static final native void _gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable);
+	public static final void gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable) {
+		lock.lock();
+		try {
+			_gtk_notebook_set_scrollable(notebook, scrollable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param notebook cast=(GtkNotebook *)
+	 * @param show_tabs cast=(gboolean)
+	 */
+	public static final native void _gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs);
+	public static final void gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs) {
+		lock.lock();
+		try {
+			_gtk_notebook_set_show_tabs(notebook, show_tabs);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param notebook cast=(GtkNotebook *)
+	 * @param pos cast=(GtkPositionType)
+	 */
+	public static final native void _gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos);
+	public static final void gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos) {
+		lock.lock();
+		try {
+			_gtk_notebook_set_tab_pos(notebook, pos);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param orientable cast=(GtkOrientable *)
+	 * @param orientation cast=(GtkOrientation)
+	 */
+	public static final native void _gtk_orientable_set_orientation(long /*int*/ orientable, int orientation);
+	public static final void gtk_orientable_set_orientation(long /*int*/ orientable, int orientation) {
+		lock.lock();
+		try {
+			_gtk_orientable_set_orientation(orientable, orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_page_setup_new ();
+	public static final long /*int*/ gtk_page_setup_new () {
+		lock.lock();
+		try {
+			return _gtk_page_setup_new ();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 */
+	public static final native int _gtk_page_setup_get_orientation(long /*int*/ setup);
+	public static final int gtk_page_setup_get_orientation(long /*int*/ setup) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_orientation(setup);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param orientation cast=(GtkPageOrientation)
+	 */
+	public static final native void _gtk_page_setup_set_orientation(long /*int*/ setup, int orientation);
+	public static final void gtk_page_setup_set_orientation(long /*int*/ setup, int orientation) {
+		lock.lock();
+		try {
+			_gtk_page_setup_set_orientation(setup, orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 */
+	public static final native long /*int*/ _gtk_page_setup_get_paper_size(long /*int*/ setup);
+	public static final long /*int*/ gtk_page_setup_get_paper_size(long /*int*/ setup) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_paper_size(setup);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param size cast=(GtkPaperSize *)
+	 */
+	public static final native void _gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size);
+	public static final void gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size) {
+		lock.lock();
+		try {
+			_gtk_page_setup_set_paper_size(setup, size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_page_setup_get_top_margin(long /*int*/ setup, int unit);
+	public static final double gtk_page_setup_get_top_margin(long /*int*/ setup, int unit) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_top_margin(setup, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param margin cast=(gdouble)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native void _gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit);
+	public static final void gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit) {
+		lock.lock();
+		try {
+			_gtk_page_setup_set_top_margin(setup, margin, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param unit cast=(GtkUnit)
+	 *
+	 */
+	public static final native double _gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit);
+	public static final double gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_bottom_margin(setup, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param margin cast=(gdouble)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native void _gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit);
+	public static final void gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit) {
+		lock.lock();
+		try {
+			_gtk_page_setup_set_bottom_margin(setup, margin, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_page_setup_get_left_margin(long /*int*/ setup, int unit);
+	public static final double gtk_page_setup_get_left_margin(long /*int*/ setup, int unit) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_left_margin(setup, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param margin cast=(gdouble)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native void _gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit);
+	public static final void gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit) {
+		lock.lock();
+		try {
+			_gtk_page_setup_set_left_margin(setup, margin, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_page_setup_get_right_margin(long /*int*/ setup, int unit);
+	public static final double gtk_page_setup_get_right_margin(long /*int*/ setup, int unit) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_right_margin(setup, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param margin cast=(gdouble)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native void _gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit);
+	public static final void gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit) {
+		lock.lock();
+		try {
+			_gtk_page_setup_set_right_margin(setup, margin, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_page_setup_get_paper_width(long /*int*/ setup, int unit);
+	public static final double gtk_page_setup_get_paper_width(long /*int*/ setup, int unit) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_paper_width(setup, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_page_setup_get_paper_height(long /*int*/ setup, int unit);
+	public static final double gtk_page_setup_get_paper_height(long /*int*/ setup, int unit) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_paper_height(setup, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_page_setup_get_page_width(long /*int*/ setup, int unit);
+	public static final double gtk_page_setup_get_page_width(long /*int*/ setup, int unit) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_page_width(setup, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param setup cast=(GtkPageSetup *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_page_setup_get_page_height(long /*int*/ setup, int unit);
+	public static final double gtk_page_setup_get_page_height(long /*int*/ setup, int unit) {
+		lock.lock();
+		try {
+			return _gtk_page_setup_get_page_height(setup, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param window cast=(GdkWindow *)
+	 * @param area flags=no_out
+	 * @param widget cast=(GtkWidget *)
+	 * @param detail cast=(const gchar *)
+	 */
+	public static final native void _gtk_paint_handle(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_paint_handle(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int orientation) {
+		lock.lock();
+		try {
+			_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param x cast=(gdouble)
+	 * @param y cast=(gdouble)
+	 * @param width cast=(gdouble)
+	 * @param height cast=(gdouble)
+	 */
+	public static final native void _gtk_render_frame(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height);
+	public static final void gtk_render_frame(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) {
+		lock.lock();
+		try {
+			_gtk_render_frame(context, cr, x, y, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param x cast=(gdouble)
+	 * @param y cast=(gdouble)
+	 * @param width cast=(gdouble)
+	 * @param height cast=(gdouble)
+	 */
+	public static final native void _gtk_render_background(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height);
+	public static final void gtk_render_background(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) {
+		lock.lock();
+		try {
+			_gtk_render_background(context, cr, x, y, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param window cast=(GdkWindow *)
+	 * @param widget cast=(GtkWidget *)
+	 * @param detail cast=(const gchar *)
+	 */
+	public static final native void _gtk_paint_flat_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_paint_flat_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
+		lock.lock();
+		try {
+			_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	* @method flags=dynamic
+	* @param x cast=(gdouble)
+	* @param y cast=(gdouble)
+	* @param width cast=(gdouble)
+	* @param height cast=(gdouble)
+	*/
+	public static final native void _gtk_render_focus(long /*int*/ context, long /*int*/ cr,  double x , double y, double width, double height);
+	public static final void gtk_render_focus(long /*int*/ context, long /*int*/ cr,  double x , double y, double width, double height) {
+		lock.lock();
+		try {
+			_gtk_render_focus(context, cr,  x, y, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param window cast=(GdkWindow *)
+	 * @param widget cast=(GtkWidget *)
+	 * @param detail cast=(const gchar *)
+	 */
+	public static final native void _gtk_paint_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_paint_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
+		lock.lock();
+		try {
+			_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param size cast=(GtkPaperSize *)
+	 */
+	public static final native void _gtk_paper_size_free(long /*int*/ size);
+	public static final void gtk_paper_size_free(long /*int*/ size) {
+		lock.lock();
+		try {
+			_gtk_paper_size_free(size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param name cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_paper_size_new(byte [] name);
+	public static final long /*int*/ gtk_paper_size_new(byte [] name) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_new(name);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param ppd_name cast=(const gchar *)
+	 * @param ppd_display_name cast=(const gchar *)
+	 * @param width cast=(gdouble)
+	 * @param height cast=(gdouble)
+	 */
+	public static final native long /*int*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);
+	public static final long /*int*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param name cast=(const gchar *)
+	 * @param display_name cast=(const gchar *)
+	 * @param width cast=(gdouble)
+	 * @param height cast=(gdouble)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native long /*int*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);
+	public static final long /*int*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param size cast=(GtkPaperSize *)
+	 */
+	public static final native long /*int*/ _gtk_paper_size_get_name(long /*int*/ size);
+	public static final long /*int*/ gtk_paper_size_get_name(long /*int*/ size) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_get_name(size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param size cast=(GtkPaperSize *)
+	 */
+	public static final native long /*int*/ _gtk_paper_size_get_display_name(long /*int*/ size);
+	public static final long /*int*/ gtk_paper_size_get_display_name(long /*int*/ size) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_get_display_name(size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param size cast=(GtkPaperSize *)
+	 */
+	public static final native long /*int*/ _gtk_paper_size_get_ppd_name(long /*int*/ size);
+	public static final long /*int*/ gtk_paper_size_get_ppd_name(long /*int*/ size) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_get_ppd_name(size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param size cast=(GtkPaperSize *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_paper_size_get_width(long /*int*/ size, int unit);
+	public static final double gtk_paper_size_get_width(long /*int*/ size, int unit) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_get_width(size, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param size cast=(GtkPaperSize *)
+	 * @param unit cast=(GtkUnit)
+	 */
+	public static final native double _gtk_paper_size_get_height(long /*int*/ size, int unit);
+	public static final double gtk_paper_size_get_height(long /*int*/ size, int unit) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_get_height(size, unit);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param size cast=(GtkPaperSize *)
+	 */
+	public static final native boolean _gtk_paper_size_is_custom(long /*int*/ size);
+	public static final boolean gtk_paper_size_is_custom(long /*int*/ size) {
+		lock.lock();
+		try {
+			return _gtk_paper_size_is_custom(size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_plug_new(long /*int*/ socket_id);
+	public static final long /*int*/ gtk_plug_new(long /*int*/ socket_id) {
+		lock.lock();
+		try {
+			return _gtk_plug_new(socket_id);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param printer cast=(GtkPrinter *)
+	 */
+	public static final native long /*int*/ _gtk_printer_get_backend(long /*int*/ printer);
+	public static final long /*int*/ gtk_printer_get_backend(long /*int*/ printer) {
+		lock.lock();
+		try {
+			return _gtk_printer_get_backend(printer);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param printer cast=(GtkPrinter *)
+	 */
+	public static final native long /*int*/ _gtk_printer_get_name(long /*int*/ printer);
+	public static final long /*int*/ gtk_printer_get_name(long /*int*/ printer) {
+		lock.lock();
+		try {
+			return _gtk_printer_get_name(printer);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param printer cast=(GtkPrinter *)
+	 */
+	public static final native boolean _gtk_printer_is_default(long /*int*/ printer);
+	public static final boolean gtk_printer_is_default(long /*int*/ printer) {
+		lock.lock();
+		try {
+			return _gtk_printer_is_default(printer);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param func cast=(GtkPrinterFunc)
+	 * @param data cast=(gpointer)
+	 * @param destroy cast=(GDestroyNotify)
+	 * @param wait cast=(gboolean)
+	 */
+	public static final native void _gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait);
+	public static final void gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait) {
+		lock.lock();
+		try {
+			_gtk_enumerate_printers(func, data, destroy, wait);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param title cast=(const gchar *)
+	 * @param printer cast=(GtkPrinter *)
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param page_setup cast=(GtkPageSetup *)
+	 */
+	public static final native long /*int*/ _gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup);
+	public static final long /*int*/ gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup) {
+		lock.lock();
+		try {
+			return _gtk_print_job_new(title, printer, settings, page_setup);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param job cast=(GtkPrintJob *)
+	 * @param error cast=(GError **)
+	 */
+	public static final native long /*int*/ _gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]);
+	public static final long /*int*/ gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]) {
+		lock.lock();
+		try {
+			return _gtk_print_job_get_surface(job, error);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param job cast=(GtkPrintJob *)
+	 * @param callback cast=(GtkPrintJobCompleteFunc)
+	 * @param user_data cast=(gpointer)
+	 * @param dnotify cast=(GDestroyNotify)
+	 */
+	public static final native void _gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify);
+	public static final void gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify) {
+		lock.lock();
+		try {
+			_gtk_print_job_send(job, callback, user_data, dnotify);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_print_settings_new();
+	public static final long /*int*/ gtk_print_settings_new() {
+		lock.lock();
+		try {
+			return _gtk_print_settings_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param func cast=(GtkPrintSettingsFunc)
+	 * @param data cast=(gpointer)
+	 */
+	public static final native void _gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data);
+	public static final void gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data) {
+		lock.lock();
+		try {
+			_gtk_print_settings_foreach(settings, func, data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param key cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_print_settings_get(long /*int*/ settings, byte [] key);
+	public static final long /*int*/ gtk_print_settings_get(long /*int*/ settings, byte [] key) {
+		lock.lock();
+		try {
+			return _gtk_print_settings_get(settings, key);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param key cast=(const gchar *)
+	 * @param value cast=(const gchar *)
+	 */
+	public static final native void _gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value);
+	public static final void gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value) {
+		lock.lock();
+		try {
+			_gtk_print_settings_set(settings, key, value);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param printer cast=(const gchar *)
+	 */
+	public static final native void _gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer);
+	public static final void gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer) {
+		lock.lock();
+		try {
+			_gtk_print_settings_set_printer(settings, printer);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param orientation cast=(GtkPageOrientation)
+	 */
+	public static final native void _gtk_print_settings_set_orientation(long /*int*/ settings, int orientation);
+	public static final void gtk_print_settings_set_orientation(long /*int*/ settings, int orientation) {
+		lock.lock();
+		try {
+			_gtk_print_settings_set_orientation(settings, orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 */
+	public static final native boolean _gtk_print_settings_get_collate(long /*int*/ settings);
+	public static final boolean gtk_print_settings_get_collate(long /*int*/ settings) {
+		lock.lock();
+		try {
+			return _gtk_print_settings_get_collate(settings);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param collate cast=(gboolean)
+	 */
+	public static final native void _gtk_print_settings_set_collate(long /*int*/ settings, boolean collate);
+	public static final void gtk_print_settings_set_collate(long /*int*/ settings, boolean collate) {
+		lock.lock();
+		try {
+			_gtk_print_settings_set_collate(settings, collate);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 */
+	public static final native int _gtk_print_settings_get_duplex(long /*int*/ settings);
+	public static final int gtk_print_settings_get_duplex(long /*int*/ settings) {
+		lock.lock();
+		try {
+			return _gtk_print_settings_get_duplex(settings);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param duplex cast=(GtkPrintDuplex)
+	 */
+	public static final native void _gtk_print_settings_set_duplex(long /*int*/ settings, int duplex);
+	public static final void gtk_print_settings_set_duplex(long /*int*/ settings, int duplex) {
+		lock.lock();
+		try {
+			_gtk_print_settings_set_duplex(settings, duplex);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 */
+	public static final native int _gtk_print_settings_get_n_copies(long /*int*/ settings);
+	public static final int gtk_print_settings_get_n_copies(long /*int*/ settings) {
+		lock.lock();
+		try {
+			return _gtk_print_settings_get_n_copies(settings);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param num_copies cast=(gint)
+	 */
+	public static final native void _gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies);
+	public static final void gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies) {
+		lock.lock();
+		try {
+			_gtk_print_settings_set_n_copies(settings, num_copies);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 */
+	public static final native int _gtk_print_settings_get_print_pages(long /*int*/ settings);
+	public static final int gtk_print_settings_get_print_pages(long /*int*/ settings) {
+		lock.lock();
+		try {
+			return _gtk_print_settings_get_print_pages(settings);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param pages cast=(GtkPrintPages)
+	 */
+	public static final native void _gtk_print_settings_set_print_pages(long /*int*/ settings, int pages);
+	public static final void gtk_print_settings_set_print_pages(long /*int*/ settings, int pages) {
+		lock.lock();
+		try {
+			_gtk_print_settings_set_print_pages(settings, pages);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param num_ranges cast=(gint *)
+	 */
+	public static final native long /*int*/ _gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges);
+	public static final long /*int*/ gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges) {
+		lock.lock();
+		try {
+			return _gtk_print_settings_get_page_ranges(settings, num_ranges);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 * @param page_ranges cast=(GtkPageRange *)
+	 * @param num_ranges cast=(gint)
+	 */
+	public static final native void _gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges);
+	public static final void gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges) {
+		lock.lock();
+		try {
+			_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param settings cast=(GtkPrintSettings *)
+	 */
+	public static final native int _gtk_print_settings_get_resolution(long /*int*/ settings);
+	public static final int gtk_print_settings_get_resolution(long /*int*/ settings) {
+		lock.lock();
+		try {
+			return _gtk_print_settings_get_resolution(settings);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param title cast=(const gchar *)
+	 * @param parent cast=(GtkWindow *)
+	 */
+	public static final native long /*int*/ _gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent);
+	public static final long /*int*/ gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent) {
+		lock.lock();
+		try {
+			return _gtk_print_unix_dialog_new(title, parent);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 * @param embed cast=(gboolean)
+	 */
+	public static final native void _gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed);
+	public static final void gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed) {
+		lock.lock();
+		try {
+			_gtk_print_unix_dialog_set_embed_page_setup(dialog, embed);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 * @param page_setup cast=(GtkPageSetup *)
+	 */
+	public static final native void _gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup);
+	public static final void gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup) {
+		lock.lock();
+		try {
+			_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 */
+	public static final native long /*int*/ _gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog);
+	public static final long /*int*/ gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog) {
+		lock.lock();
+		try {
+			return _gtk_print_unix_dialog_get_page_setup(dialog);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 * @param current_page cast=(gint)
+	 */
+	public static final native void _gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page);
+	public static final void gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page) {
+		lock.lock();
+		try {
+			_gtk_print_unix_dialog_set_current_page(dialog, current_page);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 */
+	public static final native int _gtk_print_unix_dialog_get_current_page(long /*int*/ dialog);
+	public static final int gtk_print_unix_dialog_get_current_page(long /*int*/ dialog) {
+		lock.lock();
+		try {
+			return _gtk_print_unix_dialog_get_current_page(dialog);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 * @param settings cast=(GtkPrintSettings *)
+	 */
+	public static final native void _gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings);
+	public static final void gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings) {
+		lock.lock();
+		try {
+			_gtk_print_unix_dialog_set_settings(dialog, settings);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 */
+	public static final native long /*int*/ _gtk_print_unix_dialog_get_settings(long /*int*/ dialog);
+	public static final long /*int*/ gtk_print_unix_dialog_get_settings(long /*int*/ dialog) {
+		lock.lock();
+		try {
+			return _gtk_print_unix_dialog_get_settings(dialog);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 */
+	public static final native long /*int*/ _gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog);
+	public static final long /*int*/ gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog) {
+		lock.lock();
+		try {
+			return _gtk_print_unix_dialog_get_selected_printer(dialog);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param dialog cast=(GtkPrintUnixDialog *)
+	 * @param capabilities cast=(GtkPrintCapabilities)
+	 */
+	public static final native void _gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities);
+	public static final void gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities) {
+		lock.lock();
+		try {
+			_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_progress_bar_new();
+	public static final long /*int*/ gtk_progress_bar_new() {
+		lock.lock();
+		try {
+			return _gtk_progress_bar_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param pbar cast=(GtkProgressBar *) */
+	public static final native void _gtk_progress_bar_pulse(long /*int*/ pbar);
+	public static final void gtk_progress_bar_pulse(long /*int*/ pbar) {
+		lock.lock();
+		try {
+			_gtk_progress_bar_pulse(pbar);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param pbar cast=(GtkProgressBar *)
+	 * @param fraction cast=(gdouble)
+	 */
+	public static final native void _gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction);
+	public static final void gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction) {
+		lock.lock();
+		try {
+			_gtk_progress_bar_set_fraction(pbar, fraction);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param pbar cast=(GtkProgressBar *)
+	 * @param inverted cast=(gboolean)
+	 */
+	public static final native void _gtk_progress_bar_set_inverted(long /*int*/ pbar, boolean inverted);
+	public static final void gtk_progress_bar_set_inverted(long /*int*/ pbar, boolean inverted) {
+		lock.lock();
+		try {
+			_gtk_progress_bar_set_inverted(pbar, inverted);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param pbar cast=(GtkProgressBar *)
+	 */
+	public static final native void _gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation);
+	public static final void gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation) {
+		lock.lock();
+		try {
+			_gtk_progress_bar_set_orientation(pbar, orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param radio_button cast=(GtkRadioButton *) */
+	public static final native long /*int*/ _gtk_radio_button_get_group(long /*int*/ radio_button);
+	public static final long /*int*/ gtk_radio_button_get_group(long /*int*/ radio_button) {
+		lock.lock();
+		try {
+			return _gtk_radio_button_get_group(radio_button);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param group cast=(GSList *) */
+	public static final native long /*int*/ _gtk_radio_button_new(long /*int*/ group);
+	public static final long /*int*/ gtk_radio_button_new(long /*int*/ group) {
+		lock.lock();
+		try {
+			return _gtk_radio_button_new(group);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
+	public static final native long /*int*/ _gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item);
+	public static final long /*int*/ gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item) {
+		lock.lock();
+		try {
+			return _gtk_radio_menu_item_get_group(radio_menu_item);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param group cast=(GSList *) */
+	public static final native long /*int*/ _gtk_radio_menu_item_new(long /*int*/ group);
+	public static final long /*int*/ gtk_radio_menu_item_new(long /*int*/ group) {
+		lock.lock();
+		try {
+			return _gtk_radio_menu_item_new(group);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param group cast=(GSList *)
+	 * @param label cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label);
+	public static final long /*int*/ gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_radio_menu_item_new_with_label(group, label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param range cast=(GtkRange *) */
+	public static final native long /*int*/ _gtk_range_get_adjustment(long /*int*/ range);
+	public static final long /*int*/ gtk_range_get_adjustment(long /*int*/ range) {
+		lock.lock();
+		try {
+			return _gtk_range_get_adjustment(range);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param range cast=(GtkRange *) */
+	public static final native void _gtk_range_set_increments(long /*int*/ range, double step, double page);
+	public static final void gtk_range_set_increments(long /*int*/ range, double step, double page) {
+		lock.lock();
+		try {
+			_gtk_range_set_increments(range, step, page);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param range cast=(GtkRange *) */
+	public static final native void _gtk_range_set_inverted(long /*int*/ range, boolean setting);
+	public static final void gtk_range_set_inverted(long /*int*/ range, boolean setting) {
+		lock.lock();
+		try {
+			_gtk_range_set_inverted(range, setting);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param range cast=(GtkRange *) */
+	public static final native void _gtk_range_set_range(long /*int*/ range, double min, double max);
+	public static final void gtk_range_set_range(long /*int*/ range, double min, double max) {
+		lock.lock();
+		try {
+			_gtk_range_set_range(range, min, max);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param range cast=(GtkRange *) */
+	public static final native void _gtk_range_set_value(long /*int*/ range, double value);
+	public static final void gtk_range_set_value(long /*int*/ range, double value) {
+		lock.lock();
+		try {
+			_gtk_range_set_value(range, value);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 *  @param range cast=(GtkRange *)
+	 *  @param slider_start cast=(gint *)
+	 *  @param slider_end cast=(gint *)
+	 */
+	public static final native void _gtk_range_get_slider_range(long /*int*/ range, int[] slider_start, int[] slider_end);
+	public static final void gtk_range_get_slider_range(long /*int*/ range, int[] slider_start, int[] slider_end) {
+	        lock.lock();
+	        try {
+	        	_gtk_range_get_slider_range(range, slider_start, slider_end);
+	        } finally {
+	                lock.unlock();
+	        }
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param rc_string cast=(const gchar *)
+	 */
+	public static final native void _gtk_rc_parse_string(byte[] rc_string);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_rc_parse_string(byte[] rc_string) {
+		lock.lock();
+		try {
+			_gtk_rc_parse_string(rc_string);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param style cast=(GtkRcStyle *) */
+	public static final native long /*int*/ _gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index);
+	public static final long /*int*/ gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index) {
+		lock.lock();
+		try {
+			return _gtk_rc_style_get_bg_pixmap_name(style, index);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param style cast=(GtkRcStyle *) */
+	public static final native int _gtk_rc_style_get_color_flags(long /*int*/ style, int index);
+	public static final int gtk_rc_style_get_color_flags(long /*int*/ style, int index) {
+		lock.lock();
+		try {
+			return _gtk_rc_style_get_color_flags(style, index);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkRcStyle *)
+	 * @param color flags=no_out
+	 */
+	public static final native void _gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_rc_style_set_bg(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkRcStyle *)
+	 * @param name cast=(char *)
+	 */
+	public static final native void _gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name);
+	public static final void gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name) {
+		lock.lock();
+		try {
+			_gtk_rc_style_set_bg_pixmap_name(style, index, name);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param style cast=(GtkRcStyle *) */
+	public static final native void _gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag);
+	public static final void gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag) {
+		lock.lock();
+		try {
+			_gtk_rc_style_set_color_flags(style, index, flag);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param scale cast=(GtkScale *)
+	 * @param digits cast=(gint)
+	 */
+	public static final native void _gtk_scale_set_digits(long /*int*/ scale, int digits);
+	public static final void gtk_scale_set_digits(long /*int*/ scale, int digits) {
+		lock.lock();
+		try {
+			_gtk_scale_set_digits(scale, digits);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param scale cast=(GtkScale *)
+	 * @param draw_value cast=(gboolean)
+	 */
+	public static final native void _gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value);
+	public static final void gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value) {
+		lock.lock();
+		try {
+			_gtk_scale_set_draw_value(scale, draw_value);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param scrollable cast=(GtkScrollable *)
+	 */
+	public static final native long /*int*/ _gtk_scrollable_get_vadjustment(long /*int*/ scrollable);
+	public static final long /*int*/ gtk_scrollable_get_vadjustment(long /*int*/ scrollable) {
+		lock.lock();
+		try {
+			return _gtk_scrollable_get_vadjustment(scrollable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkRcStyle *)
+	 * @param color flags=no_out
+	 */
+	public static final native void _gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_rc_style_set_fg(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkRcStyle *)
+	 * @param color flags=no_out
+	 */
+	public static final native void _gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_rc_style_set_text(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param scrolled_window cast=(GtkScrolledWindow *)
+	 * @param child cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child);
+	/** [GTK2/GTK3; 3.8 deprecated] */
+	public static final void gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child) {
+		lock.lock();
+		try {
+			_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param scrolled_window cast=(GtkScrolledWindow *) */
+	public static final native long /*int*/ _gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window);
+	public static final long /*int*/ gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window) {
+		lock.lock();
+		try {
+			return _gtk_scrolled_window_get_hadjustment(scrolled_window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param scrolled_window cast=(GtkScrolledWindow *)
+	 */
+	public static final native long /*int*/ _gtk_scrolled_window_get_hscrollbar(long /*int*/ scrolled_window);
+	public static final long /*int*/ gtk_scrolled_window_get_hscrollbar(long /*int*/ scrolled_window) {
+		lock.lock();
+		try {
+			return _gtk_scrolled_window_get_hscrollbar(scrolled_window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param scrolled_window cast=(GtkScrolledWindow *)
+	 * @param hscrollbar_policy cast=(GtkPolicyType *)
+	 * @param vscrollbar_policy cast=(GtkPolicyType *)
+	 */
+	public static final native void _gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);
+	public static final void gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) {
+		lock.lock();
+		try {
+			_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param scrolled_window cast=(GtkScrolledWindow *) */
+	public static final native int _gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window);
+	public static final int gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window) {
+		lock.lock();
+		try {
+			return _gtk_scrolled_window_get_shadow_type(scrolled_window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param scrolled_window cast=(GtkScrolledWindow *) */
+	public static final native long /*int*/ _gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window);
+	public static final long /*int*/ gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window) {
+		lock.lock();
+		try {
+			return _gtk_scrolled_window_get_vadjustment(scrolled_window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param scrolled_window cast=(GtkScrolledWindow *)
+	 */
+	public static final native long /*int*/ _gtk_scrolled_window_get_vscrollbar(long /*int*/ scrolled_window);
+	public static final long /*int*/ gtk_scrolled_window_get_vscrollbar(long /*int*/ scrolled_window) {
+		lock.lock();
+		try {
+			return _gtk_scrolled_window_get_vscrollbar(scrolled_window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param hadjustment cast=(GtkAdjustment *)
+	 * @param vadjustment cast=(GtkAdjustment *)
+	 */
+	public static final native long /*int*/ _gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment);
+	public static final long /*int*/ gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment) {
+		lock.lock();
+		try {
+			return _gtk_scrolled_window_new(hadjustment, vadjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param scrolled_window cast=(GtkScrolledWindow *)
+	 * @param hscrollbar_policy cast=(GtkPolicyType)
+	 * @param vscrollbar_policy cast=(GtkPolicyType)
+	 */
+	public static final native void _gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);
+	public static final void gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) {
+		lock.lock();
+		try {
+			_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param scrolled_window cast=(GtkScrolledWindow *)
+	 */
+	public static final native boolean _gtk_scrolled_window_get_overlay_scrolling(long /*int*/ scrolled_window);
+	public static final boolean gtk_scrolled_window_get_overlay_scrolling(long /*int*/ scrolled_window) {
+		lock.lock();
+		try {
+			return _gtk_scrolled_window_get_overlay_scrolling(scrolled_window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param scrolled_window cast=(GtkScrolledWindow *)
+	 * @param type cast=(GtkShadowType)
+	 */
+	public static final native void _gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type);
+	public static final void gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type) {
+		lock.lock();
+		try {
+			_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_settings_get_default();
+	public static final long /*int*/ gtk_settings_get_default() {
+		lock.lock();
+		try {
+			return _gtk_settings_get_default();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param settings cast=(GtkSettings *)
+	 * @param name cast=(const gchar *)
+	 * @param v_string cast=(const gchar *)
+	 * @param origin cast=(const gchar *)
+	 */
+	public static final native void _gtk_settings_set_string_property(long /*int*/ settings, byte[] name, byte[] v_string, byte[] origin);
+	/** [GTK2/GTK3; 3.16 deprecated] */
+	public static final void gtk_settings_set_string_property(long /*int*/ settings, byte[] name, byte[] v_string, byte[] origin) {
+		lock.lock();
+		try {
+			_gtk_settings_set_string_property(settings, name, v_string, origin);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param selection_data cast=(GtkSelectionData *) */
+	public static final native void _gtk_selection_data_free(long /*int*/ selection_data);
+	public static final void gtk_selection_data_free(long /*int*/ selection_data) {
+		lock.lock();
+		try {
+			_gtk_selection_data_free(selection_data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection_data cast=(GtkSelectionData *)
+	 */
+	public static final native long /*int*/ _gtk_selection_data_get_data(long /*int*/ selection_data);
+	public static final long /*int*/ gtk_selection_data_get_data(long /*int*/ selection_data) {
+		lock.lock();
+		try {
+			return _gtk_selection_data_get_data(selection_data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection_data cast=(GtkSelectionData *)
+	 */
+	public static final native int _gtk_selection_data_get_format(long /*int*/ selection_data);
+	public static final int gtk_selection_data_get_format(long /*int*/ selection_data) {
+		lock.lock();
+		try {
+			return _gtk_selection_data_get_format(selection_data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection_data cast=(GtkSelectionData *)
+	 */
+	public static final native int _gtk_selection_data_get_length(long /*int*/ selection_data);
+	public static final int gtk_selection_data_get_length(long /*int*/ selection_data) {
+		lock.lock();
+		try {
+			return _gtk_selection_data_get_length(selection_data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection_data cast=(GtkSelectionData *)
+	 */
+	public static final native long /*int*/ _gtk_selection_data_get_target(long /*int*/ selection_data);
+	public static final long /*int*/ gtk_selection_data_get_target(long /*int*/ selection_data) {
+		lock.lock();
+		try {
+			return _gtk_selection_data_get_target(selection_data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection_data cast=(GtkSelectionData *)
+	 */
+	public static final native long /*int*/ _gtk_selection_data_get_data_type(long /*int*/ selection_data);
+	public static final long /*int*/ gtk_selection_data_get_data_type(long /*int*/ selection_data) {
+		lock.lock();
+		try {
+			return _gtk_selection_data_get_data_type(selection_data);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection_data cast=(GtkSelectionData *)
+	 * @param type cast=(GdkAtom)
+	 * @param format cast=(gint)
+	 * @param data cast=(const guchar *)
+	 * @param length cast=(gint)
+	 */
+	public static final native void _gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length);
+	public static final void gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length) {
+		lock.lock();
+		try {
+			_gtk_selection_data_set(selection_data, type, format, data, length);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_separator_menu_item_new();
+	public static final long /*int*/ gtk_separator_menu_item_new() {
+		lock.lock();
+		try {
+			return _gtk_separator_menu_item_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_separator_tool_item_new();
+	public static final long /*int*/ gtk_separator_tool_item_new() {
+		lock.lock();
+		try {
+			return _gtk_separator_tool_item_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param item cast=(GtkSeparatorToolItem *)
+	 * @param draw cast=(gboolean)
+	 */
+	public static final native void _gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw);
+	public static final void gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw) {
+		lock.lock();
+		try {
+			_gtk_separator_tool_item_set_draw(item, draw);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param socket cast=(GtkSocket *) */
+	public static final native long /*int*/ _gtk_socket_get_id(long /*int*/ socket);
+	public static final long /*int*/ gtk_socket_get_id(long /*int*/ socket) {
+		lock.lock();
+		try {
+			return _gtk_socket_get_id(socket);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_socket_new();
+	public static final long /*int*/ gtk_socket_new() {
+		lock.lock();
+		try {
+			return _gtk_socket_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param adjustment cast=(GtkAdjustment *) */
+	public static final native long /*int*/ _gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits);
+	public static final long /*int*/ gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits) {
+		lock.lock();
+		try {
+			return _gtk_spin_button_new(adjustment, climb_rate, digits);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param spin_button cast=(GtkSpinButton*)
+	 * @param numeric cast=(gboolean)
+	 **/
+	public static final native void _gtk_spin_button_set_numeric(long /*int*/ spin_button, boolean numeric);
+	public static final void gtk_spin_button_set_numeric(long /*int*/ spin_button, boolean numeric) {
+		lock.lock();
+		try {
+			_gtk_spin_button_set_numeric(spin_button, numeric);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param spin_button cast=(GtkSpinButton*)
+	 * @param adjustment cast=(GtkAdjustment *)
+	 **/
+	public static final native void _gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits);
+	public static final void gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits) {
+		lock.lock();
+		try {
+			_gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param spin_button cast=(GtkSpinButton*) */
+	public static final native long /*int*/ _gtk_spin_button_get_adjustment(long /*int*/ spin_button);
+	public static final long /*int*/ gtk_spin_button_get_adjustment(long /*int*/ spin_button) {
+		lock.lock();
+		try {
+			return _gtk_spin_button_get_adjustment(spin_button);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param spin_button cast=(GtkSpinButton*) */
+	public static final native int _gtk_spin_button_get_digits(long /*int*/ spin_button);
+	public static final int gtk_spin_button_get_digits(long /*int*/ spin_button) {
+		lock.lock();
+		try {
+			return _gtk_spin_button_get_digits(spin_button);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param spin_button cast=(GtkSpinButton*) */
+	public static final native void _gtk_spin_button_set_digits(long /*int*/ spin_button, int digits);
+	public static final void gtk_spin_button_set_digits(long /*int*/ spin_button, int digits) {
+		lock.lock();
+		try {
+			_gtk_spin_button_set_digits(spin_button, digits);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param spin_button cast=(GtkSpinButton*) */
+	public static final native void _gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page);
+	public static final void gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page) {
+		lock.lock();
+		try {
+			_gtk_spin_button_set_increments(spin_button, step, page);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param spin_button cast=(GtkSpinButton*) */
+	public static final native void _gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min);
+	public static final void gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min) {
+		lock.lock();
+		try {
+			_gtk_spin_button_set_range(spin_button, max, min);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param spin_button cast=(GtkSpinButton*) */
+	public static final native void _gtk_spin_button_set_value(long /*int*/ spin_button, double value);
+	public static final void gtk_spin_button_set_value(long /*int*/ spin_button, double value) {
+		lock.lock();
+		try {
+			_gtk_spin_button_set_value(spin_button, value);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param spin_button cast=(GtkSpinButton*) */
+	public static final native void _gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap);
+	public static final void gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap) {
+		lock.lock();
+		try {
+			_gtk_spin_button_set_wrap(spin_button, wrap);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param spin_button cast=(GtkSpinButton*) */
+	public static final native void _gtk_spin_button_update(long /*int*/ spin_button);
+	public static final void gtk_spin_button_update(long /*int*/ spin_button) {
+		lock.lock();
+		try {
+			_gtk_spin_button_update(spin_button);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param handle cast=(GtkStatusIcon*)
+	 * @param screen cast=(GdkScreen**)
+	 * @param area cast=(GdkRectangle*)
+	 * @param orientation cast=(GtkOrientation*)
+	 */
+	public static final native boolean _gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation);
+	public static final boolean gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation) {
+		lock.lock();
+		try {
+			return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param handle cast=(GtkStatusIcon*) */
+	public static final native boolean _gtk_status_icon_get_visible(long /*int*/ handle);
+	public static final boolean gtk_status_icon_get_visible(long /*int*/ handle) {
+		lock.lock();
+		try {
+			return _gtk_status_icon_get_visible(handle);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_status_icon_new();
+	public static final long /*int*/ gtk_status_icon_new() {
+		lock.lock();
+		try {
+			return _gtk_status_icon_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param handle cast=(GtkStatusIcon*)
+	 * @param pixbuf cast=(GdkPixbuf*)
+	 */
+	public static final native void _gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf);
+	public static final void gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf) {
+		lock.lock();
+		try {
+			_gtk_status_icon_set_from_pixbuf(handle, pixbuf);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param handle cast=(GtkStatusIcon*)
+	 * @param visible cast=(gboolean)
+	 */
+	public static final native void _gtk_status_icon_set_visible(long /*int*/ handle, boolean visible);
+	public static final void gtk_status_icon_set_visible(long /*int*/ handle, boolean visible) {
+		lock.lock();
+		try {
+			_gtk_status_icon_set_visible(handle, visible);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param handle cast=(GtkStatusIcon *)
+	 * @param tip_text cast=(const gchar *)
+	 */
+	public static final native void _gtk_status_icon_set_tooltip_text(long /*int*/ handle, byte[] tip_text);
+	public static final void gtk_status_icon_set_tooltip_text(long /*int*/ handle, byte[] tip_text) {
+		lock.lock();
+		try {
+			_gtk_status_icon_set_tooltip_text(handle, tip_text);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkStyle *)
+	 * @param color flags=no_in
+	 */
+	public static final native void _gtk_style_get_base(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_style_get_base(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_style_get_base(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_add_class(long /*int*/ context, byte[] class_name);
+	public static final void gtk_style_context_add_class(long /*int*/ context, byte[] class_name) {
+		lock.lock();
+		try {
+			_gtk_style_context_add_class(context, class_name);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_get_background_color(long /*int*/ context, int state, GdkRGBA color);
+	/** [GTK3; 3.16 deprecated] */
+	public static final void gtk_style_context_get_background_color(long /*int*/ context, int state, GdkRGBA color) {
+		lock.lock();
+		try {
+			_gtk_style_context_get_background_color(context, state, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_get_color(long /*int*/ context, int state, GdkRGBA color);
+	public static final void gtk_style_context_get_color(long /*int*/ context, int state, GdkRGBA color) {
+		lock.lock();
+		try {
+			_gtk_style_context_get_color(context, state, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_style_context_get_font(long /*int*/ context, int state);
+	/** [GTK3; 3.8 deprecated] */
+	public static final long /*int*/ gtk_style_context_get_font(long /*int*/ context, int state) {
+		lock.lock();
+		try {
+			return _gtk_style_context_get_font(context, state);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_get_padding(long /*int*/ context, int state, GtkBorder padding);
+	public static final void gtk_style_context_get_padding(long /*int*/ context, int state, GtkBorder padding) {
+		lock.lock();
+		try {
+			_gtk_style_context_get_padding(context, state, padding);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param property cast=(const gchar *),flags=no_out
+	 * @param terminator cast=(const gchar *),flags=sentinel
+	 */
+	public static final native void _gtk_style_context_get(long /*int*/ context, int state, byte [] property, long /*int*/ [] value, long /*int*/ terminator);
+	public static final void gtk_style_context_get(long /*int*/ context, int state, byte [] property, long /*int*/ [] value, long /*int*/ terminator) {
+		lock.lock();
+		try {
+			_gtk_style_context_get(context, state, property, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_get_border(long /*int*/ context, int state, GtkBorder padding);
+	public static final void gtk_style_context_get_border(long /*int*/ context, int state, GtkBorder padding) {
+		lock.lock();
+		try {
+			_gtk_style_context_get_border(context, state, padding);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_invalidate(long /*int*/ context);
+	/** [GTK3; 3.12 deprecated] */
+	public static final void gtk_style_context_invalidate(long /*int*/ context) {
+		lock.lock();
+		try {
+			_gtk_style_context_invalidate(context);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_save(long /*int*/ self);
+	public static final void gtk_style_context_save(long /*int*/ self) {
+		lock.lock();
+		try {
+			_gtk_style_context_save(self);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_restore(long /*int*/ context);
+	public static final void gtk_style_context_restore(long /*int*/ context) {
+		lock.lock();
+		try {
+			_gtk_style_context_restore(context);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic
+	 *  @param self cast=(GtkWidget *)
+	 *  */
+	public static final native int _gtk_widget_get_state_flags(long /*int*/ self);
+	public static final int gtk_widget_get_state_flags(long /*int*/ self) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_state_flags(self);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_style_context_set_state(long /*int*/ context, long /*int*/ flags);
+	public static final void gtk_style_context_set_state(long /*int*/ context, long /*int*/ flags) {
+		lock.lock();
+		try {
+			_gtk_style_context_set_state(context,flags);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkStyle *)
+	 * @param color flags=no_in
+	 */
+	public static final native void _gtk_style_get_black(long /*int*/ style, GdkColor color);
+	public static final void gtk_style_get_black(long /*int*/ style, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_style_get_black(style, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkStyle *)
+	 * @param color flags=no_in
+	 */
+	public static final native void _gtk_style_get_bg(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_style_get_bg(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_style_get_bg(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkStyle *)
+	 * @param color flags=no_in
+	 */
+	public static final native void _gtk_style_get_dark(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_style_get_dark(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_style_get_dark(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkStyle *)
+	 * @param color flags=no_in
+	 */
+	public static final native void _gtk_style_get_fg(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_style_get_fg(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_style_get_fg(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param style cast=(GtkStyle *) */
+	public static final native long /*int*/ _gtk_style_get_font_desc(long /*int*/ style);
+	public static final long /*int*/ gtk_style_get_font_desc(long /*int*/ style) {
+		lock.lock();
+		try {
+			return _gtk_style_get_font_desc(style);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkStyle *)
+	 * @param color flags=no_in
+	 */
+	public static final native void _gtk_style_get_light(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_style_get_light(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_style_get_light(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param style cast=(GtkStyle *)
+	 * @param color flags=no_in
+	 */
+	public static final native void _gtk_style_get_text(long /*int*/ style, int index, GdkColor color);
+	public static final void gtk_style_get_text(long /*int*/ style, int index, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_style_get_text(style, index, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param style cast=(GtkStyle *) */
+	public static final native int _gtk_style_get_xthickness(long /*int*/ style);
+	public static final int gtk_style_get_xthickness(long /*int*/ style) {
+		lock.lock();
+		try {
+			return _gtk_style_get_xthickness(style);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param style cast=(GtkStyle *) */
+	public static final native int _gtk_style_get_ythickness(long /*int*/ style);
+	public static final int gtk_style_get_ythickness(long /*int*/ style) {
+		lock.lock();
+		try {
+			return _gtk_style_get_ythickness(style);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param targets cast=(const GtkTargetEntry *)
+	 * @param ntargets cast=(guint)
+	 */
+	public static final native long /*int*/ _gtk_target_list_new(long /*int*/ targets, int ntargets);
+	public static final long /*int*/ gtk_target_list_new(long /*int*/ targets, int ntargets) {
+		lock.lock();
+		try {
+			return _gtk_target_list_new(targets, ntargets);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param list cast=(GtkTargetList *) */
+	public static final native void _gtk_target_list_unref(long /*int*/ list);
+	public static final void gtk_target_list_unref(long /*int*/ list) {
+		lock.lock();
+		try {
+			_gtk_target_list_unref(list);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param clipboard cast=(GtkClipboard *)
+	 */
+	public static final native void _gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard);
+	public static final void gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_copy_clipboard(buffer, clipboard);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param mark_name cast=(const gchar *)
+	 * @param where cast=(GtkTextIter *)
+	 * @param left_gravity cast=(gboolean)
+	 */
+	public static final native long /*int*/ _gtk_text_buffer_create_mark(long /*int*/ buffer, byte [] mark_name, byte [] where, boolean left_gravity);
+	public static final long /*int*/ gtk_text_buffer_create_mark(long /*int*/ buffer, byte [] mark_name, byte [] where, boolean left_gravity) {
+		lock.lock();
+		try {
+			return _gtk_text_buffer_create_mark(buffer, mark_name, where, left_gravity);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param clipboard cast=(GtkClipboard *)
+	 * @param default_editable cast=(gboolean)
+	 */
+	public static final native void _gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable);
+	public static final void gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param start cast=(GtkTextIter *)
+	 * @param end cast=(GtkTextIter *)
+	 */
+	public static final native void _gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end);
+	public static final void gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_delete(buffer, start, end);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param start cast=(GtkTextIter *)
+	 * @param end cast=(GtkTextIter *)
+	 */
+	public static final native void _gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end);
+	public static final void gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_get_bounds(buffer, start, end);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param iter cast=(GtkTextIter *)
+	 */
+	public static final native void _gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter);
+	public static final void gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_get_end_iter(buffer, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param buffer cast=(GtkTextBuffer *) */
+	public static final native long /*int*/ _gtk_text_buffer_get_insert(long /*int*/ buffer);
+	public static final long /*int*/ gtk_text_buffer_get_insert(long /*int*/ buffer) {
+		lock.lock();
+		try {
+			return _gtk_text_buffer_get_insert(buffer);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param iter cast=(GtkTextIter *)
+	 * @param line_number cast=(gint)
+	 */
+	public static final native void _gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number);
+	public static final void gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param iter cast=(GtkTextIter *)
+	 * @param mark cast=(GtkTextMark *)
+	 */
+	public static final native void _gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark);
+	public static final void gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param iter cast=(GtkTextIter *)
+	 * @param char_offset cast=(gint)
+	 */
+	public static final native void _gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset);
+	public static final void gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param buffer cast=(GtkTextBuffer *) */
+	public static final native int _gtk_text_buffer_get_line_count(long /*int*/ buffer);
+	public static final int gtk_text_buffer_get_line_count(long /*int*/ buffer) {
+		lock.lock();
+		try {
+			return _gtk_text_buffer_get_line_count(buffer);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param buffer cast=(GtkTextBuffer *) */
+	public static final native long /*int*/ _gtk_text_buffer_get_selection_bound(long /*int*/ buffer);
+	public static final long /*int*/ gtk_text_buffer_get_selection_bound(long /*int*/ buffer) {
+		lock.lock();
+		try {
+			return _gtk_text_buffer_get_selection_bound(buffer);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param start cast=(GtkTextIter *)
+	 * @param end cast=(GtkTextIter *)
+	 */
+	public static final native boolean _gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end);
+	public static final boolean gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end) {
+		lock.lock();
+		try {
+			return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param start cast=(GtkTextIter *)
+	 * @param end cast=(GtkTextIter *)
+	 * @param include_hidden_chars cast=(gboolean)
+	 */
+	public static final native long /*int*/ _gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);
+	public static final long /*int*/ gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) {
+		lock.lock();
+		try {
+			return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param iter cast=(GtkTextIter *)
+	 * @param text cast=(const gchar *)
+	 * @param len cast=(gint)
+	 */
+	public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len);
+	public static final void gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_insert(buffer, iter, text, len);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param iter cast=(GtkTextIter *)
+	 * @param text cast=(const gchar *)
+	 * @param len cast=(gint)
+	 */
+	public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len);
+	public static final void gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_insert(buffer, iter, text, len);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param ins cast=(const GtkTextIter *)
+	 * @param bound cast=(const GtkTextIter *)
+	 */
+	public static final native void _gtk_text_buffer_select_range (long /*int*/ buffer, byte[] ins, byte[] bound);
+	public static final void gtk_text_buffer_select_range (long /*int*/ buffer, byte[] ins, byte[] bound) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_select_range(buffer, ins, bound);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param clipboard cast=(GtkClipboard *)
+	 * @param override_location cast=(GtkTextIter *)
+	 * @param default_editable cast=(gboolean)
+	 */
+	public static final native void _gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable);
+	public static final void gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param where cast=(const GtkTextIter *)
+	 */
+	public static final native void _gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where);
+	public static final void gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_place_cursor(buffer, where);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param buffer cast=(GtkTextBuffer *)
+	 * @param text cast=(const gchar *)
+	 * @param len cast=(gint)
+	 */
+	public static final native void _gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len);
+	public static final void gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len) {
+		lock.lock();
+		try {
+			_gtk_text_buffer_set_text(buffer, text, len);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param iter cast=(const GtkTextIter *) */
+	public static final native int _gtk_text_iter_get_line(byte[] iter);
+	public static final int gtk_text_iter_get_line(byte[] iter) {
+		lock.lock();
+		try {
+			return _gtk_text_iter_get_line(iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param iter cast=(const GtkTextIter *) */
+	public static final native int _gtk_text_iter_get_offset(byte[] iter);
+	public static final int gtk_text_iter_get_offset(byte[] iter) {
+		lock.lock();
+		try {
+			return _gtk_text_iter_get_offset(iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param win cast=(GtkTextWindowType)
+	 * @param buffer_x cast=(gint)
+	 * @param buffer_y cast=(gint)
+	 * @param window_x cast=(gint *)
+	 * @param window_y cast=(gint *)
+	 */
+	public static final native void _gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y);
+	public static final void gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) {
+		lock.lock();
+		try {
+			_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param text_view cast=(GtkTextView *) */
+	public static final native long /*int*/ _gtk_text_view_get_buffer(long /*int*/ text_view);
+	public static final long /*int*/ gtk_text_view_get_buffer(long /*int*/ text_view) {
+		lock.lock();
+		try {
+			return _gtk_text_view_get_buffer(text_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param text_view cast=(GtkTextView *) */
+	public static final native boolean _gtk_text_view_get_editable(long /*int*/ text_view);
+	public static final boolean gtk_text_view_get_editable(long /*int*/ text_view) {
+		lock.lock();
+		try {
+			return _gtk_text_view_get_editable(text_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param iter cast=(GtkTextIter *)
+	 * @param x cast=(gint)
+	 * @param y cast=(gint)
+	 */
+	public static final native void _gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y);
+	public static final void gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y) {
+		lock.lock();
+		try {
+			_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param iter cast=(const GtkTextIter *)
+	 * @param location cast=(GdkRectangle *),flags=no_in
+	 */
+	public static final native void _gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location);
+	public static final void gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location) {
+		lock.lock();
+		try {
+			_gtk_text_view_get_iter_location(text_view, iter, location);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param target_iter cast=(GtkTextIter *)
+	 * @param y cast=(gint)
+	 * @param line_top cast=(gint *)
+	 */
+	public static final native void _gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top);
+	public static final void gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top) {
+		lock.lock();
+		try {
+			_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param target_iter cast=(GtkTextIter *)
+	 * @param y cast=(gint *)
+	 * @param height cast=(gint *)
+	 */
+	public static final native void _gtk_text_view_get_line_yrange(long /*int*/ text_view, byte[] target_iter, int[] y, int[] height);
+	public static final void gtk_text_view_get_line_yrange(long /*int*/ text_view, byte[] target_iter, int[] y, int[] height) {
+		lock.lock();
+		try {
+			_gtk_text_view_get_line_yrange(text_view, target_iter, y, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param visible_rect cast=(GdkRectangle *),flags=no_in
+	 */
+	public static final native void _gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect);
+	public static final void gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect) {
+		lock.lock();
+		try {
+			_gtk_text_view_get_visible_rect(text_view, visible_rect);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param win cast=(GtkTextWindowType)
+	 */
+	public static final native long /*int*/ _gtk_text_view_get_window(long /*int*/ text_view, int win);
+	public static final long /*int*/ gtk_text_view_get_window(long /*int*/ text_view, int win) {
+		lock.lock();
+		try {
+			return _gtk_text_view_get_window(text_view, win);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_text_view_new();
+	public static final long /*int*/ gtk_text_view_new() {
+		lock.lock();
+		try {
+			return _gtk_text_view_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param mark cast=(GtkTextMark *)
+	 * @param within_margin cast=(gdouble)
+	 * @param use_align cast=(gboolean)
+	 * @param xalign cast=(gdouble)
+	 * @param yalign cast=(gdouble)
+	 */
+	public static final native void _gtk_text_view_scroll_to_mark(long /*int*/ text_view, long /*int*/ mark, double within_margin, boolean use_align, double xalign, double yalign);
+	public static final void gtk_text_view_scroll_to_mark(long /*int*/ text_view, long /*int*/ mark, double within_margin, boolean use_align, double xalign, double yalign) {
+		lock.lock();
+		try {
+			_gtk_text_view_scroll_to_mark(text_view, mark, within_margin, use_align, xalign, yalign);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param iter cast=(GtkTextIter *)
+	 * @param within_margin cast=(gdouble)
+	 * @param use_align cast=(gboolean)
+	 * @param xalign cast=(gdouble)
+	 * @param yalign cast=(gdouble)
+	 */
+	public static final native boolean _gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign);
+	public static final boolean gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) {
+		lock.lock();
+		try {
+			return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param setting cast=(gboolean)
+	 */
+	public static final native void _gtk_text_view_set_editable(long /*int*/ text_view, boolean setting);
+	public static final void gtk_text_view_set_editable(long /*int*/ text_view, boolean setting) {
+		lock.lock();
+		try {
+			_gtk_text_view_set_editable(text_view, setting);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param text_view cast=(GtkTextView *) */
+	public static final native void _gtk_text_view_set_justification(long /*int*/ text_view, int justification);
+	public static final void gtk_text_view_set_justification(long /*int*/ text_view, int justification) {
+		lock.lock();
+		try {
+			_gtk_text_view_set_justification(text_view, justification);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param text_view cast=(GtkTextView *)
+	 * @param tabs cast=(PangoTabArray *)
+	 */
+	public static final native void _gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs);
+	public static final void gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs) {
+		lock.lock();
+		try {
+			_gtk_text_view_set_tabs(text_view, tabs);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param text_view cast=(GtkTextView *) */
+	public static final native void _gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode);
+	public static final void gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode) {
+		lock.lock();
+		try {
+			_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param toggle_button cast=(GtkToggleButton *) */
+	public static final native boolean _gtk_toggle_button_get_active(long /*int*/ toggle_button);
+	public static final boolean gtk_toggle_button_get_active(long /*int*/ toggle_button) {
+		lock.lock();
+		try {
+			return _gtk_toggle_button_get_active(toggle_button);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_toggle_button_new();
+	public static final long /*int*/ gtk_toggle_button_new() {
+		lock.lock();
+		try {
+			return _gtk_toggle_button_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param toggle_button cast=(GtkToggleButton *)
+	 * @param is_active cast=(gboolean)
+	 */
+	public static final native void _gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active);
+	public static final void gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active) {
+		lock.lock();
+		try {
+			_gtk_toggle_button_set_active(toggle_button, is_active);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param toggle_button cast=(GtkToggleButton *)
+	 * @param setting cast=(gboolean)
+	 */
+	public static final native void _gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting);
+	public static final void gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting) {
+		lock.lock();
+		try {
+			_gtk_toggle_button_set_inconsistent(toggle_button, setting);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param toggle_button cast=(GtkToggleButton *)
+	 * @param draw_indicator cast=(gboolean)
+	 */
+	public static final native void _gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator);
+	public static final void gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator) {
+		lock.lock();
+		try {
+			_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param button cast=(GtkToggleToolButton *) */
+	public static final native boolean _gtk_toggle_tool_button_get_active(long /*int*/ button);
+	public static final boolean gtk_toggle_tool_button_get_active(long /*int*/ button) {
+		lock.lock();
+		try {
+			return _gtk_toggle_tool_button_get_active(button);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_toggle_tool_button_new();
+	public static final long /*int*/ gtk_toggle_tool_button_new() {
+		lock.lock();
+		try {
+			return _gtk_toggle_tool_button_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param item cast=(GtkToggleToolButton *)
+	 * @param selected cast=(gboolean)
+	 */
+	public static final native void _gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected);
+	public static final void gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected) {
+		lock.lock();
+		try {
+			_gtk_toggle_tool_button_set_active(item, selected);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param icon_widget cast=(GtkWidget *)
+	 * @param label cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_tool_button_new(long /*int*/ icon_widget, byte[] label);
+	public static final long /*int*/ gtk_tool_button_new(long /*int*/ icon_widget, byte[] label) {
+		lock.lock();
+		try {
+			return _gtk_tool_button_new(icon_widget, label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param button cast=(GtkToolButton *)
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget);
+	public static final void gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_tool_button_set_icon_widget(button, widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param button cast=(GtkToolButton *)
+	 * @param label cast=(const gchar *)
+	 */
+	public static final native void _gtk_tool_button_set_label(long /*int*/ button,  byte[] label);
+	public static final void gtk_tool_button_set_label(long /*int*/ button,  byte[] label) {
+		lock.lock();
+		try {
+			_gtk_tool_button_set_label(button, label);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param button cast=(GtkToolButton *)
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_tool_button_set_label_widget(long /*int*/ button,  long /*int*/ widget);
+	public static final void gtk_tool_button_set_label_widget(long /*int*/ button,  long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_tool_button_set_label_widget(button, widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param item cast=(GtkToolButton *)
+	 * @param underline cast=(gboolean)
+	 */
+	public static final native void _gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline);
+	public static final void gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline) {
+		lock.lock();
+		try {
+			_gtk_tool_button_set_use_underline(item, underline);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param item cast=(GtkToolItem *)
+	 * @param menu_id cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id);
+	public static final long /*int*/ gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id) {
+		lock.lock();
+		try {
+			return _gtk_tool_item_get_proxy_menu_item(item, menu_id);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param item cast=(GtkToolItem *) */
+	public static final native long /*int*/ _gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item);
+	public static final long /*int*/ gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item) {
+		lock.lock();
+		try {
+			return _gtk_tool_item_retrieve_proxy_menu_item(item);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param item cast=(GtkToolItem *)
+	 * @param important cast=(gboolean)
+	 */
+	public static final native void _gtk_tool_item_set_is_important(long /*int*/ item, boolean important);
+	public static final void gtk_tool_item_set_is_important(long /*int*/ item, boolean important) {
+		lock.lock();
+		try {
+			_gtk_tool_item_set_is_important(item, important);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param item cast=(GtkToolItem *)
+	 * @param menu_id cast=(const gchar *)
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget);
+	public static final void gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_tool_item_set_proxy_menu_item(item, menu_id, widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param toolbar cast=(GtkToolbar *)
+	 * @param item cast=(GtkToolItem *)
+	 */
+	public static final native void _gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos);
+	public static final void gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos) {
+		lock.lock();
+		try {
+			_gtk_toolbar_insert(toolbar, item, pos);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_toolbar_new();
+	public static final long /*int*/ gtk_toolbar_new() {
+		lock.lock();
+		try {
+			return _gtk_toolbar_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param toolbar cast=(GtkToolbar *)
+	 * @param show_arrow cast=(gboolean)
+	 */
+	public static final native void _gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow);
+	public static final void gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow) {
+		lock.lock();
+		try {
+			_gtk_toolbar_set_show_arrow(toolbar, show_arrow);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param toolbar cast=(GtkToolbar *)
+	 * @param style cast=(GtkToolbarStyle)
+	 */
+	public static final native void _gtk_toolbar_set_style(long /*int*/ toolbar, int style);
+	public static final void gtk_toolbar_set_style(long /*int*/ toolbar, int style) {
+		lock.lock();
+		try {
+			_gtk_toolbar_set_style(toolbar, style);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param toolbar cast=(GtkToolbar *)
+	 */
+	public static final native void _gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size);
+	public static final void gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size) {
+		lock.lock();
+		try {
+			_gtk_toolbar_set_icon_size(toolbar, size);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, int terminator);
+	public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_tree_model_get(tree_model, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, int terminator);
+	public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_tree_model_get(tree_model, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param path cast=(GtkTreePath *)
+	 */
+	public static final native boolean _gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path);
+	public static final boolean gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_model_get_iter(tree_model, iter, path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native boolean _gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter);
+	public static final boolean gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter) {
+		lock.lock();
+		try {
+			return _gtk_tree_model_get_iter_first(tree_model, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_model cast=(GtkTreeModel *) */
+	public static final native int _gtk_tree_model_get_n_columns(long /*int*/ tree_model);
+	public static final int gtk_tree_model_get_n_columns(long /*int*/ tree_model) {
+		lock.lock();
+		try {
+			return _gtk_tree_model_get_n_columns(tree_model);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native long /*int*/ _gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter);
+	public static final long /*int*/ gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter) {
+		lock.lock();
+		try {
+			return _gtk_tree_model_get_path(tree_model, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_tree_model_get_type();
+	public static final long /*int*/ gtk_tree_model_get_type() {
+		lock.lock();
+		try {
+			return _gtk_tree_model_get_type();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param parent cast=(GtkTreeIter *)
+	 */
+	public static final native boolean _gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent);
+	public static final boolean gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent) {
+		lock.lock();
+		try {
+			return _gtk_tree_model_iter_children(model, iter, parent);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native int _gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter);
+	public static final int gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter) {
+		lock.lock();
+		try {
+			return _gtk_tree_model_iter_n_children(model, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native boolean _gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter);
+	public static final boolean gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter) {
+		lock.lock();
+		try {
+			return _gtk_tree_model_iter_next(model, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param parent cast=(GtkTreeIter *)
+	 */
+	public static final native boolean _gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n);
+	public static final boolean gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n) {
+		lock.lock();
+		try {
+			return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(GtkTreePath *) */
+	public static final native void _gtk_tree_path_append_index(long /*int*/ path, int index);
+	public static final void gtk_tree_path_append_index(long /*int*/ path, int index) {
+		lock.lock();
+		try {
+			_gtk_tree_path_append_index(path, index);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param a cast=(const GtkTreePath *)
+	 * @param b cast=(const GtkTreePath *)
+	 */
+	public static final native long /*int*/ _gtk_tree_path_compare(long /*int*/ a, long /*int*/ b);
+	public static final long /*int*/ gtk_tree_path_compare(long /*int*/ a, long /*int*/ b) {
+		lock.lock();
+		try {
+			 return _gtk_tree_path_compare(a, b);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(GtkTreePath *) */
+	public static final native void _gtk_tree_path_free(long /*int*/ path);
+	public static final void gtk_tree_path_free(long /*int*/ path) {
+		lock.lock();
+		try {
+			_gtk_tree_path_free(path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(GtkTreePath *) */
+	public static final native int _gtk_tree_path_get_depth(long /*int*/ path);
+	public static final int gtk_tree_path_get_depth(long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_path_get_depth(path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(GtkTreePath *) */
+	public static final native long /*int*/ _gtk_tree_path_get_indices(long /*int*/ path);
+	public static final long /*int*/ gtk_tree_path_get_indices(long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_path_get_indices(path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_tree_path_new();
+	public static final long /*int*/ gtk_tree_path_new() {
+		lock.lock();
+		try {
+			return _gtk_tree_path_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(const gchar *) */
+	public static final native long /*int*/ _gtk_tree_path_new_from_string(byte[] path);
+	public static final long /*int*/ gtk_tree_path_new_from_string(byte[] path) {
+		lock.lock();
+		try {
+			return _gtk_tree_path_new_from_string(path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(const gchar *) */
+	public static final native long /*int*/ _gtk_tree_path_new_from_string(long /*int*/ path);
+	public static final long /*int*/ gtk_tree_path_new_from_string(long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_path_new_from_string(path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(GtkTreePath *) */
+	public static final native void _gtk_tree_path_next(long /*int*/ path);
+	public static final void gtk_tree_path_next(long /*int*/ path) {
+		lock.lock();
+		try {
+			_gtk_tree_path_next(path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(GtkTreePath *) */
+	public static final native boolean _gtk_tree_path_prev(long /*int*/ path);
+	public static final boolean gtk_tree_path_prev(long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_path_prev(path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param path cast=(GtkTreePath *) */
+	public static final native boolean _gtk_tree_path_up(long /*int*/ path);
+	public static final boolean gtk_tree_path_up(long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_path_up(path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 */
+	public static final native int _gtk_tree_selection_count_selected_rows(long /*int*/ selection);
+	public static final int gtk_tree_selection_count_selected_rows(long /*int*/ selection) {
+		lock.lock();
+		try {
+			return _gtk_tree_selection_count_selected_rows(selection);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 * @param model cast=(GtkTreeModel **)
+	 */
+	public static final native long /*int*/ _gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model);
+	public static final long /*int*/ gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model) {
+		lock.lock();
+		try {
+			return _gtk_tree_selection_get_selected_rows(selection, model);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 * @param path cast=(GtkTreePath *)
+	 */
+	public static final native boolean _gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path);
+	public static final boolean gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_selection_path_is_selected(selection, path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param selection cast=(GtkTreeSelection *) */
+	public static final native void _gtk_tree_selection_select_all(long /*int*/ selection);
+	public static final void gtk_tree_selection_select_all(long /*int*/ selection) {
+		lock.lock();
+		try {
+			_gtk_tree_selection_select_all(selection);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter);
+	public static final void gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter) {
+		lock.lock();
+		try {
+			_gtk_tree_selection_select_iter(selection, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 */
+	public static final native long /*int*/ _gtk_tree_selection_get_select_function(long /*int*/ selection);
+	public static final long /*int*/ gtk_tree_selection_get_select_function(long /*int*/ selection) {
+		lock.lock();
+		try {
+			return _gtk_tree_selection_get_select_function(selection);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 * @param func cast=(GtkTreeSelectionFunc)
+	 * @param data cast=(gpointer)
+	 * @param destroy cast=(GDestroyNotify)
+	 */
+	public static final native void _gtk_tree_selection_set_select_function(long /*int*/ selection, long /*int*/ func, long /*int*/ data, long /*int*/ destroy);
+	public static final void gtk_tree_selection_set_select_function(long /*int*/ selection, long /*int*/ func, long /*int*/ data, long /*int*/ destroy) {
+		lock.lock();
+		try {
+			_gtk_tree_selection_set_select_function(selection, func, data, destroy);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 * @param path cast=(GtkTreePath *)
+	 */
+	public static final native void _gtk_tree_selection_select_path(long /*int*/ selection, long /*int*/ path);
+	public static final  void gtk_tree_selection_select_path(long /*int*/ selection, long /*int*/ path) {
+		lock.lock();
+		try {
+			_gtk_tree_selection_select_path(selection, path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 * @param mode cast=(GtkSelectionMode)
+	 */
+	public static final native void _gtk_tree_selection_set_mode(long /*int*/ selection, int mode);
+	public static final void gtk_tree_selection_set_mode(long /*int*/ selection, int mode) {
+		lock.lock();
+		try {
+			_gtk_tree_selection_set_mode(selection, mode);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 * @param path cast=(GtkTreePath *)
+	 */
+	public static final native void _gtk_tree_selection_unselect_path(long /*int*/ selection, long /*int*/ path);
+	public static final  void gtk_tree_selection_unselect_path(long /*int*/ selection, long /*int*/ path) {
+		lock.lock();
+		try {
+			_gtk_tree_selection_unselect_path(selection, path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param selection cast=(GtkTreeSelection *) */
+	public static final native void _gtk_tree_selection_unselect_all(long /*int*/ selection);
+	public static final void gtk_tree_selection_unselect_all(long /*int*/ selection) {
+		lock.lock();
+		try {
+			_gtk_tree_selection_unselect_all(selection);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param selection cast=(GtkTreeSelection *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter);
+	public static final void gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter) {
+		lock.lock();
+		try {
+			_gtk_tree_selection_unselect_iter(selection, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param parent cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent);
+	public static final void gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent) {
+		lock.lock();
+		try {
+			_gtk_tree_store_append(store, iter, parent);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param store cast=(GtkTreeStore *) */
+	public static final native void _gtk_tree_store_clear(long /*int*/ store);
+	public static final void gtk_tree_store_clear(long /*int*/ store) {
+		lock.lock();
+		try {
+			_gtk_tree_store_clear(store);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param parent cast=(GtkTreeIter *)
+	 * @param position cast=(gint)
+	 */
+	public static final native void _gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position);
+	public static final void gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position) {
+		lock.lock();
+		try {
+			_gtk_tree_store_insert(store, iter, parent, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param types cast=(GType *) */
+	public static final native long /*int*/ _gtk_tree_store_newv(int numColumns, long /*int*/[] types);
+	public static final long /*int*/ gtk_tree_store_newv(int numColumns, long /*int*/[] types) {
+		lock.lock();
+		try {
+			return _gtk_tree_store_newv(numColumns, types);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter);
+	public static final void gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter) {
+		lock.lock();
+		try {
+			_gtk_tree_store_remove(store, iter);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator);
+	public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_tree_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator);
+	public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_tree_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator);
+	public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_tree_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param value flags=no_out
+	 */
+	public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator);
+	public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator) {
+		lock.lock();
+		assert !GTK3 : "GTK2 code was run by GTK3";
+		try {
+			_gtk_tree_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 * @param value flags=no_out
+	 */
+	public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator);
+	public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator) {
+		lock.lock();
+		assert GTK3 : "GTK3 code was run by GTK2";
+		try {
+			_gtk_tree_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param store cast=(GtkTreeStore *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator);
+	public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator) {
+		lock.lock();
+		try {
+			_gtk_tree_store_set(store, iter, column, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 */
+	public static final native long /*int*/ _gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path);
+	public static final long /*int*/ gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_create_row_drag_icon(view, path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 */
+	public static final native boolean _gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path);
+	public static final boolean gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_collapse_row(view, path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param treeColumn cast=(GtkTreeViewColumn *)
+	 * @param cellRenderer cast=(GtkCellRenderer *)
+	 * @param attribute cast=(const gchar *)
+	 * @param column cast=(gint)
+	 */
+	public static final native void _gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column);
+	public static final void gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param cell_renderer cast=(GtkCellRenderer *)
+	 * @param start_pos cast=(gint *)
+	 * @param width cast=(gint *)
+	 */
+	public static final native boolean _gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width);
+	public static final boolean gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param cell_area cast=(GdkRectangle *),flags=no_in
+	 * @param x_offset cast=(gint *)
+	 * @param y_offset cast=(gint *)
+	 * @param width cast=(gint *)
+	 * @param height cast=(gint *)
+	 */
+	public static final native void _gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height);
+	public static final void gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param tree_model cast=(GtkTreeModel *)
+	 * @param iter cast=(GtkTreeIter *)
+	 */
+	public static final native void _gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded);
+	public static final void gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_column cast=(GtkTreeViewColumn *) */
+	public static final native void _gtk_tree_view_column_clear(long /*int*/ tree_column);
+	public static final void gtk_tree_view_column_clear(long /*int*/ tree_column) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_clear(tree_column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param column cast=(GtkTreeViewColumn *)
+	 */
+	public static final native long /*int*/_gtk_tree_view_column_get_button(long /*int*/ column);
+	public static final long /*int*/ gtk_tree_view_column_get_button(long /*int*/ column) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_column_get_button(column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param column cast=(GtkTreeViewColumn *) */
+	public static final native int _gtk_tree_view_column_get_fixed_width(long /*int*/ column);
+	public static final int gtk_tree_view_column_get_fixed_width(long /*int*/ column) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_column_get_fixed_width(column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param column cast=(GtkTreeViewColumn *) */
+	public static final native boolean _gtk_tree_view_column_get_reorderable(long /*int*/ column);
+	public static final boolean gtk_tree_view_column_get_reorderable(long /*int*/ column) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_column_get_reorderable(column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param column cast=(GtkTreeViewColumn *) */
+	public static final native boolean _gtk_tree_view_column_get_resizable(long /*int*/ column);
+	public static final boolean gtk_tree_view_column_get_resizable(long /*int*/ column) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_column_get_resizable(column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param column cast=(GtkTreeViewColumn *) */
+	public static final native boolean _gtk_tree_view_column_get_visible(long /*int*/ column);
+	public static final boolean gtk_tree_view_column_get_visible(long /*int*/ column) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_column_get_visible(column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param column cast=(GtkTreeViewColumn *) */
+	public static final native int _gtk_tree_view_column_get_width(long /*int*/ column);
+	public static final int gtk_tree_view_column_get_width(long /*int*/ column) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_column_get_width(column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_tree_view_column_new();
+	public static final long /*int*/ gtk_tree_view_column_new() {
+		lock.lock();
+		try {
+			return _gtk_tree_view_column_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param cell_renderer cast=(GtkCellRenderer *)
+	 * @param expand cast=(gboolean)
+	 */
+	public static final native void _gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);
+	public static final void gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param cell_renderer cast=(GtkCellRenderer *)
+	 * @param expand cast=(gboolean)
+	 */
+	public static final native void _gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);
+	public static final void gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_column cast=(GtkTreeViewColumn *) */
+	public static final native void _gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign);
+	public static final void gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_alignment(tree_column, xalign);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param cell_renderer cast=(GtkCellRenderer *)
+	 * @param func cast=(GtkTreeCellDataFunc)
+	 * @param func_data cast=(gpointer)
+	 * @param destroy cast=(GDestroyNotify)
+	 */
+	public static final native void _gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy);
+	public static final void gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param clickable cast=(gboolean)
+	 */
+	public static final native void _gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable);
+	public static final void gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_clickable(column, clickable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param fixed_width cast=(gint)
+	 */
+	public static final native void _gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width);
+	public static final void gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_fixed_width(column, fixed_width);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param min_width cast=(gint)
+	 */
+	public static final native void _gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width);
+	public static final void gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_min_width(tree_column, min_width);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param reorderable cast=(gboolean)
+	 */
+	public static final native void _gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable);
+	public static final void gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_reorderable(column, reorderable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param resizable cast=(gboolean)
+	 */
+	public static final native void _gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable);
+	public static final void gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_resizable(column, resizable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param type cast=(GtkTreeViewColumnSizing)
+	 */
+	public static final native void _gtk_tree_view_column_set_sizing(long /*int*/ column, int type);
+	public static final void gtk_tree_view_column_set_sizing(long /*int*/ column, int type) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_sizing(column, type);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param setting cast=(gboolean)
+	 */
+	public static final native void _gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting);
+	public static final void gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param order cast=(GtkSortType)
+	 */
+	public static final native void _gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order);
+	public static final void gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_sort_order(tree_column, order);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_column cast=(GtkTreeViewColumn *) */
+	public static final native void _gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible);
+	public static final void gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_visible(tree_column, visible);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_column cast=(GtkTreeViewColumn *)
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget);
+	public static final void gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_tree_view_column_set_widget(tree_column, widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 */
+	public static final native void _gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos);
+	public static final void gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos) {
+		lock.lock();
+		try {
+			_gtk_tree_view_set_drag_dest_row(view, path, pos);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 * @param open_all cast=(gboolean)
+	 */
+	public static final native boolean _gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all);
+	public static final boolean gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_expand_row(view, path, open_all);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param rect cast=(GdkRectangle *)
+	 */
+	public static final native void _gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);
+	public static final void gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) {
+		lock.lock();
+		try {
+			_gtk_tree_view_get_background_area(tree_view, path, column, rect);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_view cast=(GtkTreeView *) */
+	public static final native long /*int*/ _gtk_tree_view_get_bin_window(long /*int*/ tree_view);
+	public static final long /*int*/ gtk_tree_view_get_bin_window(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_bin_window(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param rect cast=(GdkRectangle *),flags=no_in
+	 */
+	public static final native void _gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);
+	public static final void gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) {
+		lock.lock();
+		try {
+			_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_view cast=(GtkTreeView *) */
+	public static final native long /*int*/_gtk_tree_view_get_expander_column(long /*int*/ tree_view);
+	public static final long /*int*/gtk_tree_view_get_expander_column(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_expander_column(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param n cast=(gint)
+	 */
+	public static final native long /*int*/ _gtk_tree_view_get_column(long /*int*/ tree_view, int n);
+	public static final long /*int*/ gtk_tree_view_get_column(long /*int*/ tree_view, int n) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_column(tree_view, n);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_view cast=(GtkTreeView *) */
+	public static final native long /*int*/ _gtk_tree_view_get_columns(long /*int*/ tree_view);
+	public static final long /*int*/ gtk_tree_view_get_columns(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_columns(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath **)
+	 * @param focus_column cast=(GtkTreeViewColumn **)
+	 */
+	public static final native void _gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column);
+	public static final void gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column) {
+		lock.lock();
+		try {
+			_gtk_tree_view_get_cursor(tree_view, path, focus_column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_view cast=(GtkTreeView *) */
+	public static final native boolean _gtk_tree_view_get_headers_visible(long /*int*/ tree_view);
+	public static final boolean gtk_tree_view_get_headers_visible(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_headers_visible(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param tree_view cast=(GtkTreeView *)
+	 */
+	public static final native long /*int*/ _gtk_tree_view_get_vadjustment(long /*int*/ tree_view);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final long /*int*/ gtk_tree_view_get_vadjustment(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_vadjustment(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param x cast=(gint)
+	 * @param y cast=(gint)
+	 * @param path cast=(GtkTreePath **)
+	 * @param column cast=(GtkTreeViewColumn **)
+	 * @param cell_x cast=(gint *)
+	 * @param cell_y cast=(gint *)
+	 */
+	public static final native boolean _gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y);
+	public static final boolean gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param tree_view cast=(GtkTreeView *)
+	 */
+	public static final native boolean _gtk_tree_view_get_rules_hint(long /*int*/ tree_view);
+	/** [GTK2/GTK3; 3.14 deprecated] */
+	public static final boolean gtk_tree_view_get_rules_hint(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_rules_hint(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_view cast=(GtkTreeView *) */
+	public static final native long /*int*/ _gtk_tree_view_get_selection(long /*int*/ tree_view);
+	public static final long /*int*/ gtk_tree_view_get_selection(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_selection(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param visible_rect flags=no_in
+	 */
+	public static final native void _gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect);
+	public static final void gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect) {
+		lock.lock();
+		try {
+			_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param position cast=(gint)
+	 */
+	public static final native int _gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position);
+	public static final int gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_insert_column(tree_view, column, position);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param base_column cast=(GtkTreeViewColumn *)
+	 */
+	public static final native void _gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/ base_column);
+	public static final void gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/base_column) {
+		lock.lock();
+		try {
+			_gtk_tree_view_move_column_after(tree_view, column, base_column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param model cast=(GtkTreeModel *) */
+	public static final native long /*int*/ _gtk_tree_view_new_with_model(long /*int*/ model);
+	public static final long /*int*/ gtk_tree_view_new_with_model(long /*int*/ model) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_new_with_model(model);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param column cast=(GtkTreeViewColumn *)
+	 */
+	public static final native void _gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column);
+	public static final void gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column) {
+		lock.lock();
+		try {
+			_gtk_tree_view_remove_column(tree_view, column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 */
+	public static final native boolean _gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path);
+	public static final boolean gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_row_expanded(view, path);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 * @param column cast=(GtkTreeViewColumn *)
+	 * @param use_align cast=(gboolean)
+	 * @param row_aligh cast=(gfloat)
+	 * @param column_align cast=(gfloat)
+	 */
+	public static final native void _gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align);
+	public static final void gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align) {
+		lock.lock();
+		try {
+			_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param tree_x cast=(gint)
+	 * @param tree_y cast=(gint)
+	 */
+	public static final native void _gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y);
+	public static final void gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y) {
+		lock.lock();
+		try {
+			_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param path cast=(GtkTreePath *)
+	 * @param focus_column cast=(GtkTreeViewColumn *)
+	 */
+	public static final native void _gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing);
+	public static final void gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing) {
+		lock.lock();
+		try {
+			_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView*)
+	 * @param grid_lines cast=(GtkTreeViewGridLines)
+	 */
+	public static final native void _gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines);
+	public static final void gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines) {
+		lock.lock();
+		try {
+			_gtk_tree_view_set_grid_lines(tree_view, grid_lines);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView*)
+	 */
+	public static final native int _gtk_tree_view_get_grid_lines(long /*int*/ tree_view);
+	public static final int gtk_tree_view_get_grid_lines(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			return _gtk_tree_view_get_grid_lines(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param visible cast=(gboolean)
+	 */
+	public static final native void _gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible);
+	public static final void gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible) {
+		lock.lock();
+		try {
+			_gtk_tree_view_set_headers_visible(tree_view, visible);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param model cast=(GtkTreeModel *)
+	 */
+	public static final native void _gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model);
+	public static final void gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model) {
+		lock.lock();
+		try {
+			_gtk_tree_view_set_model(tree_view, model);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param tree_view cast=(GtkTreeView *)
+	 */
+	public static final native void _gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting);
+	/** [GTK2/GTK3; 3.14 deprecated] */
+	public static final void gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting) {
+		lock.lock();
+		try {
+			_gtk_tree_view_set_rules_hint(tree_view, setting);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param column cast=(gint)
+	 */
+	public static final native void _gtk_tree_view_set_search_column(long /*int*/ tree_view, int column);
+	public static final void gtk_tree_view_set_search_column(long /*int*/ tree_view, int column) {
+		lock.lock();
+		try {
+			_gtk_tree_view_set_search_column(tree_view, column);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param tree_view cast=(GtkTreeView *) */
+	public static final native void _gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view);
+	public static final void gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view) {
+		lock.lock();
+		try {
+			_gtk_tree_view_unset_rows_drag_dest(tree_view);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param tree_view cast=(GtkTreeView *)
+	 * @param bx cast=(gint)
+	 * @param by cast=(gint)
+	 * @param tx cast=(gint *)
+	 * @param ty cast=(gint *)
+	 */
+	public static final native void _gtk_tree_view_convert_bin_window_to_tree_coords(long /*int*/ tree_view, int bx, int by, int[] tx, int[] ty);
+	public static final void gtk_tree_view_convert_bin_window_to_tree_coords(long /*int*/ tree_view, int bx, int by, int[] tx, int[] ty) {
+		lock.lock();
+		try {
+			_gtk_tree_view_convert_bin_window_to_tree_coords(tree_view, bx, by, tx, ty);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param homogeneous cast=(gboolean)
+	 * @param spacing cast=(gint)
+	 */
+	public static final native long /*int*/ _gtk_vbox_new(boolean homogeneous, int spacing);
+	/** [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_vbox_new(boolean homogeneous, int spacing) {
+		lock.lock();
+		try {
+			return _gtk_vbox_new(homogeneous, spacing);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param viewport cast=(GtkViewport *)
+	 * @param type cast=(GtkShadowType)
+	 */
+	public static final native void _gtk_viewport_set_shadow_type(long /*int*/ viewport, int type);
+	public static final void gtk_viewport_set_shadow_type(long /*int*/ viewport, int type) {
+		lock.lock();
+		try {
+			_gtk_viewport_set_shadow_type(viewport, type);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native long /*int*/ _gtk_vscale_new(long /*int*/ adjustment);
+	/** [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_vscale_new(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_vscale_new(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param adjustment cast=(GtkAdjustment *)
+	 */
+	public static final native long /*int*/ _gtk_vscrollbar_new(long /*int*/ adjustment);
+	/**  [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_vscrollbar_new(long /*int*/ adjustment) {
+		lock.lock();
+		try {
+			return _gtk_vscrollbar_new(adjustment);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_vseparator_new();
+	/** [GTK2/GTK3; 3.2 deprecated] */
+	public static final long /*int*/ gtk_vseparator_new() {
+		lock.lock();
+		try {
+			return _gtk_vseparator_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param accel_signal cast=(const gchar *)
+	 * @param accel_group cast=(GtkAccelGroup *)
+	 * @param accel_key cast=(guint)
+	 * @param accel_mods cast=(GdkModifierType)
+	 */
+	public static final native void _gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags);
+	public static final void gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags) {
+		lock.lock();
+		try {
+			_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param events cast=(gint)
+	 */
+	public static final native void _gtk_widget_add_events(long /*int*/ widget, int events);
+	public static final void gtk_widget_add_events(long /*int*/ widget, int events) {
+		lock.lock();
+		try {
+			_gtk_widget_add_events(widget, events);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_child_focus(long /*int*/ widget, int direction);
+	public static final boolean gtk_widget_child_focus(long /*int*/ widget, int direction) {
+		lock.lock();
+		try {
+			return _gtk_widget_child_focus(widget, direction);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param text cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text);
+	public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text) {
+		lock.lock();
+		try {
+			return _gtk_widget_create_pango_layout(widget, text);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param text cast=(const gchar *)
+	 */
+	public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text);
+	public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text) {
+		lock.lock();
+		try {
+			return _gtk_widget_create_pango_layout(widget, text);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_destroy(long /*int*/ widget);
+	public static final void gtk_widget_destroy(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_widget_destroy(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic [GTK3; GTK2 deprecated (different signature)] */
+	public static final native void _gtk_widget_draw(long /*int*/ widget, long /*int*/ cr);
+	public static final void gtk_widget_draw(long /*int*/ widget, long /*int*/ cr) {
+		lock.lock();
+		try {
+			_gtk_widget_draw(widget, cr);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param event cast=(GdkEvent *)
+	 */
+	public static final native boolean _gtk_widget_event(long /*int*/ widget, long /*int*/ event);
+	public static final boolean gtk_widget_event(long /*int*/ widget, long /*int*/ event) {
+		lock.lock();
+		try {
+			return _gtk_widget_event(widget, event);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ _gtk_widget_get_accessible (long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_accessible (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_accessible(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_get_visible (long /*int*/ widget);
+	public static final boolean gtk_widget_get_visible (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_visible(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_get_realized (long /*int*/ widget);
+	public static final boolean gtk_widget_get_realized (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_realized(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_get_has_window (long /*int*/ widget);
+	public static final boolean gtk_widget_get_has_window (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_has_window(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_get_can_default (long /*int*/ widget);
+	public static final boolean gtk_widget_get_can_default (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_can_default(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_get_child_visible (long /*int*/ widget);
+	public static final boolean gtk_widget_get_child_visible (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_child_visible(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_widget_get_default_style();
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final long /*int*/ gtk_widget_get_default_style() {
+		lock.lock();
+		try {
+			return _gtk_widget_get_default_style();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native int _gtk_widget_get_events(long /*int*/ widget);
+	public static final int gtk_widget_get_events(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_events(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ _gtk_widget_get_window (long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_window (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_window(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native long /*int*/ _gtk_widget_get_modifier_style(long /*int*/ widget);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final long /*int*/ gtk_widget_get_modifier_style(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_modifier_style(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *)  */
+	public static final native boolean _gtk_widget_get_mapped(long /*int*/ widget);
+	public static final boolean gtk_widget_get_mapped(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_mapped(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ _gtk_widget_get_pango_context(long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_pango_context(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_pango_context(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ _gtk_widget_get_parent(long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_parent(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_parent(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ _gtk_widget_get_parent_window(long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_parent_window(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_parent_window(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param allocation cast=(GtkAllocation *),flags=no_in
+	 * */
+	public static final native void _gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation);
+	public static final void gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation) {
+		lock.lock();
+		try {
+			_gtk_widget_get_allocation(widget, allocation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param x cast=(gdouble)
+	 * @param y cast=(gdouble)
+	 * @param width cast=(gdouble)
+	 * @param height cast=(gdouble)
+	 */
+	public static final native void _gtk_render_handle(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height);
+	public static final void gtk_render_handle(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) {
+		lock.lock();
+		try {
+			_gtk_render_handle(context,cr, x ,y, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native long /*int*/ _gtk_widget_get_style_context(long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_style_context(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_style_context(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native long /*int*/ _gtk_widget_get_style(long /*int*/ widget);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final long /*int*/ gtk_widget_get_style(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_style(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param width cast=(gint *)
+	 * @param height cast=(gint *)
+	 */
+	public static final native void _gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height);
+	public static final void gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height) {
+		lock.lock();
+		try {
+			_gtk_widget_get_size_request(widget, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ _gtk_widget_get_toplevel (long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_toplevel (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_toplevel(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native long /*int*/ _gtk_widget_get_tooltip_text (long /*int*/ widget);
+	public static final long /*int*/ gtk_widget_get_tooltip_text (long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_tooltip_text(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_grab_focus(long /*int*/ widget);
+	public static final void gtk_widget_grab_focus(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_widget_grab_focus(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_has_focus(long /*int*/ widget);
+	public static final boolean gtk_widget_has_focus(long /*int*/ widget) {
+	       lock.lock();
+	       try {
+	               return _gtk_widget_has_focus(widget);
+	       } finally {
+	               lock.unlock();
+	       }
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_hide(long /*int*/ widget);
+	public static final void gtk_widget_hide(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_widget_hide(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_widget_input_shape_combine_region(long /*int*/ widget, long /*int*/ region);
+	public static final void gtk_widget_input_shape_combine_region(long /*int*/ widget, long /*int*/ region) {
+		lock.lock();
+		try {
+			_gtk_widget_input_shape_combine_region(widget, region);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native boolean _gtk_widget_is_composited(long /*int*/ widget);
+	/** [GTK2/GTK3; 3.22 deprecated] */
+	public static final boolean gtk_widget_is_composited(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_is_composited(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native boolean _gtk_widget_is_focus(long /*int*/ widget);
+	public static final boolean gtk_widget_is_focus(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_is_focus(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_map(long /*int*/ widget);
+	public static final void gtk_widget_map(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_widget_map(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param group_cycling cast=(gboolean)
+	 */
+	public static final native boolean _gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling);
+	public static final boolean gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling) {
+		lock.lock();
+		try {
+			return _gtk_widget_mnemonic_activate(widget, group_cycling);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param state cast=(GtkStateType)
+	 * @param color cast=(GdkColor *),flags=no_out
+	 */
+	public static final native void _gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_widget_modify_base(widget, state, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param state cast=(GtkStateType)
+	 * @param color cast=(GdkColor *),flags=no_out
+	 */
+	public static final native void _gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color) {
+		lock.lock();
+		try {
+			_gtk_widget_modify_bg(widget, state, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param pango_font_descr cast=(PangoFontDescription *)
+	 */
+	public static final native void _gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr) {
+		lock.lock();
+		try {
+			_gtk_widget_modify_font(widget, pango_font_descr);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param style cast=(GtkRcStyle *)
+	 */
+	public static final native void _gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style) {
+		lock.lock();
+		try {
+			_gtk_widget_modify_style(widget, style);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_widget_override_color(long /*int*/ widget, int state, GdkRGBA color);
+	/** [GTK3; 3.16 deprecated]*/
+	public static final void gtk_widget_override_color(long /*int*/ widget, int state, GdkRGBA color) {
+		lock.lock();
+		try {
+			_gtk_widget_override_color(widget, state, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_widget_override_background_color(long /*int*/ widget, int state, GdkRGBA color);
+	/** [GTK3; 3.16 deprecated] */
+	public static final void gtk_widget_override_background_color(long /*int*/ widget, int state, GdkRGBA color) {
+		lock.lock();
+		try {
+			_gtk_widget_override_background_color(widget, state, color);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 */
+	public static final native void _gtk_widget_override_font(long /*int*/ widget, long /*int*/ font);
+	/** [GTK3; 3.16 deprecated] */
+	public static final void gtk_widget_override_font(long /*int*/ widget, long /*int*/ font) {
+		lock.lock();
+		try {
+			_gtk_widget_override_font(widget, font);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_queue_resize(long /*int*/ widget);
+	public static final void gtk_widget_queue_resize(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_widget_queue_resize(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_realize(long /*int*/ widget);
+	public static final void gtk_widget_realize(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_widget_realize(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param accel_group cast=(GtkAccelGroup *)
+	 * @param accel_key cast=(guint)
+	 * @param accel_mods cast=(GdkModifierType)
+	 */
+	public static final native void _gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods);
+	public static final void gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods) {
+		lock.lock();
+		try {
+			_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param new_parent cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent);
+	public static final void gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent) {
+		lock.lock();
+		try {
+			_gtk_widget_reparent(widget, new_parent);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param event cast=(GdkEvent *)
+	 */
+	public static final native int _gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event);
+	public static final int gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event) {
+		lock.lock();
+		try {
+			return _gtk_widget_send_expose(widget, event);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable);
+	public static final void gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable) {
+		lock.lock();
+		try {
+			_gtk_widget_set_app_paintable(widget, app_paintable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param dir cast=(GtkTextDirection) */
+	public static final native void _gtk_widget_set_default_direction(int dir);
+	public static final void gtk_widget_set_default_direction(int dir) {
+		lock.lock();
+		try {
+			_gtk_widget_set_default_direction(dir);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param can_default cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_can_default(long /*int*/ widget, boolean can_default);
+	public static final void gtk_widget_set_can_default(long /*int*/ widget, boolean can_default) {
+		lock.lock();
+		try {
+			_gtk_widget_set_can_default(widget,can_default) ;
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_queue_draw(long /*int*/ widget);
+	public static final void gtk_widget_queue_draw(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_widget_queue_draw(widget) ;
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param can_focus cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_can_focus(long /*int*/ widget, boolean can_focus);
+	public static final void gtk_widget_set_can_focus(long /*int*/ widget, boolean can_focus) {
+		lock.lock();
+		try {
+			_gtk_widget_set_can_focus(widget,can_focus);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param mapped cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_mapped(long /*int*/ widget, boolean mapped);
+	public static final void gtk_widget_set_mapped(long /*int*/ widget, boolean mapped) {
+		lock.lock();
+		try {
+			_gtk_widget_set_mapped(widget,mapped);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param visible cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_visible(long /*int*/ widget, boolean visible);
+	public static final void gtk_widget_set_visible(long /*int*/ widget, boolean visible) {
+		lock.lock();
+		try {
+			_gtk_widget_set_visible(widget, visible);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param dir cast=(GtkTextDirection)
+	 */
+	public static final native void _gtk_widget_set_direction(long /*int*/ widget, int dir);
+	public static final void gtk_widget_set_direction(long /*int*/ widget, int dir) {
+		lock.lock();
+		try {
+			_gtk_widget_set_direction(widget, dir);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param receives_default cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_receives_default(long /*int*/ widget, boolean receives_default);
+	public static final void gtk_widget_set_receives_default(long /*int*/ widget, boolean receives_default) {
+		lock.lock();
+		try {
+			_gtk_widget_set_receives_default(widget, receives_default);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param double_buffered cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered);
+	public static final void gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered) {
+		lock.lock();
+		try {
+			_gtk_widget_set_double_buffered(widget, double_buffered);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param val cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_focus_on_click(long /*int*/ widget, boolean val);
+	public static final void gtk_widget_set_focus_on_click(long /*int*/ widget, boolean val) {
+		lock.lock();
+		try {
+			_gtk_widget_set_focus_on_click(widget, val);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param name cast=(const char *)
+	 */
+	public static final native void _gtk_widget_set_name(long /*int*/ widget, byte[] name);
+	public static final void gtk_widget_set_name(long /*int*/ widget, byte[] name) {
+		lock.lock();
+		try {
+			_gtk_widget_set_name(widget, name);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_widget_set_opacity(long /*int*/ widget, double opacity);
+	public static final void gtk_widget_set_opacity(long /*int*/ widget, double opacity) {
+		lock.lock();
+		try {
+			_gtk_widget_set_opacity(widget, opacity);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native double _gtk_widget_get_opacity(long /*int*/ widget);
+	public static final double gtk_widget_get_opacity(long /*int*/ widget) {
+		lock.lock();
+		try {
+			return _gtk_widget_get_opacity(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param redraw cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw);
+	public static final void gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw) {
+		lock.lock();
+		try {
+			_gtk_widget_set_redraw_on_allocate(widget, redraw);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param sensitive cast=(gboolean)
+	 */
+	public static final native void _gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive);
+	public static final void gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive) {
+		lock.lock();
+		try {
+			_gtk_widget_set_sensitive(widget, sensitive);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param width cast=(gint)
+	 * @param height cast=(gint)
+	 */
+	public static final native void _gtk_widget_set_size_request(long /*int*/ widget, int width, int height);
+	public static final void gtk_widget_set_size_request(long /*int*/ widget, int width, int height) {
+		lock.lock();
+		try {
+			_gtk_widget_set_size_request(widget, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param state cast=(GtkStateType)
+	 */
+	public static final native void _gtk_widget_set_state(long /*int*/ widget, int state);
+	/** [GTK2/GTK3; 3.0 deprecated] */
+	public static final void gtk_widget_set_state(long /*int*/ widget, int state) {
+		lock.lock();
+		try {
+			_gtk_widget_set_state(widget, state);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param widget cast=(GtkWidget *) */
+	public static final native void _gtk_widget_show(long /*int*/ widget);
+	public static final void gtk_widget_show(long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_widget_show(widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param allocation cast=(GtkAllocation *),flags=no_out
+	 */
+	public static final native void _gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation);
+	public static final void gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation) {
+		lock.lock();
+		try {
+			_gtk_widget_size_allocate(widget, allocation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param widget cast=(GtkWidget *)
+	 * @param requisition cast=(GtkRequisition *),flags=no_in
+	 */
+	public static final native void _gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition);
+	/** [GTK2/GTK3; 2.x/3.0 deprecated] */
+	public static final void gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition) {
+		lock.lock();
+		try {
+			_gtk_widget_size_request(widget, requisition);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param allocation cast=(GtkAllocation *),flags=no_out
+	 */
+	public static final native void _gtk_widget_set_allocation(long /*int*/ widget, GtkAllocation allocation);
+	public static final void gtk_widget_set_allocation(long /*int*/ widget, GtkAllocation allocation) {
+		lock.lock();
+		try {
+			_gtk_widget_set_allocation(widget, allocation);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param property_name cast=(const gchar *)
+	 * @param terminator cast=(const gchar *),flags=sentinel
+	 */
+	public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator);
+	public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator) {
+		lock.lock();
+		try {
+			_gtk_widget_style_get(widget, property_name, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param property_name cast=(const gchar *)
+	 * @param terminator cast=(const gchar *),flags=sentinel
+	 */
+	public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator);
+	public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator) {
+		lock.lock();
+		try {
+			_gtk_widget_style_get(widget, property_name, value, terminator);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param src_widget cast=(GtkWidget *)
+	 * @param dest_widget cast=(GtkWidget *)
+	 * @param dest_x cast=(gint *)
+	 * @param dest_y cast=(gint *)
+	 */
+	public static final native boolean _gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y);
+	public static final boolean gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) {
+		lock.lock();
+		try {
+			return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param window cast=(GtkWindow *) */
+	public static final native boolean _gtk_window_activate_default(long /*int*/ window);
+	public static final boolean gtk_window_activate_default(long /*int*/ window) {
+		lock.lock();
+		try {
+			return _gtk_window_activate_default(window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param accel_group cast=(GtkAccelGroup *)
+	 */
+	public static final native void _gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group);
+	public static final void gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group) {
+		lock.lock();
+		try {
+			_gtk_window_add_accel_group(window, accel_group);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param handle cast=(GtkWindow *) */
+	public static final native void _gtk_window_deiconify(long /*int*/ handle);
+	public static final void gtk_window_deiconify(long /*int*/ handle) {
+		lock.lock();
+		try {
+			_gtk_window_deiconify(handle);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param window cast=(GtkWindow *) */
+	public static final native long /*int*/ _gtk_window_get_focus(long /*int*/ window);
+	public static final long /*int*/ gtk_window_get_focus(long /*int*/ window) {
+		lock.lock();
+		try {
+			return _gtk_window_get_focus(window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 */
+	public static final native long /*int*/ _gtk_window_get_group(long /*int*/ window);
+	public static final long /*int*/ gtk_window_get_group(long /*int*/ window) {
+		lock.lock();
+		try {
+			return _gtk_window_get_group(window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param window cast=(GtkWindow *) */
+	public static final native long /*int*/ _gtk_window_get_icon_list(long /*int*/ window);
+	public static final long /*int*/ gtk_window_get_icon_list(long /*int*/ window) {
+		lock.lock();
+		try {
+			return _gtk_window_get_icon_list(window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param window cast=(GtkWindow *) */
+	public static final native boolean _gtk_window_get_modal(long /*int*/ window);
+	public static final boolean gtk_window_get_modal(long /*int*/ window) {
+		lock.lock();
+		try {
+			return _gtk_window_get_modal(window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param window cast=(GtkWindow *) */
+	public static final native int _gtk_window_get_mnemonic_modifier(long /*int*/ window);
+	public static final int gtk_window_get_mnemonic_modifier(long /*int*/ window) {
+		lock.lock();
+		try {
+			return _gtk_window_get_mnemonic_modifier(window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param window cast=(GtkWindow *)
+	 */
+	public static final native double _gtk_window_get_opacity (long /*int*/ window);
+	/** [GTK2/GTK3; 3.8 deprecated] */
+	public static final double gtk_window_get_opacity (long /*int*/ window) {
+		lock.lock();
+		try {
+			return _gtk_window_get_opacity (window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param handle cast=(GtkWindow *)
+	 * @param x cast=(gint *)
+	 * @param y cast=(gint *)
+	 */
+	public static final native void _gtk_window_get_position(long /*int*/ handle, int[] x, int[] y);
+	public static final void gtk_window_get_position(long /*int*/ handle, int[] x, int[] y) {
+		lock.lock();
+		try {
+			_gtk_window_get_position(handle, x, y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param group cast=(GtkWindowGroup*)
+	 * @param window cast=(GtkWindow*)
+	 */
+	public static final native void _gtk_window_group_add_window(long /*int*/ group, long /*int*/ window);
+	public static final void gtk_window_group_add_window(long /*int*/ group, long /*int*/ window) {
+		lock.lock();
+		try {
+			_gtk_window_group_add_window(group, window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param group cast=(GtkWindowGroup*)
+	 * @param window cast=(GtkWindow*)
+	 */
+	public static final native void _gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window);
+	public static final void gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window) {
+		lock.lock();
+		try {
+			_gtk_window_group_remove_window(group, window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_window_group_new();
+	public static final long /*int*/ gtk_window_group_new() {
+		lock.lock();
+		try {
+			return _gtk_window_group_new();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param handle cast=(GtkWindow *) */
+	public static final native boolean _gtk_window_is_active(long /*int*/ handle);
+	public static final boolean gtk_window_is_active(long /*int*/ handle) {
+		lock.lock();
+		try {
+			return _gtk_window_is_active(handle);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param handle cast=(GtkWindow *) */
+	public static final native void _gtk_window_iconify(long /*int*/ handle);
+	public static final void gtk_window_iconify(long /*int*/ handle) {
+		lock.lock();
+		try {
+			_gtk_window_iconify(handle);
+		} finally {
+			lock.unlock();
+		}
+	}
+	public static final native long /*int*/ _gtk_window_list_toplevels ();
+	public static final long /*int*/ gtk_window_list_toplevels () {
+		lock.lock();
+		try {
+			return _gtk_window_list_toplevels ();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param handle cast=(GtkWindow *) */
+	public static final native void _gtk_window_maximize(long /*int*/ handle);
+	public static final void gtk_window_maximize(long /*int*/ handle) {
+		lock.lock();
+		try {
+			_gtk_window_maximize(handle);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param handle cast=(GtkWindow *) */
+	public static final native void _gtk_window_fullscreen(long /*int*/ handle);
+	public static final void gtk_window_fullscreen(long /*int*/ handle) {
+		lock.lock();
+		try {
+			_gtk_window_fullscreen(handle);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param handle cast=(GtkWindow *) */
+	public static final native void _gtk_window_unfullscreen(long /*int*/ handle);
+	public static final void gtk_window_unfullscreen(long /*int*/ handle) {
+		lock.lock();
+		try {
+			_gtk_window_unfullscreen(handle);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param handle cast=(GtkWindow *)
+	 * @param x cast=(gint)
+	 * @param y cast=(gint)
+	 */
+	public static final native void _gtk_window_move(long /*int*/ handle, int x, int y);
+	public static final void gtk_window_move(long /*int*/ handle, int x, int y) {
+		lock.lock();
+		try {
+			_gtk_window_move(handle, x, y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param type cast=(GtkWindowType) */
+	public static final native long /*int*/ _gtk_window_new(int type);
+	public static final long /*int*/ gtk_window_new(int type) {
+		lock.lock();
+		try {
+			return _gtk_window_new(type);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param accel_group cast=(GtkAccelGroup *)
+	 */
+	public static final native void _gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group);
+	public static final void gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group) {
+		lock.lock();
+		try {
+			_gtk_window_remove_accel_group(window, accel_group);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param handle cast=(GtkWindow *)
+	 * @param x cast=(gint)
+	 * @param y cast=(gint)
+	 */
+	public static final native void _gtk_window_resize(long /*int*/ handle, int x, int y);
+	public static final void gtk_window_resize(long /*int*/ handle, int x, int y) {
+		lock.lock();
+		try {
+			_gtk_window_resize(handle, x, y);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param handle cast=(GtkWindow *)
+	 * @param width cast=(gint *)
+	 * @param height cast=(gint *)
+	 */
+	public static final native void _gtk_window_get_size(long /*int*/ handle, int[] width, int[] height);
+	public static final void gtk_window_get_size(long /*int*/ handle, int[] width, int[] height) {
+		lock.lock();
+		try {
+			_gtk_window_get_size(handle, width, height);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param widget cast=(GtkWidget *)
+	 */
+	public static final native void _gtk_window_set_default(long /*int*/ window, long /*int*/ widget);
+	public static final void gtk_window_set_default(long /*int*/ window, long /*int*/ widget) {
+		lock.lock();
+		try {
+			_gtk_window_set_default(window, widget);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param decorated cast=(gboolean)
+	 */
+	public static final native void _gtk_window_set_decorated(long /*int*/ window, boolean decorated);
+	public static final void gtk_window_set_decorated(long /*int*/ window, boolean decorated) {
+		lock.lock();
+		try {
+			_gtk_window_set_decorated(window, decorated);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param setting cast=(gboolean)
+	 */
+	public static final native void _gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting);
+	public static final void gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting) {
+		lock.lock();
+		try {
+			_gtk_window_set_destroy_with_parent(window, setting);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param geometry_widget cast=(GtkWidget *)
+	 * @param geometry flags=no_out
+	 */
+	public static final native void _gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask);
+	public static final void gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask) {
+		lock.lock();
+		try {
+			_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param list cast=(GList *)
+	 */
+	public static final native void _gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list);
+	public static final void gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list) {
+		lock.lock();
+		try {
+			_gtk_window_set_icon_list(window, list);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param modal cast=(gboolean)
+	 */
+	public static final native void _gtk_window_set_modal(long /*int*/ window, boolean modal);
+	public static final void gtk_window_set_modal(long /*int*/ window, boolean modal) {
+		lock.lock();
+		try {
+			_gtk_window_set_modal(window, modal);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @method flags=dynamic
+	 * @param window cast=(GtkWindow *)
+	 */
+	public static final native void _gtk_window_set_opacity(long /*int*/ window, double opacity);
+	/** [GTK2/GTK3; 3.8 deprecated] */
+	public static final void gtk_window_set_opacity(long /*int*/ window, double opacity) {
+		lock.lock();
+		try {
+			 _gtk_window_set_opacity(window, opacity);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param tip_text cast=(const gchar *)
+	 */
+	public static final native void _gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text);
+	public static final void gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text) {
+		lock.lock();
+		try {
+			_gtk_widget_set_tooltip_text(widget, tip_text);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param widget cast=(GtkWidget *)
+	 * @param parent_window cast=(GdkWindow *)
+	 */
+	public static final native void _gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window);
+	public static final void gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window) {
+		lock.lock();
+		try {
+			_gtk_widget_set_parent_window(widget, parent_window);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param resizable cast=(gboolean)
+	 */
+	public static final native void _gtk_window_set_resizable(long /*int*/ window, boolean resizable);
+	public static final void gtk_window_set_resizable(long /*int*/ window, boolean resizable) {
+		lock.lock();
+		try {
+			_gtk_window_set_resizable(window, resizable);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param title cast=(const gchar *)
+	 */
+	public static final native void _gtk_window_set_title(long /*int*/ window, byte[] title);
+	public static final void gtk_window_set_title(long /*int*/ window, byte[] title) {
+		lock.lock();
+		try {
+			_gtk_window_set_title(window, title);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param skips_taskbar cast=(gboolean)
+	 */
+	public static final native void _gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar);
+	public static final void gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar) {
+		lock.lock();
+		try {
+			_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param window cast=(GtkWindow *) */
+	public static final native void _gtk_window_set_type_hint(long /*int*/ window, int hint);
+	public static final void gtk_window_set_type_hint(long /*int*/ window, int hint) {
+		lock.lock();
+		try {
+			_gtk_window_set_type_hint(window, hint);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/**
+	 * @param window cast=(GtkWindow *)
+	 * @param parent cast=(GtkWindow *)
+	 */
+	public static final native void _gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent);
+	public static final void gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent) {
+		lock.lock();
+		try {
+			_gtk_window_set_transient_for(window, parent);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @param handle cast=(GtkWindow *) */
+	public static final native void _gtk_window_unmaximize(long /*int*/ handle);
+	public static final void gtk_window_unmaximize(long /*int*/ handle) {
+		lock.lock();
+		try {
+			_gtk_window_unmaximize(handle);
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native long /*int*/ _gtk_printer_option_widget_get_type();
+	public static final long /*int*/ gtk_printer_option_widget_get_type() {
+		lock.lock();
+		try {
+			return _gtk_printer_option_widget_get_type();
+		} finally {
+			lock.unlock();
+		}
+	}
+	/** @method flags=dynamic */
+	public static final native void _gtk_widget_shape_combine_region(long /*int*/ widget, long /*int*/ region);
+	public static final void gtk_widget_shape_combine_region(long /*int*/ widget, long /*int*/ region) {
+		lock.lock();
+		try {
+			_gtk_widget_shape_combine_region(widget,region);
+		} finally {
+			lock.unlock();
+		}
+	}
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkAllocation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkAllocation.java
index ca499d47d3..b7791d8e0f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkAllocation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkAllocation.java
@@ -20,5 +20,5 @@ public class GtkAllocation {
 	public int y;
 	public int width;
 	public int height;
-	public static final int sizeof = OS.GtkAllocation_sizeof();
+	public static final int sizeof = GTK.GtkAllocation_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkBorder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkBorder.java
index d08d960c7c..e18d56d8d9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkBorder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkBorder.java
@@ -20,5 +20,5 @@ public class GtkBorder {
 	public int right;
 	public int top;
 	public int bottom;
-	public static final int sizeof = OS.GtkBorder_sizeof();
+	public static final int sizeof = GTK.GtkBorder_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkRequisition.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkRequisition.java
index 56ffcf2f9f..c830166a0d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkRequisition.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkRequisition.java
@@ -18,5 +18,5 @@ package org.eclipse.swt.internal.gtk;
 public class GtkRequisition {
 	public int width;
 	public int height;
-	public static final int sizeof = OS.GtkRequisition_sizeof();
+	public static final int sizeof = GTK.GtkRequisition_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
index 0326844472..24d60bcb58 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
@@ -22,5 +22,5 @@ public class GtkTargetEntry {
 	public int flags;
 	/** @field cast=(guint) */
 	public int info;
-	public static final int sizeof = OS.GtkTargetEntry_sizeof();
+	public static final int sizeof = GTK.GtkTargetEntry_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 8930c19657..6f5f4a7d92 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -110,7 +110,7 @@ public class OS extends C {
 	static {
 		String swt_lib_versions = getEnvironmentalVariable (OS.SWT_LIB_VERSIONS); // Note, this is read in multiple places.
 		if (swt_lib_versions != null && swt_lib_versions.equals("1")) {
-			System.out.print("SWT_LIB_Gtk:"+gtk_major_version()+"."+gtk_minor_version()+"."+gtk_micro_version());
+			System.out.print("SWT_LIB_Gtk:"+GTK.gtk_major_version()+"."+GTK.gtk_minor_version()+"."+GTK.gtk_micro_version());
 			System.out.print(" (Dynamic gdbus)");
 			System.out.println("");
 		}
@@ -189,10 +189,6 @@ public class OS extends C {
 	public static final int GDK_ENTER_NOTIFY_MASK = 0x1000;
 	public static final int GDK_ENTER_NOTIFY = 10;
 	public static final int GDK_EVEN_ODD_RULE = 0;
-	public static final int GTK_EXPANDER_COLAPSED = 0;
-	public static final int GTK_EXPANDER_SEMI_COLLAPSED = 1;
-	public static final int GTK_EXPANDER_SEMI_EXPANDED = 2;
-	public static final int GTK_EXPANDER_EXPANDED = 3;
 	public static final int GDK_EXPOSE = 2;
 	public static final int GDK_EXPOSURE_MASK = 0x2;
 	public static final int GDK_End = 0xff57;
@@ -339,173 +335,12 @@ public class OS extends C {
 	public static final int GDK_WINDOW_STATE_ICONIFIED  = 1 << 1;
 	public static final int GDK_WINDOW_STATE_MAXIMIZED  = 1 << 2;
 	public static final int GDK_WINDOW_STATE_FULLSCREEN  = 1 << 4;
-	public static final int GTK_ACCEL_VISIBLE = 0x1;
-	public static final int GTK_ARROW_DOWN = 0x1; //GtkArrowType Enum. In general, for gtk3 GtkAlign enum is favored.
-	public static final int GTK_ARROW_LEFT = 0x2;
-	public static final int GTK_ARROW_RIGHT = 0x3;
-	public static final int GTK_ARROW_UP = 0x0;
-	public static final int GTK_ALIGN_FILL = 0x0; //Gtk3 GtkAlign Enum
-	public static final int GTK_ALIGN_START = 0x1;
-	public static final int GTK_ALIGN_END = 0x2;
-	public static final int GTK_ALIGN_CENTER = 0x3;
-	public static final int GTK_ALIGN_BASELINE = 0x4;
-	public static final int GTK_CALENDAR_SHOW_HEADING = 1 << 0;
-	public static final int GTK_CALENDAR_SHOW_DAY_NAMES = 1 << 1;
-	public static final int GTK_CALENDAR_NO_MONTH_CHANGE = 1 << 2;
-	public static final int GTK_CALENDAR_SHOW_WEEK_NUMBERS = 1 << 3;
-	public static final int GTK_CALENDAR_WEEK_START_MONDAY = 1 << 4;
-	public static final int GTK_CAN_DEFAULT = 0x2000;
-	public static final int GTK_CAN_FOCUS = 0x800;
-	public static final int GTK_CELL_RENDERER_MODE_ACTIVATABLE = 1;
-	public static final int GTK_CELL_RENDERER_SELECTED = 1 << 0;
-	public static final int GTK_CELL_RENDERER_FOCUSED = 1 << 4;
-	public static final int GTK_CLIST_SHOW_TITLES = 0x4;
-	public static final int GTK_CORNER_TOP_LEFT = 0x0;
-	public static final int GTK_CORNER_TOP_RIGHT = 0x2;
-	public static final int GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1;
-	public static final int GTK_DIALOG_MODAL = 1 << 0;
-	public static final int GTK_DIR_TAB_FORWARD = 0;
-	public static final int GTK_DIR_TAB_BACKWARD = 1;
-	public static final int GTK_ENTRY_ICON_PRIMARY = 0;
-	public static final int GTK_ENTRY_ICON_SECONDARY = 1;
-	public static final int GTK_FILE_CHOOSER_ACTION_OPEN = 0;
-	public static final int GTK_FILE_CHOOSER_ACTION_SAVE = 1;
-	public static final int GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER = 2;
-	public static final int GTK_FRAME_LABEL_PAD = 1;
-	public static final int GTK_FRAME_LABEL_SIDE_PAD = 2;
-	public static final int GTK_HAS_FOCUS = 1 << 12;
-	public static final int GTK_ICON_SIZE_MENU = 1;
-	public static final int GTK_ICON_SIZE_SMALL_TOOLBAR = 2;
-	public static final int GTK_ICON_SIZE_LARGE_TOOLBAR = 3;
-	public static final int GTK_ICON_SIZE_DIALOG = 6;
-	public static final int GTK_ICON_LOOKUP_FORCE_SIZE = 4;
-	public static final int GTK_JUSTIFY_CENTER = 0x2;
-	public static final int GTK_JUSTIFY_LEFT = 0x0;
-	public static final int GTK_JUSTIFY_RIGHT = 0x1;
-	public static final int GTK_MAPPED = 1 << 7;
-	public static final int GTK_MESSAGE_INFO = 0;
-	public static final int GTK_MESSAGE_WARNING = 1;
-	public static final int GTK_MESSAGE_QUESTION = 2;
-	public static final int GTK_MESSAGE_ERROR = 3;
-	public static final int GTK_MOVEMENT_VISUAL_POSITIONS = 1;
-	public static final int GTK_NO_WINDOW = 1 << 5;
-	public static final int GTK_ORIENTATION_HORIZONTAL = 0x0;
-	public static final int GTK_ORIENTATION_VERTICAL = 0x1;
-	public static final int GTK_PACK_END = 1;
-	public static final int GTK_PACK_START = 0;
-	public static final int GTK_PAGE_ORIENTATION_PORTRAIT = 0;
-	public static final int GTK_PAGE_ORIENTATION_LANDSCAPE = 1;
-	public static final int GTK_POLICY_ALWAYS = 0x0;
-	public static final int GTK_POLICY_AUTOMATIC = 0x1;
-	public static final int GTK_POLICY_NEVER = 0x2;
-	public static final int GTK_POLICY_EXTERNAL = 0x3;
-	public static final int GTK_POS_TOP = 0x2;
-	public static final int GTK_POS_BOTTOM = 0x3;
-	public static final int GTK_PRINT_CAPABILITY_PAGE_SET     = 1 << 0;
-	public static final int GTK_PRINT_CAPABILITY_COPIES       = 1 << 1;
-	public static final int GTK_PRINT_CAPABILITY_COLLATE      = 1 << 2;
-	public static final int GTK_PRINT_CAPABILITY_REVERSE      = 1 << 3;
-	public static final int GTK_PRINT_CAPABILITY_SCALE        = 1 << 4;
-	public static final int GTK_PRINT_CAPABILITY_GENERATE_PDF = 1 << 5;
-	public static final int GTK_PRINT_CAPABILITY_GENERATE_PS  = 1 << 6;
-	public static final int GTK_PRINT_CAPABILITY_PREVIEW      = 1 << 7;
-	public static final int GTK_PRINT_PAGES_ALL = 0;
-	public static final int GTK_PRINT_PAGES_CURRENT = 1;
-	public static final int GTK_PRINT_PAGES_RANGES = 2;
-	public static final int GTK_PRINT_DUPLEX_SIMPLEX = 0;
-	public static final int GTK_PRINT_DUPLEX_HORIZONTAL = 1;
-	public static final int GTK_PRINT_DUPLEX_VERTICAL = 2;
-	public static final int GTK_PROGRESS_CONTINUOUS = 0x0;
-	public static final int GTK_PROGRESS_DISCRETE = 0x1;
-	public static final int GTK_PROGRESS_LEFT_TO_RIGHT = 0x0;
-	public static final int GTK_PROGRESS_BOTTOM_TO_TOP = 0x2;
-	public static final int GTK_RECEIVES_DEFAULT = 1 << 20;
-	public static final int GTK_RELIEF_NONE = 0x2;
-	public static final int GTK_RELIEF_NORMAL = 0;
-	public static final int GTK_RC_BG = 1 << 1;
-	public static final int GTK_RC_FG = 1 << 0;
-	public static final int GTK_RC_TEXT = 1 << 2;
-	public static final int GTK_RC_BASE = 1 << 3;
-	public static final int GTK_RESPONSE_APPLY = 0xfffffff6;
-	public static final int GTK_RESPONSE_CANCEL = 0xfffffffa;
-	public static final int GTK_RESPONSE_OK = 0xfffffffb;
-	public static final int GTK_SCROLL_NONE = 0;
-	public static final int GTK_SCROLL_JUMP = 1;
-	public static final int GTK_SCROLL_STEP_BACKWARD = 2;
-	public static final int GTK_SCROLL_STEP_FORWARD = 3;
-	public static final int GTK_SCROLL_PAGE_BACKWARD = 4;
-	public static final int GTK_SCROLL_PAGE_FORWARD = 5;
-	public static final int GTK_SCROLL_STEP_UP = 6;
-	public static final int GTK_SCROLL_STEP_DOWN = 7;
-	public static final int GTK_SCROLL_PAGE_UP = 8;
-	public static final int GTK_SCROLL_PAGE_DOWN = 9;
-	public static final int GTK_SCROLL_STEP_LEFT = 10;
-	public static final int GTK_SCROLL_STEP_RIGHT = 11;
-	public static final int GTK_SCROLL_PAGE_LEFT = 12;
-	public static final int GTK_SCROLL_PAGE_RIGHT = 13;
-	public static final int GTK_SCROLL_START = 14;
-	public static final int GTK_SCROLL_END = 15;
-	public static final int GTK_SELECTION_BROWSE = 0x2;
-	public static final int GTK_SELECTION_MULTIPLE = 0x3;
-	public static final int GTK_SENSITIVE = 0x200;
-	public static final int GTK_SHADOW_ETCHED_IN = 0x3;
-	public static final int GTK_SHADOW_ETCHED_OUT = 0x4;
-	public static final int GTK_SHADOW_IN = 0x1;
-	public static final int GTK_SHADOW_NONE = 0x0;
-	public static final int GTK_SHADOW_OUT = 0x2;
-	public static final int GTK_STATE_ACTIVE = 0x1;
-	public static final int GTK_STATE_INSENSITIVE = 0x4;
-	public static final int GTK_STATE_NORMAL = 0x0;
-	public static final int GTK_STATE_PRELIGHT = 0x2;
-	public static final int GTK_STATE_SELECTED = 0x3;
-	public static final int GTK_STATE_FLAG_NORMAL = 0;
-	public static final int GTK_STATE_FLAG_ACTIVE = 1 << 0;
-	public static final int GTK_STATE_FLAG_PRELIGHT = 1 << 1;
-	public static final int GTK_STATE_FLAG_SELECTED = 1 << 2;
-	public static final int GTK_STATE_FLAG_INSENSITIVE = 1 << 3;
-	public static final int GTK_STATE_FLAG_INCONSISTENT = 1 << 4;
-	public static final int GTK_STATE_FLAG_FOCUSED = 1 << 5;
-	public static final int GTK_STATE_FLAG_BACKDROP  = 1 << 6;
-	public static final int GTK_TEXT_DIR_LTR = 1;
-	public static final int GTK_TEXT_DIR_NONE = 0 ;
-	public static final int GTK_TEXT_DIR_RTL = 2;
-	public static final int GTK_TEXT_WINDOW_TEXT = 2;
-	public static final int GTK_TOOLBAR_CHILD_BUTTON = 0x1;
-	public static final int GTK_TOOLBAR_CHILD_RADIOBUTTON = 0x3;
-	public static final int GTK_TOOLBAR_CHILD_TOGGLEBUTTON = 0x2;
-	public static final int GTK_TOOLBAR_ICONS = 0;
-	public static final int GTK_TOOLBAR_TEXT = 1;
-	public static final int GTK_TOOLBAR_BOTH = 2;
-	public static final int GTK_TOOLBAR_BOTH_HORIZ = 3;
-	public static final int GTK_TREE_VIEW_COLUMN_GROW_ONLY = 0;
-	public static final int GTK_TREE_VIEW_COLUMN_AUTOSIZE = 1;
-	public static final int GTK_TREE_VIEW_COLUMN_FIXED = 2;
-	public static final int GTK_TREE_VIEW_DROP_BEFORE = 0;
-	public static final int GTK_TREE_VIEW_DROP_AFTER = 1;
-	public static final int GTK_TREE_VIEW_DROP_INTO_OR_BEFORE = 2;
-	public static final int GTK_TREE_VIEW_DROP_INTO_OR_AFTER = 3;
-	public static final int GTK_TREE_VIEW_GRID_LINES_NONE = 0;
-	public static final int GTK_TREE_VIEW_GRID_LINES_HORIZONTAL = 1;
-	public static final int GTK_TREE_VIEW_GRID_LINES_VERTICAL = 2;
-	public static final int GTK_TREE_VIEW_GRID_LINES_BOTH = 3;
-	public static final int GTK_STYLE_PROVIDER_PRIORITY_APPLICATION = 600;
-	public static final int GTK_STYLE_PROVIDER_PRIORITY_USER = 800;
 	public static final int GDK_UNMAP = 15;
-	public static final int GTK_UNIT_PIXEL = 0;
-	public static final int GTK_UNIT_POINTS = 1;
-	public static final int GTK_UNIT_INCH = 2;
-	public static final int GTK_UNIT_MM = 3;
-	public static final int GTK_VISIBLE = 0x100;
 	public static final int GDK_WA_X = 1 << 2;
 	public static final int GDK_WA_Y = 1 << 3;
 	public static final int GDK_WA_VISUAL = 1 << 6;
-	public static final int GTK_WINDOW_POPUP = 0x1;
-	public static final int GTK_WINDOW_TOPLEVEL = 0x0;
 	public static final int GDK_WINDOW_TYPE_HINT_DIALOG = 1;
 	public static final int GDK_WINDOW_TYPE_HINT_TOOLTIP = 10;
-	public static final int GTK_WRAP_NONE = 0;
-	public static final int GTK_WRAP_WORD = 2;
-	public static final int GTK_WRAP_WORD_CHAR = 3;
 	public static final int G_LOG_FLAG_FATAL = 0x2;
 	public static final int G_LOG_FLAG_RECURSION = 0x1;
 	public static final int G_LOG_LEVEL_MASK = 0xfffffffc;
@@ -712,12 +547,6 @@ public class OS extends C {
 	public static final byte[] value_changed = ascii("value-changed");
 	public static final byte[] window_state_event = ascii("window-state-event");
 
-	public static final byte[] GTK_STYLE_CLASS_TOOLTIP = ascii("tooltip");
-	public static final byte[] GTK_STYLE_CLASS_VIEW = ascii("view");
-	public static final byte[] GTK_STYLE_CLASS_CELL = ascii("cell");
-	public static final byte[] GTK_STYLE_CLASS_PANE_SEPARATOR = ascii("pane-separator");
-	public static final byte[] GTK_STYLE_CLASS_FRAME = ascii("frame");
-
 	/** Properties */
 	public static final byte[] active = ascii("active");
 	public static final byte[] background_gdk = ascii("background-gdk");
@@ -734,17 +563,6 @@ public class OS extends C {
 	public static final byte[] foreground_gdk = ascii("foreground-gdk");
 	public static final byte[] foreground_rgba = ascii("foreground-rgba");
 	public static final byte[] grid_line_width = ascii("grid-line-width");
-	public static final byte[] gtk_alternative_button_order = ascii("gtk-alternative-button-order");
-	public static final byte[] gtk_color_palette = ascii("gtk-color-palette");
-	public static final byte[] gtk_cursor_blink = ascii("gtk-cursor-blink");
-	public static final byte[] gtk_cursor_blink_time = ascii("gtk-cursor-blink-time");
-	public static final byte[] gtk_double_click_time = ascii("gtk-double-click-time");
-	public static final byte[] gtk_entry_select_on_focus = ascii("gtk-entry-select-on-focus");
-	public static final byte[] gtk_show_input_method_menu = ascii("gtk-show-input-method-menu");
-	public static final byte[] gtk_style_property_font = ascii("font");
-	public static final byte[] gtk_menu_bar_accel = ascii("gtk-menu-bar-accel");
-	public static final byte[] gtk_menu_images = ascii("gtk-menu-images");
-	public static final byte[] gtk_theme_name = ascii("gtk-theme-name");
 	public static final byte[] inner_border = ascii("inner-border");
 	public static final byte[] has_backward_stepper = ascii("has-backward-stepper");
 	public static final byte[] has_secondary_backward_stepper = ascii("has-secondary-backward-stepper");
@@ -766,34 +584,8 @@ public class OS extends C {
 	public static final byte[] ypad = ascii("ypad");
 	public static final byte[] margin_bottom = ascii("margin-bottom");
 	public static final byte[] margin_top = ascii("margin-top");
-	public static final byte[] GTK_PRINT_SETTINGS_OUTPUT_URI = ascii("output-uri");
 	public static final byte[] scrollbar_spacing = ascii("scrollbar-spacing");
 
-	/*
-	 * Needed to tell GTK 3 to prefer a dark or light theme in the UI.
-	 * Improves the look of the Eclipse Dark theme in GTK 3 systems.
-	 */
-	public static final byte[] gtk_application_prefer_dark_theme = ascii("gtk-application-prefer-dark-theme");
-
-	/* Named icons.
-	 * See https://docs.google.com/spreadsheet/pub?key=0AsPAM3pPwxagdGF4THNMMUpjUW5xMXZfdUNzMXhEa2c&output=html
-	 * See http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html#names
-	 * Icon preview tool: gtk3-icon-browser
-	 * Snippets often demonstrate usage of these. E.x 309, 258.
-	 * */
-	public static final byte[] GTK_NAMED_ICON_FIND = ascii("system-search-symbolic");  //Replacement of GTK_STOCK_FIND
-	public static final byte[] GTK_NAMED_ICON_CLEAR = ascii("edit-clear-symbolic"); //Replacement of GTK_STOCK_CLEAR
-
-
-	public static final byte[] GTK_NAMED_ICON_GO_UP = ascii ("go-up-symbolic");
-	public static final byte[] GTK_NAMED_ICON_GO_DOWN = ascii ("go-down-symbolic");
-	public static final byte[] GTK_NAMED_ICON_GO_NEXT = ascii ("go-next-symbolic");
-	public static final byte[] GTK_NAMED_ICON_GO_PREVIOUS = ascii ("go-previous-symbolic");
-	public static final byte[] GTK_NAMED_LABEL_OK = ascii("_OK");
-	public static final byte[] GTK_NAMED_LABEL_CANCEL = ascii("_Cancel");
-
-	public static final int GTK_VERSION = VERSION(gtk_major_version(), gtk_minor_version(), gtk_micro_version());
-
 	/**
 	 * Gtk has a minimum glib version. (But it's not a 1:1 link, one can have a newer version of glib and older gtk).
 	 *
@@ -807,7 +599,7 @@ public class OS extends C {
 	 * Gtk3.6  has min version of glib 2.33.1
 	 * Gtk3.8  has min version of glib 2.35.3
 	 * Gtk3.10 has min version of glib 2.37.5
- 	 * Gtk3.12 has min version of glib 2.39.5
+	 * Gtk3.12 has min version of glib 2.39.5
 	 * Gtk3.14 has min version of glib 2.41.2
 	 * Gtk3.16 has min version of glib 2.43.4
 	 * Gtk3.18 has min version of glib 2.45.8
@@ -815,9 +607,9 @@ public class OS extends C {
 	 * Gtk3.22 has min version of glib 2.49.4
 	 */
 	public static final int GLIB_VERSION = VERSION(glib_major_version(), glib_minor_version(), glib_micro_version());
-	private static final boolean MIN_GLIB_2_32 = GLIB_VERSION >= VERSION(2, 32, 0);
+	private static final boolean MIN_GLIB_2_32 = OS.GLIB_VERSION >= VERSION(2, 32, 0);
+
 
-	public static final boolean GTK3 = GTK_VERSION >= VERSION(3, 0, 0);
 
 	/* Feature in Gtk: with the switch to GtkMenuItems from GtkImageMenuItems
 	* in Gtk3 came a small Gtk shortfall: a small amount of padding on the left hand
@@ -841,7 +633,7 @@ public class OS extends C {
 		SWT_PADDED_MENU_ITEMS = usePadded;
 
 		System.setProperty("org.eclipse.swt.internal.gtk.version",
-				(GTK_VERSION >>> 16) + "." + (GTK_VERSION >>> 8 & 0xFF) + "." + (GTK_VERSION & 0xFF));
+				(GTK.GTK_VERSION >>> 16) + "." + (GTK.GTK_VERSION >>> 8 & 0xFF) + "." + (GTK.GTK_VERSION & 0xFF));
 		// set GDK backend if we are on X11
 		if (isX11()) {
 			System.setProperty("org.eclipse.swt.internal.gdk.backend", "x11");
@@ -890,18 +682,6 @@ public static final native int GdkEventWindowState_sizeof();
 public static final native int GdkGeometry_sizeof();
 public static final native int GdkRectangle_sizeof();
 public static final native int GdkWindowAttr_sizeof();
-public static final native int GtkAllocation_sizeof();
-public static final native int GtkBorder_sizeof();
-public static final native int GtkRequisition_sizeof();
-public static final native int GtkTargetEntry_sizeof();
-public static final native int GtkTextIter_sizeof();
-public static final native int GtkCellRendererText_sizeof();
-public static final native int GtkCellRendererTextClass_sizeof();
-public static final native int GtkCellRendererPixbuf_sizeof();
-public static final native int GtkCellRendererPixbufClass_sizeof();
-public static final native int GtkCellRendererToggle_sizeof();
-public static final native int GtkCellRendererToggleClass_sizeof();
-public static final native int GtkTreeIter_sizeof();
 public static final native int PangoAttribute_sizeof();
 public static final native int PangoAttrColor_sizeof();
 public static final native int PangoAttrInt_sizeof();
@@ -933,21 +713,6 @@ public static final native long /*int*/ G_OBJECT_CLASS_CONSTRUCTOR(long /*int*/
  * @paramOFF constructor cast=(GObject* (*) (GType, guint, GObjectConstructParam *))
  */
 public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(long /*int*/ object_class, long /*int*/ constructor);
-/**
- * @param acce_label cast=(GtkAccelLabel *)
- * @param string cast=(gchar *)
- */
-public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(long /*int*/ acce_label, long /*int*/ string);
-/** @param acce_label cast=(GtkAccelLabel *) */
-public static final native long /*int*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(long /*int*/ acce_label);
-/** @param widget cast=(GtkEntry *) */
-public static final native long /*int*/ GTK_ENTRY_IM_CONTEXT(long /*int*/ widget);
-/** @param widget cast=(GtkTextView *) */
-public static final native long /*int*/ GTK_TEXTVIEW_IM_CONTEXT(long /*int*/ widget);
-/** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_REQUISITION_WIDTH(long /*int*/ widget);
-/** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_REQUISITION_HEIGHT(long /*int*/ widget);
 /** @param event cast=(GdkEvent *) */
 public static final native int GDK_EVENT_TYPE(long /*int*/ event);
 /** @param event cast=(GdkEventAny *) */
@@ -957,9 +722,6 @@ public static final native int X_EVENT_TYPE(long /*int*/ xevent);
 /** @param xevent cast=(XAnyEvent *) */
 public static final native long /*int*/ X_EVENT_WINDOW(long /*int*/ xevent);
 
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ GTK_WIDGET_GET_CLASS(long /*int*/ widget);
-
 /** X11 Native methods and constants */
 public static final int Above = 0;
 public static final int Below = 1;
@@ -1418,7 +1180,7 @@ public static final long /*int*/ GDK_TYPE_COLOR() {
 public static final native long /*int*/ _GDK_TYPE_RGBA();
 public static final long /*int*/ GDK_TYPE_RGBA() {
 	lock.lock();
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	try {
 		return _GDK_TYPE_RGBA();
 	} finally {
@@ -1435,267 +1197,6 @@ public static final long /*int*/ GDK_TYPE_PIXBUF() {
 		lock.unlock();
 	}
 }
-/** @method flags=const */
-public static final native long /*int*/ GTK_TYPE_ACCESSIBLE ();
-public static final native long /*int*/ _GTK_ACCESSIBLE (long /*int*/ handle);
-public static final native boolean _GTK_IS_ACCEL_LABEL(long /*int*/ obj);
-public static final boolean GTK_IS_ACCEL_LABEL(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_ACCEL_LABEL(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_BUTTON(long /*int*/ obj);
-public static final boolean GTK_IS_BUTTON(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_BUTTON(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_LABEL(long /*int*/ obj);
-public static final boolean GTK_IS_LABEL(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_LABEL(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_SCROLLED_WINDOW(long /*int*/ obj);
-public static final boolean GTK_IS_SCROLLED_WINDOW(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_SCROLLED_WINDOW(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_WINDOW(long /*int*/ obj);
-public static final boolean GTK_IS_WINDOW(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_WINDOW(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj);
-public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_CELL_RENDERER_PIXBUF(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj);
-public static final boolean GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_CELL_RENDERER_TEXT(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj);
-public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_CELL_RENDERER_TOGGLE(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_CONTAINER(long /*int*/ obj);
-public static final boolean GTK_IS_CONTAINER(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_CONTAINER(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj);
-public static final boolean GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_IMAGE_MENU_ITEM(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_MENU_ITEM(long /*int*/ obj);
-public static final boolean GTK_IS_MENU_ITEM(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_MENU_ITEM(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native boolean _GTK_IS_PLUG(long /*int*/ obj);
-public static final boolean GTK_IS_PLUG(long /*int*/ obj) {
-	lock.lock();
-	try {
-		return _GTK_IS_PLUG(obj);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_STOCK_CANCEL();
-public static final long /*int*/ GTK_STOCK_CANCEL() {
-	lock.lock();
-	try {
-		return _GTK_STOCK_CANCEL();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_STOCK_OK();
-public static final long /*int*/ GTK_STOCK_OK() {
-	lock.lock();
-	try {
-		return _GTK_STOCK_OK();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TEXT();
-public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TEXT() {
-	lock.lock();
-	try {
-		return _GTK_TYPE_CELL_RENDERER_TEXT();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();
-public static final long /*int*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
-	lock.lock();
-	try {
-		return _GTK_TYPE_CELL_RENDERER_PIXBUF();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();
-public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
-	lock.lock();
-	try {
-		return _GTK_TYPE_CELL_RENDERER_TOGGLE();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_TYPE_IM_MULTICONTEXT();
-public static final long /*int*/ GTK_TYPE_IM_MULTICONTEXT() {
-	lock.lock();
-	try {
-		return _GTK_TYPE_IM_MULTICONTEXT();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_TYPE_FIXED();
-public static final long /*int*/ GTK_TYPE_FIXED() {
-	lock.lock();
-	try {
-		return _GTK_TYPE_FIXED();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_TYPE_MENU();
-public static final long /*int*/ GTK_TYPE_MENU() {
-	lock.lock();
-	try {
-		return _GTK_TYPE_MENU();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native long /*int*/ _GTK_TYPE_WIDGET();
-public static final long /*int*/ GTK_TYPE_WIDGET() {
-	lock.lock();
-	try {
-		return _GTK_TYPE_WIDGET();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_has_default(long /*int*/ widget);
-public static final boolean gtk_widget_has_default(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_has_default(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_get_sensitive(long /*int*/ widget);
-public static final boolean gtk_widget_get_sensitive(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_sensitive(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ _gtk_widget_get_name(long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_name(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_name(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic
- *  @param widget_class cast=(GtkWidgetClass *)
- */
-public static final native long /*int*/ _gtk_widget_class_get_css_name(long /*int*/ widget_class);
-public static final long /*int*/ gtk_widget_class_get_css_name(long /*int*/ widget_class) {
-	lock.lock();
-	try {
-		return _gtk_widget_class_get_css_name(widget_class);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native void _GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag);
-public static final void GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag) {
-	lock.lock();
-	try {
-		_GTK_WIDGET_SET_FLAGS(wid, flag);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native void _GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag);
-public static final void GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag) {
-	lock.lock();
-	try {
-		_GTK_WIDGET_UNSET_FLAGS(wid, flag);
-	} finally {
-		lock.unlock();
-	}
-}
 public static final native long /*int*/ _G_OBJECT_CLASS (long /*int*/ klass);
 public static final long /*int*/ G_OBJECT_CLASS (long /*int*/ klass) {
 	lock.lock();
@@ -1801,16 +1302,6 @@ public static final long /*int*/ PANGO_TYPE_FONT_FACE() {
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_printer_option_widget_get_type();
-public static final long /*int*/ gtk_printer_option_widget_get_type() {
-	lock.lock();
-	try {
-		return _gtk_printer_option_widget_get_type();
-	} finally {
-		lock.unlock();
-	}
-}
 /** @method flags=const */
 public static final native long /*int*/ _PANGO_TYPE_LAYOUT();
 public static final long /*int*/ PANGO_TYPE_LAYOUT() {
@@ -3524,6 +3015,53 @@ public static final  long /*int*/ g_value_peek_pointer (long /*int*/ value) {
 		lock.unlock();
 	}
 }
+
+/** @method flags=const */
+public static final native int _glib_major_version();
+public static final int glib_major_version() {
+	lock.lock();
+	try {
+		return _glib_major_version();
+	} finally {
+		lock.unlock();
+	}
+}
+/** @method flags=const */
+public static final native int _glib_minor_version();
+public static final int glib_minor_version() {
+	lock.lock();
+	try {
+		return _glib_minor_version();
+	} finally {
+		lock.unlock();
+	}
+}
+/** @method flags=const */
+public static final native int _glib_micro_version();
+public static final int glib_micro_version() {
+	lock.lock();
+	try {
+		return _glib_micro_version();
+	} finally {
+		lock.unlock();
+	}
+}
+
+/**
+ * @param interval cast=(guint32)
+ * @param function cast=(GSourceFunc)
+ * @param data cast=(gpointer)
+ */
+public static final native int _g_timeout_add(int interval, long /*int*/ function, long /*int*/ data);
+public static final int g_timeout_add(int interval, long /*int*/ function, long /*int*/ data) {
+	lock.lock();
+	try {
+		return _g_timeout_add(interval, function, data);
+	} finally {
+		lock.unlock();
+	}
+}
+
 /** @param atom_name cast=(const gchar *),flags=no_out critical */
 public static final native long /*int*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists);
 public static final long /*int*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) {
@@ -3715,7 +3253,7 @@ public static final void gdk_cairo_set_source_window(long /*int*/ cairo, long /*
 public static final native void _gdk_color_free(long /*int*/ color);
 public static final void gdk_color_free(long /*int*/ color) {
 	lock.lock();
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	try {
 		_gdk_color_free(color);
 	} finally {
@@ -3730,7 +3268,7 @@ public static final void gdk_color_free(long /*int*/ color) {
 public static final native boolean _gdk_color_parse(byte[] spec, GdkColor color);
 public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
 	lock.lock();
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	try {
 		return _gdk_color_parse(spec, color);
 	} finally {
@@ -4867,16 +4405,6 @@ public static final long /*int*/ gdk_cairo_region_create_from_surface(long /*int
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
-public static final native void _gtk_widget_shape_combine_region(long /*int*/ widget, long /*int*/ region);
-public static final void gtk_widget_shape_combine_region(long /*int*/ widget, long /*int*/ region) {
-	lock.lock();
-	try {
-		_gtk_widget_shape_combine_region(widget,region);
-	} finally {
-		lock.unlock();
-	}
-}
 public static final native long /*int*/ _gdk_region_new();
 public static final long /*int*/ gdk_region_new() {
 	lock.lock();
@@ -4995,7 +4523,7 @@ public static final void gdk_region_union_with_rect(long /*int*/ region, GdkRect
 public static final native long /*int*/ _gdk_rgba_to_string(GdkRGBA rgba);
 public static final long /*int*/ gdk_rgba_to_string(GdkRGBA rgba) {
 	lock.lock();
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	try {
 		return _gdk_rgba_to_string(rgba);
 	} finally {
@@ -5009,7 +4537,7 @@ public static final long /*int*/ gdk_rgba_to_string(GdkRGBA rgba) {
 public static final native void _gdk_rgba_free(long /*int*/ rgba);
 public static final void gdk_rgba_free(long /*int*/ rgba) {
 	lock.lock();
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	try {
 		_gdk_rgba_free(rgba);
 	} finally {
@@ -5023,7 +4551,7 @@ public static final void gdk_rgba_free(long /*int*/ rgba) {
 public static final native int _gdk_rgba_hash(GdkRGBA rgba);
 public static final int gdk_rgba_hash(GdkRGBA  rgba) {
 	lock.lock();
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	try {
 		return _gdk_rgba_hash(rgba);
 	} finally {
@@ -5038,7 +4566,7 @@ public static final int gdk_rgba_hash(GdkRGBA  rgba) {
 public static final native long /*int*/ _gdk_rgba_parse(GdkRGBA rgba, byte[] property);
 public static final long /*int*/ gdk_rgba_parse(GdkRGBA rgba, byte[] property) {
 	lock.lock();
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	try {
 		return _gdk_rgba_parse(rgba, property);
 	} finally {
@@ -5882,1579 +5410,7 @@ public static final void gdk_window_show_unraised(long /*int*/ window) {
 		lock.unlock();
 	}
 }
-public static final native int _gtk_accelerator_get_default_mod_mask();
-public static final int gtk_accelerator_get_default_mod_mask() {
-	lock.lock();
-	try {
-		return _gtk_accelerator_get_default_mod_mask();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param accelerator cast=(const gchar *)
- * @param accelerator_key cast=(guint *)
- * @param accelerator_mods cast=(GdkModifierType *)
- */
-public static final native void _gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods);
-public static final void gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods) {
-	lock.lock();
-	try {
-		_gtk_accelerator_parse(accelerator, accelerator_key, accelerator_mods);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_accel_group_new();
-public static final long /*int*/ gtk_accel_group_new() {
-	lock.lock();
-	try {
-		return _gtk_accel_group_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param accel_label cast=(GtkAccelLabel *)
- * @param accel_widget cast=(GtkWidget *)
- */
-public static final native void _gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget);
-public static final void gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget) {
-	lock.lock();
-	try {
-		_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param accel_label cast=(GtkAccelLabel *)
- * @param accel_key cast=(guint)
- * @param accel_mods cast=(GdkModifierType)
- */
-public static final native void _gtk_accel_label_set_accel(long /*int*/ accel_label, int accel_key, int accel_mods);
-public static final void gtk_accel_label_set_accel(long /*int*/ accel_label, int accel_key, int accel_mods) {
-	lock.lock();
-	try {
-		_gtk_accel_label_set_accel(accel_label, accel_key, accel_mods);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param label cast=(const gchar *) */
-public static final native long /*int*/ _gtk_accel_label_new(byte[] label);
-public static final long /*int*/ gtk_accel_label_new(byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_accel_label_new(label);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param accessible cast=(GtkAccessible *)
- */
-public static final native long /*int*/ _gtk_accessible_get_widget(long /*int*/ accessible);
-public static final long /*int*/ gtk_accessible_get_widget(long /*int*/ accessible) {
-	lock.lock();
-	try {
-		return _gtk_accessible_get_widget(accessible);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native void _gtk_adjustment_configure(long /*int*/ adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size);
-public static final void gtk_adjustment_configure(long /*int*/ adjustment, double value, double lower, double upper, double step_increment, double page_increment, double page_size) {
-	lock.lock();
-	try {
-		_gtk_adjustment_configure(adjustment, value, lower, upper, step_increment, page_increment, page_size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param value cast=(gdouble)
- * @param lower cast=(gdouble)
- * @param upper cast=(gdouble)
- * @param step_increment cast=(gdouble)
- * @param page_increment cast=(gdouble)
- */
-public static final native long /*int*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
-public static final long /*int*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) {
-	lock.lock();
-	try {
-		return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native double _gtk_adjustment_get_lower(long /*int*/ adjustment);
-public static final double gtk_adjustment_get_lower(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_adjustment_get_lower(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native double _gtk_adjustment_get_page_increment(long /*int*/ adjustment);
-public static final double gtk_adjustment_get_page_increment(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_adjustment_get_page_increment(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native double _gtk_adjustment_get_page_size(long /*int*/ adjustment);
-public static final double gtk_adjustment_get_page_size(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_adjustment_get_page_size(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native double _gtk_adjustment_get_step_increment(long /*int*/ adjustment);
-public static final double gtk_adjustment_get_step_increment(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_adjustment_get_step_increment(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native double _gtk_adjustment_get_upper(long /*int*/ adjustment);
-public static final double gtk_adjustment_get_upper(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_adjustment_get_upper(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native double _gtk_adjustment_get_value(long /*int*/ adjustment);
-public static final double gtk_adjustment_get_value(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_adjustment_get_value(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- * @param value cast=(gdouble)
- */
-public static final native void _gtk_adjustment_set_value(long /*int*/ adjustment, double value);
-public static final void gtk_adjustment_set_value(long /*int*/ adjustment, double value) {
-	lock.lock();
-	try {
-		_gtk_adjustment_set_value(adjustment, value);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- * @param value cast=(gdouble)
- */
-public static final native void _gtk_adjustment_set_step_increment(long /*int*/ adjustment, double value);
-public static final void gtk_adjustment_set_step_increment(long /*int*/ adjustment, double value) {
-	lock.lock();
-	try {
-		_gtk_adjustment_set_step_increment(adjustment, value);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param adjustment cast=(GtkAdjustment *)
- * @param value cast=(gdouble)
- */
-public static final native void _gtk_adjustment_set_page_increment(long /*int*/ adjustment, double value);
-public static final void gtk_adjustment_set_page_increment(long /*int*/ adjustment, double value) {
-	lock.lock();
-	try {
-		_gtk_adjustment_set_page_increment(adjustment, value);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param adjustment cast=(GtkAdjustment *)
- * */
-public static final native void _gtk_adjustment_value_changed(long /*int*/ adjustment);
-/**  [GTK2/GTK3; 3.18 deprecated] */
-public static final void gtk_adjustment_value_changed(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		_gtk_adjustment_value_changed(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @method flags=dynamic
- * @param arrow_type cast=(GtkArrowType)
- * @param shadow_type cast=(GtkShadowType)
- */
-public static final native long /*int*/ _gtk_arrow_new(int arrow_type, int shadow_type);
-/** [GTK2/GTK3; 3.14 deprecated] */
-public static final long /*int*/ gtk_arrow_new(int arrow_type, int shadow_type) {
-	lock.lock();
-	try {
-		return _gtk_arrow_new(arrow_type, shadow_type);
-	} finally {
-		lock.unlock();
-	}
-}
 
-/**
- * @method flags=dynamic
- * @param arrow cast=(GtkArrow *)
- * @param arrow_type cast=(GtkArrowType)
- * @param shadow_type cast=(GtkShadowType)
- */
-public static final native void _gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type);
-/** [GTK2/GTK3; 3.14 deprecated] */
-public static final void gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type) {
-	lock.lock();
-	try {
-		_gtk_arrow_set(arrow, arrow_type, shadow_type);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param bin cast=(GtkBin *) */
-public static final native long /*int*/ _gtk_bin_get_child(long /*int*/ bin);
-public static final long /*int*/ gtk_bin_get_child(long /*int*/ bin) {
-	lock.lock();
-	try {
-		return _gtk_bin_get_child(bin);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param border cast=(GtkBorder *) */
-public static final native void _gtk_border_free(long /*int*/ border);
-public static final void gtk_border_free(long /*int*/ border) {
-	lock.lock();
-	try {
-		_gtk_border_free(border);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param box cast=(GtkBox *) */
-public static final native void _gtk_box_set_spacing(long /*int*/ box, int spacing);
-public static final void gtk_box_set_spacing(long /*int*/ box, int spacing) {
-	lock.lock();
-	try {
-		_gtk_box_set_spacing(box, spacing);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param box cast=(GtkBox *)
- * @param child cast=(GtkWidget *)
- */
-public static final native void _gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type);
-public static final void gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type) {
-	lock.lock();
-	try {
-		_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param button cast=(GtkButton *) */
-public static final native void _gtk_button_clicked(long /*int*/ button);
-public static final void gtk_button_clicked(long /*int*/ button) {
-	lock.lock();
-	try {
-		_gtk_button_clicked(button);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_button_new();
-public static final long /*int*/ gtk_button_new() {
-	lock.lock();
-	try {
-		return _gtk_button_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param button cast=(GtkButton *)
- * @param image cast=(GtkWidget *)
- */
-public static final native void /*int*/ _gtk_button_set_image(long /*int*/ button, long /*int*/ image);
-public static final void /*int*/ gtk_button_set_image(long /*int*/ button, long /*int*/ image) {
-	lock.lock();
-	try {
-		_gtk_button_set_image(button, image);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_calendar_new();
-public static final long /*int*/ gtk_calendar_new() {
-	lock.lock();
-	try {
-		return _gtk_calendar_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param calendar cast=(GtkCalendar *)
- * @param month cast=(guint)
- * @param year cast=(guint)
- */
-public static final native void /*long*/ _gtk_calendar_select_month(long /*int*/ calendar, int month, int year);
-public static final void /*long*/ gtk_calendar_select_month(long /*int*/ calendar, int month, int year) {
-	lock.lock();
-	try {
-		_gtk_calendar_select_month(calendar, month, year);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param calendar cast=(GtkCalendar *)
- * @param day cast=(guint)
- */
-public static final native void _gtk_calendar_select_day(long /*int*/ calendar, int day);
-public static final void gtk_calendar_select_day(long /*int*/ calendar, int day) {
-	lock.lock();
-	try {
-		_gtk_calendar_select_day(calendar, day);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param calendar cast=(GtkCalendar *)
- * @param day cast=(guint)
- */
-public static final native void _gtk_calendar_mark_day(long /*int*/ calendar, int day);
-public static final void gtk_calendar_mark_day(long /*int*/ calendar, int day) {
-	lock.lock();
-	try {
-		_gtk_calendar_mark_day(calendar, day);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param calendar cast=(GtkCalendar *)
- */
-public static final native void _gtk_calendar_clear_marks(long /*int*/ calendar);
-public static final void gtk_calendar_clear_marks(long /*int*/ calendar) {
-	lock.lock();
-	try {
-		_gtk_calendar_clear_marks(calendar);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param calendar cast=(GtkCalendar *)
- * @param flags cast=(GtkCalendarDisplayOptions)
- */
-public static final native void _gtk_calendar_set_display_options(long /*int*/ calendar, int flags);
-public static final void gtk_calendar_set_display_options(long /*int*/ calendar, int flags) {
-	lock.lock();
-	try {
-		_gtk_calendar_set_display_options(calendar, flags);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param calendar cast=(GtkCalendar *)
- * @param year cast=(guint *)
- * @param month cast=(guint *)
- * @param day cast=(guint *)
- */
-public static final native void _gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day);
-public static final void gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day) {
-	lock.lock();
-	try {
-		_gtk_calendar_get_date(calendar, year, month, day);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param cell_layout cast=(GtkCellLayout *) */
-public static final native void _gtk_cell_layout_clear(long /*int*/ cell_layout);
-public static final void gtk_cell_layout_clear(long /*int*/ cell_layout) {
-	lock.lock();
-	try {
-		_gtk_cell_layout_clear(cell_layout);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param cell_layout cast=(GtkCellLayout *) */
-public static final native long /*int*/ _gtk_cell_layout_get_cells(long /*int*/ cell_layout);
-public static final long /*int*/ gtk_cell_layout_get_cells(long /*int*/ cell_layout) {
-	lock.lock();
-	try {
-		return _gtk_cell_layout_get_cells(cell_layout);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param cell_layout cast=(GtkCellLayout *)
- * @param cell cast=(GtkCellRenderer *)
- * @param sentinel cast=(const gchar *),flags=sentinel
- */
-public static final native void _gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel);
-public static final void gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel) {
-	lock.lock();
-	try {
-		_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param cell_layout cast=(GtkCellLayout *)
- * @param cell cast=(GtkCellRenderer *)
- */
-public static final native void _gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand);
-public static final void gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand) {
-	lock.lock();
-	try {
-		_gtk_cell_layout_pack_start(cell_layout, cell, expand);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param cell cast=(GtkCellRenderer *)
- * @param widget cast=(GtkWidget *)
- * @param area cast=(GdkRectangle *),flags=no_in
- * @param x_offset cast=(gint *)
- * @param y_offset cast=(gint *)
- * @param width cast=(gint *)
- * @param height cast=(gint *)
- */
-public static final native void _gtk_cell_renderer_get_size(long /*int*/ cell, long /*int*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height);
-/**  [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_cell_renderer_get_size(long /*int*/ cell, long /*int*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
-	lock.lock();
-	try {
-		_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param cell cast=(GtkCellRenderer *)
- * @param widget cast=(GtkWidget *)
- * @param minimum_size cast=(GtkRequisition *)
- * @param natural_size cast=(GtkRequisition *)
- */
-public static final native void _gtk_cell_renderer_get_preferred_size(long /*int*/ cell, long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size);
-public static final void gtk_cell_renderer_get_preferred_size(long /*int*/ cell, long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size) {
-	lock.lock();
-	try {
-		_gtk_cell_renderer_get_preferred_size(cell, widget, minimum_size, natural_size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param cell cast=(GtkCellRenderer *)
- */
-public static final native void _gtk_cell_renderer_get_preferred_height_for_width(long /*int*/ cell, long /*int*/ widget, int width, int[] minimum_height, int[] natural_height);
-public static final void gtk_cell_renderer_get_preferred_height_for_width(long /*int*/ cell, long /*int*/ widget, int width, int[] minimum_height, int[] natural_height) {
-	lock.lock();
-	try {
-		_gtk_cell_renderer_get_preferred_height_for_width(cell, widget, width, minimum_height, natural_height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param cell cast=(GtkCellRenderer *)
- * @param width cast=(gint)
- * @param height cast=(gint)
- */
-public static final native void _gtk_cell_renderer_set_fixed_size(long /*int*/ cell, int width, int height);
-public static final void gtk_cell_renderer_set_fixed_size (long /*int*/ cell, int width, int height) {
-	lock.lock();
-	try {
-		_gtk_cell_renderer_set_fixed_size(cell, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param cell cast=(GtkCellRenderer *)
- * @param width cast=(gint *)
- * @param height cast=(gint *)
- */
-public static final native void _gtk_cell_renderer_get_fixed_size(long /*int*/ cell, int[] width, int[] height);
-public static final void gtk_cell_renderer_get_fixed_size (long /*int*/ cell, int[] width, int[] height) {
-	lock.lock();
-	try {
-		_gtk_cell_renderer_get_fixed_size(cell, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param minimum_size cast=(GtkRequisition *)
- * @param natural_size cast=(GtkRequisition *)
- */
-public static final native void _gtk_widget_get_preferred_size(long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size);
-public static final void gtk_widget_get_preferred_size(long /*int*/ widget, GtkRequisition minimum_size, GtkRequisition natural_size) {
-	lock.lock();
-	try {
-		_gtk_widget_get_preferred_size(widget, minimum_size, natural_size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_widget_get_preferred_height_for_width(long /*int*/ widget, int width, int[] minimum_size, int[] natural_size);
-public static final void gtk_widget_get_preferred_height_for_width(long /*int*/ widget, int width, int[] minimum_size, int[] natural_size) {
-	lock.lock();
-	try {
-		_gtk_widget_get_preferred_height_for_width(widget, width, minimum_size, natural_size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_widget_get_preferred_width_for_height(long /*int*/ widget, int height, int[] minimum_size, int[] natural_size);
-public static final void gtk_widget_get_preferred_width_for_height(long /*int*/ widget, int height, int[] minimum_size, int[] natural_size) {
-	lock.lock();
-	try {
-		_gtk_widget_get_preferred_width_for_height(widget, height, minimum_size, natural_size);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_cell_renderer_pixbuf_new();
-public static final long /*int*/ gtk_cell_renderer_pixbuf_new() {
-	lock.lock();
-	try {
-		return _gtk_cell_renderer_pixbuf_new();
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_cell_renderer_text_new();
-public static final long /*int*/ gtk_cell_renderer_text_new() {
-	lock.lock();
-	try {
-		return _gtk_cell_renderer_text_new();
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_cell_renderer_toggle_new();
-public static final long /*int*/ gtk_cell_renderer_toggle_new() {
-	lock.lock();
-	try {
-		return _gtk_cell_renderer_toggle_new();
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_check_button_new();
-public static final long /*int*/ gtk_check_button_new() {
-	lock.lock();
-	try {
-		return _gtk_check_button_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param check_menu_item cast=(GtkCheckMenuItem *) */
-public static final native boolean _gtk_check_menu_item_get_active(long /*int*/ check_menu_item);
-public static final boolean gtk_check_menu_item_get_active(long /*int*/ check_menu_item) {
-	lock.lock();
-	try {
-		return _gtk_check_menu_item_get_active(check_menu_item);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param label cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_image_menu_item_new_with_label(byte[] label);
-/** [GTK2/GTK3; 3.10 deprecated] */
-public static final long /*int*/ gtk_image_menu_item_new_with_label(byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_image_menu_item_new_with_label(label);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param label cast=(const gchar *) */
-public static final native long /*int*/ _gtk_check_menu_item_new_with_label(byte[] label);
-public static final long /*int*/ gtk_check_menu_item_new_with_label(byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_check_menu_item_new_with_label(label);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_check_menu_item_new();
-public static final long /*int*/ gtk_check_menu_item_new() {
-	lock.lock();
-	try {
-		return _gtk_check_menu_item_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param wid cast=(GtkCheckMenuItem *)
- * @param active cast=(gboolean)
- */
-public static final native void _gtk_check_menu_item_set_active(long /*int*/ wid, boolean active);
-public static final void gtk_check_menu_item_set_active(long /*int*/ wid, boolean active) {
-	lock.lock();
-	try {
-		_gtk_check_menu_item_set_active(wid, active);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_check_version(int required_major, int required_minor, int required_micro);
-public static final long /*int*/ gtk_check_version(int required_major, int required_minor, int required_micro) {
-	lock.lock();
-	try {
-		return _gtk_check_version(required_major, required_minor, required_micro);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param clipboard cast=(GtkClipboard *) */
-public static final native void _gtk_clipboard_clear(long /*int*/ clipboard);
-public static final void gtk_clipboard_clear(long /*int*/ clipboard) {
-	lock.lock();
-	try {
-		_gtk_clipboard_clear(clipboard);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param selection cast=(GdkAtom) */
-public static final native long /*int*/ _gtk_clipboard_get(long /*int*/ selection);
-public static final long /*int*/ gtk_clipboard_get(long /*int*/ selection) {
-	lock.lock();
-	try {
-		return _gtk_clipboard_get(selection);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param clipboard cast=(GtkClipboard *)
- * @param target cast=(const GtkTargetEntry *)
- * @param n_targets cast=(guint)
- * @param get_func cast=(GtkClipboardGetFunc)
- * @param clear_func cast=(GtkClipboardClearFunc)
- * @param user_data cast=(GObject *)
- */
-public static final native boolean _gtk_clipboard_set_with_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data);
-public static final boolean gtk_clipboard_set_with_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data) {
-	lock.lock();
-	try {
-		return _gtk_clipboard_set_with_owner(clipboard, target, n_targets, get_func, clear_func, user_data);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param clipboard cast=(GtkClipboard *)
- * @param targets cast=(const GtkTargetEntry *)
- * @param n_targets cast=(gint)
- */
-public static final native void _gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets);
-public static final void gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets) {
-	lock.lock();
-	try {
-		_gtk_clipboard_set_can_store(clipboard, targets, n_targets);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param clipboard cast=(GtkClipboard *)
- */
-public static final native void _gtk_clipboard_store(long /*int*/ clipboard);
-public static final void gtk_clipboard_store(long /*int*/ clipboard) {
-	lock.lock();
-	try {
-		_gtk_clipboard_store(clipboard);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param clipboard cast=(GtkClipboard *)
- * @param target cast=(GdkAtom)
- */
-public static final native long /*int*/ _gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target);
-public static final long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) {
-	lock.lock();
-	try {
-		return _gtk_clipboard_wait_for_contents(clipboard, target);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param title cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_color_selection_dialog_new(byte[] title);
-/** [GTK2/GTK3; 3.6 deprecated] */
-public static final long /*int*/ gtk_color_selection_dialog_new(byte[] title) {
-	lock.lock();
-	try {
-		return _gtk_color_selection_dialog_new(title);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param chooser cast=(GtkColorChooser *)
- * @param orientation cast=(GtkOrientation)
- * @param colors cast=(GdkRGBA *)
- */
-public static final native long /*int*/ _gtk_color_chooser_add_palette(long /*int*/ chooser, int orientation, int colors_per_line, int n_colors, long /*int*/ colors);
-public static final long /*int*/ gtk_color_chooser_add_palette(long /*int*/ chooser, int orientation, int colors_per_line, int n_colors, long /*int*/ colors) {
-	lock.lock();
-	try {
-		return _gtk_color_chooser_add_palette(chooser, orientation, colors_per_line, n_colors, colors);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param title cast=(const gchar *)
- * @param parent cast=(GtkWindow *)
- */
-public static final native long /*int*/ _gtk_color_chooser_dialog_new (byte[] title, long /*int*/ parent);
-public static final long /*int*/  gtk_color_chooser_dialog_new (byte[] title, long /*int*/ parent) {
-	lock.lock();
-	try {
-		return _gtk_color_chooser_dialog_new (title, parent);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_color_chooser_set_use_alpha (long /*int*/ chooser, boolean use_alpha);
-public static final void  gtk_color_chooser_set_use_alpha (long /*int*/ chooser, boolean use_alpha) {
-	lock.lock();
-	try {
-		 _gtk_color_chooser_set_use_alpha (chooser, use_alpha);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native boolean _gtk_color_chooser_get_use_alpha (long /*int*/ chooser);
-public static final boolean  gtk_color_chooser_get_use_alpha (long /*int*/ chooser) {
-	lock.lock();
-	try {
-		 return _gtk_color_chooser_get_use_alpha (chooser);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param color_dialog cast=(GtkColorSelectionDialog *)
- */
-public static final native long /*int*/ _gtk_color_selection_dialog_get_color_selection(long /*int*/ color_dialog);
-/** [GTK2/GTK3; 3.6 deprecated] */
-public static final long /*int*/ gtk_color_selection_dialog_get_color_selection(long /*int*/ color_dialog) {
-	lock.lock();
-	try {
-		return _gtk_color_selection_dialog_get_color_selection(color_dialog);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_color_chooser_set_rgba(long /*int*/ chooser, GdkRGBA color);
-public static final void  gtk_color_chooser_get_rgba(long /*int*/ chooser, GdkRGBA color) {
-	lock.lock();
-	try {
-		 _gtk_color_chooser_get_rgba(chooser, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_color_chooser_get_rgba(long /*int*/ chooser, GdkRGBA color);
-public static final void  gtk_color_chooser_set_rgba(long /*int*/ chooser, GdkRGBA color) {
-	lock.lock();
-	try {
-		 _gtk_color_chooser_set_rgba(chooser, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param color flags=no_in
- */
-public static final native void _gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color);
-/** [GTK2/GTK3; 3.4 deprecated] */
-public static final void gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_color_selection_get_current_color(colorsel, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_color_selection_palette_to_string(long /*int*/ colors, int n_colors);
-/** [GTK2/GTK3; 3.6 deprecated] */
-public static final long /*int*/ gtk_color_selection_palette_to_string(long /*int*/ colors, int n_colors) {
-	lock.lock();
-	try {
-		return _gtk_color_selection_palette_to_string(colors, n_colors);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param color flags=no_out
- */
-public static final native void _gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color);
-/** [GTK2/GTK3; 3.4 deprecated] */
-public static final void gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_color_selection_set_current_color(colorsel, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette);
-/** [GTK2/GTK3; 3.6 deprecated] */
-public static final void gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette) {
-	lock.lock();
-	try {
-		_gtk_color_selection_set_has_palette(colorsel, has_palette);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @method flags=dynamic
- * @param combo cast=(GtkComboBox *)
- * @param val cast=(gboolean)
- */
-public static final native void _gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val);
-/** [GTK2/GTK3; 3.20 deprecated] */
-public static final void gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val) {
-	lock.lock();
-	try {
-		_gtk_combo_box_set_focus_on_click(combo, val);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_combo_box_text_new();
-public static final long /*int*/ gtk_combo_box_text_new() {
-	lock.lock();
-	try {
-		return _gtk_combo_box_text_new();
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_combo_box_text_new_with_entry();
-public static final long /*int*/ gtk_combo_box_text_new_with_entry() {
-	lock.lock();
-	try {
-		return _gtk_combo_box_text_new_with_entry();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_combo_box_text_insert(long /*int*/ combo_box, int position, byte[] id, byte[] text);
-public static final void gtk_combo_box_text_insert(long /*int*/ combo_box, int position, byte[] id, byte[] text) {
-	lock.lock();
-	try {
-		_gtk_combo_box_text_insert(combo_box, position, id, text);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param combo_box cast=(GtkComboBoxText *)
- * @param position cast=(gint)
- * @param text cast=(const gchar *)
- */
-public static final native void _gtk_combo_box_text_insert_text(long /*int*/ combo_box, int position, byte[] text);
-public static final void gtk_combo_box_text_insert_text(long /*int*/ combo_box, int position, byte[] text) {
-	lock.lock();
-	try {
-		_gtk_combo_box_text_insert_text(combo_box, position, text);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param combo_box cast=(GtkComboBoxText *) */
-public static final native void _gtk_combo_box_text_remove(long /*int*/ combo_box, int position);
-public static final void gtk_combo_box_text_remove(long /*int*/ combo_box, int position) {
-	lock.lock();
-	try {
-		_gtk_combo_box_text_remove(combo_box, position);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_combo_box_text_remove_all(long /*int*/ combo_box);
-public static final void gtk_combo_box_text_remove_all(long /*int*/ combo_box) {
-	lock.lock();
-	try {
-		_gtk_combo_box_text_remove_all(combo_box);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
-* @param combo_box cast=(GtkComboBox *)
-*/
-public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box);
-public static final int gtk_combo_box_get_active(long /*int*/ combo_box) {
-	lock.lock();
-	try {
-		return _gtk_combo_box_get_active(combo_box);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
-* @param combo_box cast=(GtkComboBox *)
-*/
-public static final native long /*int*/ _gtk_combo_box_get_model(long /*int*/ combo_box);
-public static final long /*int*/ gtk_combo_box_get_model(long /*int*/ combo_box) {
-	lock.lock();
-	try {
-		return _gtk_combo_box_get_model(combo_box);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
-* @param combo_box cast=(GtkComboBox *)
-* @param index cast=(gint)
-*/
-public static final native void _gtk_combo_box_set_active(long /*int*/ combo_box, int index);
-public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int index) {
-	lock.lock();
-	try {
-		_gtk_combo_box_set_active(combo_box, index);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param combo_box cast=(GtkComboBox *)
- * @param width cast=(gint)
- */
-public static final native void _gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width);
-public static final void gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width) {
-	lock.lock();
-	try {
-		_gtk_combo_box_set_wrap_width(combo_box, width);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
-* @param combo_box cast=(GtkComboBox *)
-*/
-public static final native void _gtk_combo_box_popup(long /*int*/ combo_box);
-public static final void gtk_combo_box_popup(long /*int*/ combo_box) {
-	lock.lock();
-	try {
-		_gtk_combo_box_popup(combo_box);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
-* @param combo_box cast=(GtkComboBox *)
-*/
-public static final native void _gtk_combo_box_popdown(long /*int*/ combo_box);
-public static final void gtk_combo_box_popdown(long /*int*/ combo_box) {
-	lock.lock();
-	try {
-		_gtk_combo_box_popdown(combo_box);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param container cast=(GtkContainer *)
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_container_add(long /*int*/ container, long /*int*/ widget);
-public static final void gtk_container_add(long /*int*/ container, long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_container_add(container, widget);
-	} finally {
-		lock.unlock();
-	}
-}
-
-//Do not confuse this function with gtk_container_foreach(..).
-//Make sure you know what you are doing when using this. Please be attentive to swt_fixed_forall(..)
-// found in os_custom.c, which overrides this function for swtFixed container with custom behaviour.
-/**
- * @param container cast=(GtkContainer *)
- * @param callback cast=(GtkCallback)
- * @param callback_data cast=(gpointer)
- */
-public static final native void _gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data);
-public static final void gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data) {
-	lock.lock();
-	try {
-		_gtk_container_forall(container, callback, callback_data);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param container cast=(GtkContainer *) */
-public static final native int _gtk_container_get_border_width(long /*int*/ container);
-public static final int gtk_container_get_border_width(long /*int*/ container) {
-	lock.lock();
-	try {
-		return _gtk_container_get_border_width(container);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param container cast=(GtkContainer *) */
-public static final native long /*int*/ _gtk_container_get_children(long /*int*/ container);
-public static final long /*int*/ gtk_container_get_children(long /*int*/ container) {
-	lock.lock();
-	try {
-		return _gtk_container_get_children(container);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param container cast=(GtkContainer *)
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_container_remove(long /*int*/ container, long /*int*/ widget);
-public static final void gtk_container_remove(long /*int*/ container, long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_container_remove(container, widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param container cast=(GtkContainer *)
- * @param border_width cast=(guint)
- */
-public static final native void _gtk_container_set_border_width(long /*int*/ container, int border_width);
-public static final void gtk_container_set_border_width(long /*int*/ container, int border_width) {
-	lock.lock();
-	try {
-		_gtk_container_set_border_width(container, border_width);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkDialog *)
- * @param button_text cast=(const gchar *)
- * @param response_id cast=(gint)
- */
-public static final native long /*int*/ _gtk_dialog_add_button(long /*int*/ dialog, byte[]  button_text, int response_id);
-public static final long /*int*/ gtk_dialog_add_button(long /*int*/ dialog, byte[]  button_text, int response_id) {
-	lock.lock();
-	try {
-		return _gtk_dialog_add_button(dialog, button_text, response_id);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param dialog cast=(GtkDialog *) */
-public static final native int _gtk_dialog_run(long /*int*/ dialog);
-public static final int gtk_dialog_run(long /*int*/ dialog) {
-	lock.lock();
-	try {
-		return _gtk_dialog_run(dialog);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param targets cast=(GtkTargetList *)
- * @param actions cast=(GdkDragAction)
- * @param button cast=(gint)
- * @param event cast=(GdkEvent *)
- */
-public static final native long /*int*/ _gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event);
-/** [GTK2/GTK3; 3.10 deprecated] */
-public static final long /*int*/ gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event) {
-	lock.lock();
-	try {
-		return _gtk_drag_begin(widget, targets, actions, button, event);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param targets cast=(GtkTargetList *)
- * @param actions cast=(GdkDragAction)
- * @param button cast=(gint)
- * @param event cast=(GdkEvent *)
- * @param x cast=(gint)
- * @param y cast=(gint)
- */
-public static final native long /*int*/ _gtk_drag_begin_with_coordinates(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event, int x, int y);
-public static final long /*int*/ gtk_drag_begin_with_coordinates(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event, int x, int y) {
-	lock.lock();
-	try {
-		return _gtk_drag_begin_with_coordinates(widget, targets, actions, button, event, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param start_x cast=(gint)
- * @param start_y cast=(gint)
- * @param current_x cast=(gint)
- * @param current_y cast=(gint)
- */
-public static final native boolean _gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y);
-public static final boolean gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y) {
-	lock.lock();
-	try {
-		return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param context cast=(GdkDragContext *)
- * @param target_list cast=(GtkTargetList *)
- */
-public static final native long /*int*/ _gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list);
-public static final long /*int*/ gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list) {
-	lock.lock();
-	try {
-		return _gtk_drag_dest_find_target(widget, context, target_list);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param flags cast=(GtkDestDefaults)
- * @param targets cast=(const GtkTargetEntry *)
- * @param n_targets cast=(gint)
- * @param actions cast=(GdkDragAction)
- */
-public static final native void _gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions);
-public static final void gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions) {
-	lock.lock();
-	try {
-		_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_drag_dest_unset(long /*int*/ widget);
-public static final void gtk_drag_dest_unset(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_drag_dest_unset(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param context cast=(GdkDragContext *)
- * @param success cast=(gboolean)
- * @param delete cast=(gboolean)
- * @param time cast=(guint32)
- */
-public static final native void _gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time);
-public static final void gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time) {
-	lock.lock();
-	try {
-		_gtk_drag_finish(context, success, delete, time);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param context cast=(GdkDragContext *)
- * @param target cast=(GdkAtom)
- * @param time cast=(guint32)
- */
-public static final native void _gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time);
-public static final void gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time) {
-	lock.lock();
-	try {
-		_gtk_drag_get_data(widget, context, target, time);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param context cast=(GdkDragContext *)
- * @param pixbuf cast=(GdkPixbuf *)
- */
-public static final native void _gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y);
-public static final void gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y) {
-	lock.lock();
-	try {
-		_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_drag_set_icon_surface(long /*int*/ context, long /*int*/ surface);
-public static final void gtk_drag_set_icon_surface(long /*int*/ context, long /*int*/ surface) {
-	lock.lock();
-	try {
-		_gtk_drag_set_icon_surface(context, surface);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_copy_clipboard(long /*int*/ editable);
-public static final void gtk_editable_copy_clipboard(long /*int*/ editable) {
-	lock.lock();
-	try {
-		_gtk_editable_copy_clipboard(editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_cut_clipboard(long /*int*/ editable);
-public static final void gtk_editable_cut_clipboard(long /*int*/ editable) {
-	lock.lock();
-	try {
-		_gtk_editable_cut_clipboard(editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_delete_selection(long /*int*/ editable);
-public static final void gtk_editable_delete_selection(long /*int*/ editable) {
-	lock.lock();
-	try {
-		_gtk_editable_delete_selection(editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param editable cast=(GtkEditable *)
- * @param start_pos cast=(gint)
- * @param end_pos cast=(gint)
- */
-public static final native void _gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos);
-public static final void gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos) {
-	lock.lock();
-	try {
-		_gtk_editable_delete_text(editable, start_pos, end_pos);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param editable cast=(GtkEditable *) */
-public static final native boolean _gtk_editable_get_editable(long /*int*/ editable);
-public static final boolean gtk_editable_get_editable(long /*int*/ editable) {
-	lock.lock();
-	try {
-		return _gtk_editable_get_editable(editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param editable cast=(GtkEditable *) */
-public static final native int _gtk_editable_get_position(long /*int*/ editable);
-public static final int gtk_editable_get_position(long /*int*/ editable) {
-	lock.lock();
-	try {
-		return _gtk_editable_get_position(editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param editable cast=(GtkEditable *)
- * @param start cast=(gint *)
- * @param end cast=(gint *)
- */
-public static final native boolean _gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end);
-public static final boolean gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end) {
-	lock.lock();
-	try {
-		return _gtk_editable_get_selection_bounds(editable, start, end);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param editable cast=(GtkEditable *)
- * @param new_text cast=(gchar *)
- * @param new_text_length cast=(gint)
- * @param position cast=(gint *)
- */
-public static final native void _gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position);
-public static final void gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position) {
-	lock.lock();
-	try {
-		_gtk_editable_insert_text(editable, new_text, new_text_length, position);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_paste_clipboard(long /*int*/ editable);
-public static final void gtk_editable_paste_clipboard(long /*int*/ editable) {
-	lock.lock();
-	try {
-		_gtk_editable_paste_clipboard(editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param editable cast=(GtkEditable *)
- * @param start cast=(gint)
- * @param end cast=(gint)
- */
-public static final native void _gtk_editable_select_region(long /*int*/ editable, int start, int end);
-public static final void gtk_editable_select_region(long /*int*/ editable, int start, int end) {
-	lock.lock();
-	try {
-		_gtk_editable_select_region(editable, start, end);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEditable *)
- * @param editable cast=(gboolean)
- */
-public static final native void _gtk_editable_set_editable(long /*int*/ entry, boolean editable);
-public static final void gtk_editable_set_editable(long /*int*/ entry, boolean editable) {
-	lock.lock();
-	try {
-		_gtk_editable_set_editable(entry, editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param editable cast=(GtkEditable *)
- * @param position cast=(gint)
- */
-public static final native void _gtk_editable_set_position(long /*int*/ editable, int position);
-public static final void gtk_editable_set_position(long /*int*/ editable, int position) {
-	lock.lock();
-	try {
-		_gtk_editable_set_position(editable, position);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_entry_get_inner_border (long /*int*/ entry);
-/** [GTK2/GTK3; 3.4 deprecated] */
-public static final long /*int*/ gtk_entry_get_inner_border (long /*int*/ entry) {
-	lock.lock();
-	try {
-		return _gtk_entry_get_inner_border(entry);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param self cast=(GtkEntry *)
- * @param n_chars cast=(gint)
- */
-public static final native void  _gtk_entry_set_width_chars (long /*int*/ self, int n_chars);
-public static final void  gtk_entry_set_width_chars (long /*int*/ self, int n_chars) {
-	lock.lock();
-	try {
-		_gtk_entry_set_width_chars(self, n_chars);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param entry cast=(GtkEntry *) */
-public static final native char _gtk_entry_get_invisible_char(long /*int*/ entry);
-public static final char gtk_entry_get_invisible_char(long /*int*/ entry) {
-	lock.lock();
-	try {
-		return _gtk_entry_get_invisible_char(entry);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param entry cast=(GtkEntry *) */
-public static final native long /*int*/ _gtk_entry_get_layout (long /*int*/ entry);
-public static final long /*int*/ gtk_entry_get_layout (long /*int*/ entry) {
-	lock.lock();
-	try {
-		return _gtk_entry_get_layout(entry);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEntry *)
- * @param x cast=(gint *)
- * @param y cast=(gint *)
- */
-public static final native void _gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y);
-public static final void gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y) {
-	lock.lock();
-	try {
-		_gtk_entry_get_layout_offsets(entry, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEntry *)
- * @param index cast=(gint)
- */
-public static final native int _gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index);
-public static final int gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index) {
-	lock.lock();
-	try {
-		return _gtk_entry_text_index_to_layout_index(entry, index);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param entry cast=(GtkEntry *)
- */
-public static final native int _gtk_entry_get_icon_area(long /*int*/ entry, int icon_pos, GdkRectangle icon_area);
-public static final int gtk_entry_get_icon_area(long /*int*/ entry, int icon_pos, GdkRectangle icon_area) {
-	lock.lock();
-	try {
-		return _gtk_entry_get_icon_area(entry, icon_pos, icon_area);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param entry cast=(GtkEntry *) */
-public static final native int _gtk_entry_get_max_length(long /*int*/ entry);
-public static final int gtk_entry_get_max_length(long /*int*/ entry) {
-	lock.lock();
-	try {
-		return _gtk_entry_get_max_length(entry);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param entry cast=(GtkEntry *) */
-public static final native long /*int*/ _gtk_entry_get_text(long /*int*/ entry);
-public static final long /*int*/ gtk_entry_get_text(long /*int*/ entry) {
-	lock.lock();
-	try {
-		return _gtk_entry_get_text(entry);
-	} finally {
-		lock.unlock();
-	}
-}
 /** @method flags=dynamic */
 public static final native boolean _FcConfigAppFontAddFile(long /*int*/ config, byte[] file);
 public static final boolean FcConfigAppFontAddFile(long /*int*/ config, byte[] file) {
@@ -7465,7790 +5421,7 @@ public static final boolean FcConfigAppFontAddFile(long /*int*/ config, byte[] f
 		lock.unlock();
 	}
 }
-/** @param entry cast=(GtkEntry *) */
-public static final native boolean _gtk_entry_get_visibility(long /*int*/ entry);
-public static final boolean gtk_entry_get_visibility(long /*int*/ entry) {
-	lock.lock();
-	try {
-		return _gtk_entry_get_visibility(entry);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_entry_new();
-public static final long /*int*/ gtk_entry_new() {
-	lock.lock();
-	try {
-		return _gtk_entry_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEntry *)
- * @param xalign cast=(gfloat)
- */
-public static final native void _gtk_entry_set_alignment(long /*int*/ entry, float xalign);
-public static final void gtk_entry_set_alignment(long /*int*/ entry, float xalign) {
-	lock.lock();
-	try {
-		_gtk_entry_set_alignment(entry, xalign);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEntry *)
- * @param setting cast=(gboolean)
- */
-public static final native void _gtk_entry_set_has_frame(long /*int*/ entry, boolean setting);
-public static final void gtk_entry_set_has_frame(long /*int*/ entry, boolean setting) {
-	lock.lock();
-	try {
-		_gtk_entry_set_has_frame(entry, setting);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param entry cast=(GtkEntry *)
- * @param iconPos cast=(gint)
- * @param stock cast=(const gchar *)
- */
-public static final native void _gtk_entry_set_icon_from_icon_name(long /*int*/ entry, int iconPos, byte[] stock);
-public static final void gtk_entry_set_icon_from_icon_name(long /*int*/ entry, int iconPos, byte[] iconName) {
-	lock.lock();
-	try {
-		_gtk_entry_set_icon_from_icon_name(entry, iconPos, iconName);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param entry cast=(GtkEntry *)
- * @param icon_pos cast=(GtkEntryIconPosition)
- * @param sensitive cast=(gboolean)
- */
-public static final native void _gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive);
-public static final void gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive) {
-	lock.lock();
-	try {
-		_gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEntry *)
- * @param ch cast=(gint)
- */
-public static final native void _gtk_entry_set_invisible_char(long /*int*/ entry, char ch);
-public static final void gtk_entry_set_invisible_char(long /*int*/ entry, char ch) {
-	lock.lock();
-	try {
-		_gtk_entry_set_invisible_char(entry, ch);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEntry *)
- * @param max cast=(gint)
- */
-public static final native void _gtk_entry_set_max_length(long /*int*/ entry, int max);
-public static final void gtk_entry_set_max_length(long /*int*/ entry, int max) {
-	lock.lock();
-	try {
-		_gtk_entry_set_max_length(entry, max);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEntry *)
- * @param text cast=(const gchar *)
- */
-public static final native void _gtk_entry_set_text(long /*int*/ entry, byte[] text);
-public static final void gtk_entry_set_text(long /*int*/ entry, byte[] text) {
-	lock.lock();
-	try {
-		_gtk_entry_set_text(entry, text);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param entry cast=(GtkEntry *)
- * @param text cast=(const gchar *)
- */
-public static final native void _gtk_entry_set_placeholder_text(long /*int*/ entry, byte[] text);
-public static final void gtk_entry_set_placeholder_text(long /*int*/ entry, byte[] text) {
-	lock.lock();
-	try {
-		_gtk_entry_set_placeholder_text(entry, text);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param entry cast=(GtkEntry *)
- * @param visible cast=(gboolean)
- */
-public static final native void _gtk_entry_set_visibility(long /*int*/ entry, boolean visible);
-public static final void gtk_entry_set_visibility(long /*int*/ entry, boolean visible) {
-	lock.lock();
-	try {
-		_gtk_entry_set_visibility(entry, visible);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param expander cast=(GtkExpander *) */
-public static final native boolean _gtk_expander_get_expanded(long /*int*/ expander);
-public static final boolean gtk_expander_get_expanded(long /*int*/ expander) {
-	lock.lock();
-	try {
-		return _gtk_expander_get_expanded(expander);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param label cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_expander_new(byte[] label);
-public static final long /*int*/ gtk_expander_new(byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_expander_new(label);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param expander cast=(GtkExpander *) */
-public static final native void _gtk_expander_set_expanded(long /*int*/ expander, boolean expanded);
-public static final void gtk_expander_set_expanded(long /*int*/ expander, boolean expanded) {
-	lock.lock();
-	try {
-		_gtk_expander_set_expanded(expander, expanded);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param expander cast=(GtkExpander *)
- * @param label_widget cast=(GtkWidget *)
- */
-public static final native void _gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget);
-public static final void  gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget) {
-	lock.lock();
-	try {
-		_gtk_expander_set_label_widget(expander, label_widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param filter cast=(GtkFileFilter *)
- */
-public static final native void _gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter);
-public static final void gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_add_filter(chooser, filter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param title cast=(const gchar *),flags=no_out
- * @param parent cast=(GtkWindow *)
- * @param first_button_text cast=(const gchar *),flags=no_out
- * @param terminator cast=(const gchar *),flags=sentinel
- */
-public static final native long /*int*/ _gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long /*int*/ terminator);
-public static final long /*int*/ gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long /*int*/ terminator) {
-	lock.lock();
-	try {
-		return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param title cast=(const gchar *),flags=no_out
- * @param parent cast=(GtkWindow *)
- * @param first_button_text cast=(const gchar *),flags=no_out
- * @param terminator cast=(const gchar *),flags=sentinel
- */
-public static final native long /*int*/ _gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator);
-public static final long /*int*/ gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator) {
-	lock.lock();
-	try {
-		return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param chooser cast=(GtkFileChooser *) */
-public static final native long /*int*/ _gtk_file_chooser_get_filename(long /*int*/ chooser);
-public static final long /*int*/ gtk_file_chooser_get_filename(long /*int*/ chooser) {
-	lock.lock();
-	try {
-		return _gtk_file_chooser_get_filename(chooser);
-	} finally {
-		lock.unlock();
-	}
-}
-/**  @param chooser cast=(GtkFileChooser *) */
-public static final native long /*int*/ _gtk_file_chooser_get_filenames(long /*int*/ chooser);
-public static final long /*int*/ gtk_file_chooser_get_filenames(long /*int*/ chooser) {
-	lock.lock();
-	try {
-		return _gtk_file_chooser_get_filenames(chooser);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param chooser cast=(GtkFileChooser *) */
-public static final native long /*int*/ _gtk_file_chooser_get_uri(long /*int*/ chooser);
-public static final long /*int*/ gtk_file_chooser_get_uri(long /*int*/ chooser) {
-	lock.lock();
-	try {
-		return _gtk_file_chooser_get_uri(chooser);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param chooser cast=(GtkFileChooser *) */
-public static final native long /*int*/ _gtk_file_chooser_get_uris(long /*int*/ chooser);
-public static final long /*int*/ gtk_file_chooser_get_uris(long /*int*/ chooser) {
-	lock.lock();
-	try {
-		return _gtk_file_chooser_get_uris(chooser);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param chooser cast=(GtkFileChooser *) */
-public static final native long /*int*/ _gtk_file_chooser_get_filter(long /*int*/ chooser);
-public static final long /*int*/ gtk_file_chooser_get_filter(long /*int*/ chooser) {
-	lock.lock();
-	try {
-		return _gtk_file_chooser_get_filter(chooser);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param filename cast=(const gchar *)
- */
-public static final native void _gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename);
-public static final void gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_current_folder(chooser, filename);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param uri cast=(const gchar *)
- */
-public static final native void _gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri);
-public static final void gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_current_folder_uri(chooser, uri);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param name cast=(const gchar *)
- */
-public static final native void _gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name);
-public static final void gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_current_name(chooser, name);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param local_only cast=(gboolean)
- */
-public static final native void _gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only);
-public static final void gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_local_only(chooser, local_only);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param do_overwrite_confirmation cast=(gboolean)
- */
-public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation);
-public static final void gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param extra_widget cast=(GtkWidget *)
- */
-public static final native void _gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget);
-public static final void gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param name cast=(const gchar *)
- */
-public static final native void _gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name);
-public static final void gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_filename(chooser, name);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param filter cast=(GtkFileFilter *)
- */
-public static final native void _gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter);
-public static final void gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_filter(chooser, filter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param uri cast=(const char *)
- */
-public static final native void _gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri);
-public static final void gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_uri(chooser, uri);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param chooser cast=(GtkFileChooser *)
- * @param select_multiple cast=(gboolean)
- */
-public static final native void _gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple);
-public static final void gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple) {
-	lock.lock();
-	try {
-		_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_event_controller_set_propagation_phase(long /*int*/ controller, int phase);
-public static final void gtk_event_controller_set_propagation_phase(long /*int*/ controller, int phase) {
-        lock.lock();
-        try {
-                _gtk_event_controller_set_propagation_phase(controller, phase);
-        } finally {
-                lock.unlock();
-        }
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_event_controller_handle_event(long /*int*/ gesture, long /*int*/ event);
-public static final void gtk_event_controller_handle_event(long /*int*/ gesture, long /*int*/ event) {
-        lock.lock();
-        try {
-                _gtk_event_controller_handle_event(gesture, event);
-        } finally {
-                lock.unlock();
-        }
-}
-
-/**
- * @param filter cast=(GtkFileFilter *)
- * @param pattern cast=(const gchar *)
- */
-public static final native void _gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern);
-public static final void gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern) {
-	lock.lock();
-	try {
-		_gtk_file_filter_add_pattern(filter, pattern);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_file_filter_new();
-public static final long /*int*/ gtk_file_filter_new() {
-	lock.lock();
-	try {
-		return _gtk_file_filter_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param filter cast=(GtkFileFilter *) */
-public static final native long /*int*/ _gtk_file_filter_get_name(long /*int*/ filter);
-public static final long /*int*/ gtk_file_filter_get_name(long /*int*/ filter) {
-	lock.lock();
-	try {
-		return _gtk_file_filter_get_name(filter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param filter cast=(GtkFileFilter *)
- * @param name cast=(const gchar *)
- */
-public static final native void _gtk_file_filter_set_name(long /*int*/ filter, byte[] name);
-public static final void gtk_file_filter_set_name(long /*int*/ filter, byte[] name) {
-	lock.lock();
-	try {
-		_gtk_file_filter_set_name(filter, name);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param fixed cast=(GtkFixed *)
- * @param widget cast=(GtkWidget *)
- * @param x cast=(gint)
- * @param y cast=(gint)
- */
-public static final native void _gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y);
-public static final void gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y) {
-	lock.lock();
-	try {
-		_gtk_fixed_move(fixed, widget, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_fixed_new();
-public static final long /*int*/ gtk_fixed_new() {
-	lock.lock();
-	try {
-		return _gtk_fixed_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native boolean _gtk_gesture_drag_get_start_point(long /*int*/ gesture, double[] x, double [] y);
-public static final boolean gtk_gesture_drag_get_start_point(long /*int*/ gesture, double[] x, double [] y) {
-	lock.lock();
-	try {
-		return _gtk_gesture_drag_get_start_point(gesture, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native boolean _gtk_gesture_is_recognized(long /*int*/ gesture);
-public static final boolean gtk_gesture_is_recognized(long /*int*/ gesture) {
-	lock.lock();
-	try {
-		return _gtk_gesture_is_recognized(gesture);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */
-public static final native long /*int*/ _gtk_gesture_drag_new(long /*int*/ widget);
-public static final long /*int*/ gtk_gesture_drag_new(long /*int*/ widget) {
-        lock.lock();
-        try {
-                return _gtk_gesture_drag_new(widget);
-        } finally {
-                lock.unlock();
-        }
-}
-/**
- * @method flags=dynamic
- */
-public static final native long /*int*/ _gtk_gesture_get_last_event(long /*int*/ gesture, long /*int*/ sequence);
-public static final long /*int*/ gtk_gesture_get_last_event(long /*int*/ gesture, long /*int*/ sequence) {
-		lock.lock();
-		try {
-			return _gtk_gesture_get_last_event(gesture,sequence);
-		} finally {
-			lock.unlock();
-		}
-}
-/**
- * @method flags=dynamic
- */
-public static final native long /*int*/ _gtk_gesture_get_last_updated_sequence(long /*int*/ gesture);
-public static final long /*int*/ gtk_gesture_get_last_updated_sequence(long /*int*/ gesture) {
-		lock.lock();
-		try {
-			return _gtk_gesture_get_last_updated_sequence(gesture);
-		} finally {
-			lock.unlock();
-		}
-}
-/**
- * @method flags=dynamic
- */
-public static final native boolean _gtk_gesture_get_point(long /*int*/ gesture, long /*int*/ sequence, double[] x, double [] y);
-public static final boolean gtk_gesture_get_point(long /*int*/ gesture, long /*int*/ sequence, double[] x, double [] y) {
-		lock.lock();
-		try {
-			return _gtk_gesture_get_point(gesture, sequence, x, y);
-		} finally {
-			lock.unlock();
-		}
-}
-/**
- * @method flags=dynamic
- */
-public static final native long /*int*/ _gtk_gesture_get_sequences(long /*int*/ gesture);
-public static final long /*int*/ gtk_gesture_get_sequences(long /*int*/ gesture) {
-		lock.lock();
-		try {
-			return _gtk_gesture_get_sequences(gesture);
-		} finally {
-			lock.unlock();
-		}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_gesture_group (long /*int*/ group_gesture, long /*int*/ gesture);
-public static final void gtk_gesture_group (long /*int*/ group_gesture, long /*int*/ gesture) {
-        lock.lock();
-        try {
-                 _gtk_gesture_group(group_gesture, gesture);
-        } finally {
-                lock.unlock();
-        }
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_gesture_pan_set_orientation(long /*int*/ orientation);
-public static final void gtk_gesture_pan_set_orientation(long /*int*/ orientation) {
-	lock.lock();
-	try {
-		 _gtk_gesture_pan_set_orientation(orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native long /*int*/ _gtk_gesture_pan_get_orientation(long /*int*/ gesture);
-public static final long /*int*/ gtk_gesture_pan_get_orientation(long /*int*/ gesture) {
-	lock.lock();
-	try {
-		return _gtk_gesture_pan_get_orientation(gesture);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_gesture_pan_new (long /*int*/ widget, long /*int*/ orientation);
-public static final void gtk_gesture_pan_new (long /*int*/ widget, long /*int*/ orientation) {
-	lock.lock();
-	try {
-		_gtk_gesture_pan_new(widget, orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_gesture_single_set_button(long /*int*/ gesture, int button);
-public static final void gtk_gesture_single_set_button(long /*int*/ gesture, int button) {
-        lock.lock();
-        try {
-                 _gtk_gesture_single_set_button(gesture, button);
-        } finally {
-                lock.unlock();
-        }
-}
-/**
- * @method flags=dynamic
- */
-public static final native boolean _gtk_gesture_swipe_get_velocity(long /*int*/ gesture, double [] velocity_x, double[] velocity_y);
-public static final boolean gtk_gesture_swipe_get_velocity(long /*int*/ gesture, double [] velocity_x, double[] velocity_y) {
-	lock.lock();
-	try {
-		return _gtk_gesture_swipe_get_velocity(gesture, velocity_x, velocity_y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native long /*int*/ _gtk_gesture_swipe_new (long /*int*/ widget);
-public static final long /*int*/ gtk_gesture_swipe_new (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_gesture_swipe_new(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_gesture_drag_get_offset(long /*int*/ gesture, double[] x, double[] y);
-public static final void gtk_gesture_drag_get_offset(long /*int*/ gesture, double[] x, double[] y) {
-        lock.lock();
-        try {
-                _gtk_gesture_drag_get_offset(gesture, x, y);
-        } finally {
-                lock.unlock();
-        }
-}
-/**
- * @method flags=dynamic
- */
-
-public static final native double _gtk_gesture_rotate_get_angle_delta (long /*int*/ gesture);
-public static final double gtk_gesture_rotate_get_angle_delta (long /*int*/ gesture) {
-	lock.lock();
-	try {
-			return _gtk_gesture_rotate_get_angle_delta(gesture);
-	} finally {
-			lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-
-public static final native long /*int*/ _gtk_gesture_rotate_new(long /*int*/ widget);
-public static final long /*int*/ gtk_gesture_rotate_new(long /*int*/ widget) {
-        lock.lock();
-        try {
-                return _gtk_gesture_rotate_new(widget);
-        } finally {
-                lock.unlock();
-        }
-}
-/**
- * @method flags=dynamic
- */
-public static final native long /*int*/ _gtk_gesture_zoom_new(long /*int*/ widget);
-public static final long /*int*/ gtk_gesture_zoom_new(long /*int*/ widget) {
-        lock.lock();
-        try {
-                return _gtk_gesture_zoom_new(widget);
-        } finally {
-                lock.unlock();
-        }
-}
-
-/**
- * @method flags=dynamic
- */
-public static final native double _gtk_gesture_zoom_get_scale_delta (long /*int*/ gesture);
-public static final double gtk_gesture_zoom_get_scale_delta (long /*int*/ gesture) {
-        lock.lock();
-        try {
-                return _gtk_gesture_zoom_get_scale_delta(gesture);
-        } finally {
-                lock.unlock();
-        }
-}
-
-/**
- * @param widget cast=(GtkWidget *)
- * @param has_window cast=(gboolean)
- */
-public static final native void _gtk_widget_set_has_window(long /*int*/ widget, boolean has_window);
-public static final void gtk_widget_set_has_window(long /*int*/ widget, boolean has_window) {
-	lock.lock();
-	try {
-		_gtk_widget_set_has_window(widget, has_window);
-	} finally {
-		lock.unlock();
-	}
-}
-
-//since Gtk 3.16. For pre-gtk3.16, use gtk_misc_set_alignment(..)
-/**
- * @method flags=dynamic
- * @param label cast=(GtkLabel *)
- * @param xalign cast=(gfloat)
- *
- */
-public static final native void _gtk_label_set_xalign(long /*int*/ label, float xalign);
-public static final void gtk_label_set_xalign(long /*int*/ label, float xalign) {
-	lock.lock();
-	try {
-		_gtk_label_set_xalign(label, xalign);
-	} finally {
-		lock.unlock();
-	}
-}
-
-
-//since Gtk 3.16. For pre-gtk3.16, use gtk_misc_set_alignment(..)
-/**
-* @method flags=dynamic
-* @param label cast=(GtkLabel *)
-* @param yalign cast=(gfloat)
-*
-*/
-public static final native void _gtk_label_set_yalign(long /*int*/ label, float yalign);
-public static final void gtk_label_set_yalign(long /*int*/ label, float yalign) {
-	lock.lock();
-	try {
-		_gtk_label_set_yalign(label, yalign);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- *
- */ //Omited enum: @param gtk_align cast=(GtkAlign) as is causes build errors on gtk2 as GtkAlign doesn't exist there.
-public static final native void _gtk_widget_set_halign(long /*int*/ widget, int gtk_align);
-public static final void gtk_widget_set_halign(long /*int*/ widget, int gtk_align) {
-	lock.lock();
-	try {
-		_gtk_widget_set_halign(widget, gtk_align);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */ //Omited enum: @param gtk_align cast=(GtkAlign) as is causes build errors on gtk2 as GtkAlign doesn't exist there.
-public static final native void _gtk_widget_set_valign(long /*int*/ widget, int gtk_align);
-public static final void gtk_widget_set_valign(long /*int*/ widget, int gtk_align ) {
-	lock.lock();
-	try {
-		_gtk_widget_set_valign(widget, gtk_align);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_font_selection_dialog_get_font_name(long /*int*/ fsd);
-/** [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_font_selection_dialog_get_font_name(long /*int*/ fsd) {
-	lock.lock();
-	try {
-		return _gtk_font_selection_dialog_get_font_name(fsd);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param title cast=(const gchar *)
- * @param parent cast=(GtkWindow *)
- */
-public static final native long /*int*/ _gtk_font_chooser_dialog_new(byte[] title, long /*int*/ parent);
-public static final long /*int*/ gtk_font_chooser_dialog_new(byte[] title, long /*int*/ parent) {
-	lock.lock();
-	try {
-		return _gtk_font_chooser_dialog_new(title, parent);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_font_chooser_get_font(long /*int*/ fontchooser);
-public static final long /*int*/ gtk_font_chooser_get_font(long /*int*/ fontchooser) {
-	lock.lock();
-	try {
-		return _gtk_font_chooser_get_font(fontchooser);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param fontname cast=(const gchar *)
- */
-public static final native void _gtk_font_chooser_set_font(long /*int*/ fsd, byte[] fontname);
-public static final void gtk_font_chooser_set_font(long /*int*/ fsd, byte[] fontname) {
-	lock.lock();
-	try {
-		_gtk_font_chooser_set_font(fsd, fontname);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param title cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_font_selection_dialog_new(byte[] title);
-/** [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_font_selection_dialog_new(byte[] title) {
-	lock.lock();
-	try {
-		return _gtk_font_selection_dialog_new(title);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param fontname cast=(const gchar *)
- */
-public static final native boolean _gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname);
-/** [GTK2/GTK3; 2.x/3.2 deprecated] */
-public static final boolean gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname) {
-	lock.lock();
-	try {
-		return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param label cast=(const gchar *) */
-public static final native long /*int*/ _gtk_frame_new(byte[] label);
-public static final long /*int*/ gtk_frame_new(byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_frame_new(label);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param frame cast=(GtkFrame *) */
-public static final native long /*int*/ _gtk_frame_get_label_widget(long /*int*/ frame);
-public static final long /*int*/ gtk_frame_get_label_widget(long /*int*/ frame) {
-	lock.lock();
-	try {
-		return _gtk_frame_get_label_widget(frame);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param frame cast=(GtkFrame *)
- * @param label_widget cast=(GtkWidget *)
- */
-public static final native void _gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget);
-public static final void gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget) {
-	lock.lock();
-	try {
-		_gtk_frame_set_label_widget(frame, label_widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param frame cast=(GtkFrame *)
- * @param type cast=(GtkShadowType)
- */
-public static final native void _gtk_frame_set_shadow_type(long /*int*/ frame, int type);
-public static final void gtk_frame_set_shadow_type(long /*int*/ frame, int type) {
-	lock.lock();
-	try {
-		_gtk_frame_set_shadow_type(frame, type);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_get_current_event();
-public static final long /*int*/ gtk_get_current_event() {
-	lock.lock();
-	try {
-		return _gtk_get_current_event();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param state cast=(GdkModifierType*) */
-public static final native boolean _gtk_get_current_event_state (int[] state);
-public static final boolean gtk_get_current_event_state (int[] state) {
-	lock.lock();
-	try {
-		return _gtk_get_current_event_state(state);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_get_default_language();
-public static final long /*int*/ gtk_get_default_language() {
-	lock.lock();
-	try {
-		return _gtk_get_default_language();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param event cast=(GdkEvent *) */
-public static final native long /*int*/ _gtk_get_event_widget(long /*int*/ event);
-public static final long /*int*/ gtk_get_event_widget(long /*int*/ event) {
-	lock.lock();
-	try {
-		return _gtk_get_event_widget(event);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_grab_add(long /*int*/ widget);
-public static final void gtk_grab_add(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_grab_add(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-
-public static final native long /*int*/ _gtk_grab_get_current();
-public static final long /*int*/ gtk_grab_get_current() {
-	lock.lock();
-	try {
-		return _gtk_grab_get_current();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_grab_remove(long /*int*/ widget);
-public static final void gtk_grab_remove(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_grab_remove(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @method flags=dynamic
- * @param homogeneous cast=(gboolean)
- * @param spacing cast=(gint)
- */
-public static final native long /*int*/ _gtk_hbox_new(boolean homogeneous, int spacing);
-/** [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_hbox_new(boolean homogeneous, int spacing) {
-	lock.lock();
-	try {
-		return _gtk_hbox_new(homogeneous, spacing);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param h cast=(gdouble)
- * @param s cast=(gdouble)
- * @param v cast=(gdouble)
- * @param r cast=(gdouble *)
- * @param g cast=(gdouble *)
- * @param b cast=(gdouble *)
- */
-public static final native void _gtk_hsv_to_rgb(double h, double s, double v, double[] r, double[] g, double[] b);
-public static final void gtk_hsv_to_rgb(double h, double s, double v, double[] r, double[] g, double[] b) {
-	lock.lock();
-	try {
-		_gtk_hsv_to_rgb(h, s, v, r, g, b);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param r cast=(gdouble)
- * @param g cast=(gdouble)
- * @param b cast=(gdouble)
- * @param h cast=(gdouble *)
- * @param s cast=(gdouble *)
- * @param v cast=(gdouble *)
- */
-public static final native void _gtk_rgb_to_hsv(double r, double g, double b, double[] h, double[] s, double[] v);
-public static final void gtk_rgb_to_hsv(double r, double g, double b, double[] h, double[] s, double[] v) {
-	lock.lock();
-	try {
-		_gtk_rgb_to_hsv(r, g, b, h, s, v);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param orientation cast=(GtkOrientation)
- */
-public static final native long /*int*/ _gtk_box_new(int orientation, int spacing);
-public static final long /*int*/ gtk_box_new(int orientation, int spacing) {
-	lock.lock();
-	try {
-		return _gtk_box_new(orientation, spacing);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param box cast=(GtkBox *)
- * @param widget cast=(GtkWidget *)
- * @param expand cast=(gboolean)
- * @param fill cast=(gboolean)
- * @param padding cast=(guint)
- */
-public static final native void /*int*/ _gtk_box_pack_end(long /*int*/ box, long /*int*/ widget,
-		boolean expand, boolean fill, int padding);
-public static final void /*int*/ gtk_box_pack_end(long /*int*/ box, long /*int*/ widget,
-		boolean expand, boolean fill, int padding) {
-	lock.lock();
-	try {
-		_gtk_box_pack_end(box, widget, expand, fill, padding);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param box cast=(GtkBox *)
- * @param child cast=(GtkWidget *)
- * @param position cast=(gint)
- */
-public static final native void /*int*/ _gtk_box_reorder_child(long /*int*/ box, long /*int*/ child, int position);
-public static final void /*int*/ gtk_box_reorder_child(long /*int*/ box, long /*int*/ child, int position) {
-	lock.lock();
-	try {
-		_gtk_box_reorder_child(box, child, position);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param box cast=(GtkBox *)
- * @param homogeneous cast=(gboolean)
- */
-public static final native void _gtk_box_set_homogeneous(long /*int*/ box, boolean homogeneous);
-public static final void gtk_box_set_homogeneous(long /*int*/ box, boolean homogeneous) {
-	lock.lock();
-	try {
-		_gtk_box_set_homogeneous(box, homogeneous);
-	} finally {
-		lock.unlock();
-	}
-}
-
-public static final native long /*int*/ _gtk_event_box_new();
-public static final long /*int*/ gtk_event_box_new() {
-	lock.lock();
-	try {
-		return _gtk_event_box_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- *  @method flags=dynamic
- *  @param adjustment cast=(GtkAdjustment *)
- */
-public static final native long /*int*/ _gtk_hscale_new(long /*int*/ adjustment);
-/** [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_hscale_new(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_hscale_new(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- *  @method flags=dynamic
- *  @param orientation cast=(GtkOrientation)
- *  @param adjustment cast=(GtkAdjustment *)
- */
-public static final native long /*int*/ _gtk_scale_new(int orientation, long /*int*/ adjustment);
-public static final long /*int*/ gtk_scale_new(int orientation, long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_scale_new(orientation, adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
-* @method flags=dynamic
-* @param adjustment cast=(GtkAdjustment *)
-*/
-public static final native long /*int*/ _gtk_hscrollbar_new(long /*int*/ adjustment);
-/** [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_hscrollbar_new(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_hscrollbar_new(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param orientation cast=(GtkOrientation)
- * @param adjustment cast=(GtkAdjustment *)
- * */
-public static final native long /*int*/ _gtk_scrollbar_new(int orientation, long /*int*/ adjustment);
-public static final long /*int*/ gtk_scrollbar_new(int orientation, long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_scrollbar_new(orientation, adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_hseparator_new();
-public static final long /*int*/ gtk_hseparator_new() {
-	lock.lock();
-	try {
-		return _gtk_hseparator_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param orientation cast=(GtkOrientation)
- */
-public static final native long /*int*/ _gtk_separator_new(int orientation);
-public static final long /*int*/ gtk_separator_new(int orientation) {
-	lock.lock();
-	try {
-		return _gtk_separator_new(orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-
-// Get function pointer to gtk_status_icon_position_menu
-// See os_custom.h
-public static final native long /*int*/ _gtk_status_icon_position_menu_func();
-public static final long /*int*/ gtk_status_icon_position_menu_func() {
-	lock.lock();
-	try {
-		return _gtk_status_icon_position_menu_func();
-	} finally {
-		lock.unlock();
-	}
-}
-
-// See os_custom.h
-// Dynamically get's the function pointer to gtk_false(). Gtk2/Gtk3.
-public static final native long /*int*/ _GET_FUNCTION_POINTER_gtk_false();
-public static final long /*int*/ GET_FUNCTION_POINTER_gtk_false() {
-	lock.lock();
-	try {
-		return _GET_FUNCTION_POINTER_gtk_false();
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_icon_info_free(long /*int*/ icon_info);
-/** [GTK2/GTK3; 3.8 deprecated] */
-public static final void gtk_icon_info_free(long /*int*/ icon_info) {
-	lock.lock();
-	try {
-		_gtk_icon_info_free(icon_info);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @return cast=(GtkIconTheme *) */
-public static final native long /*int*/ _gtk_icon_theme_get_default();
-public static final long /*int*/ gtk_icon_theme_get_default() {
-	lock.lock();
-	try {
-		return _gtk_icon_theme_get_default ();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param icon_theme cast=(GtkIconTheme *)
- * @param icon cast=(GIcon *)
- * @param size cast=(gint)
- * @param flags cast=(GtkIconLookupFlags)
- */
-public static final native long /*int*/ _gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags);
-public static final long /*int*/ gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags) {
-	lock.lock();
-	try {
-		return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param icon_theme cast=(GtkIconTheme *)
- * @param icon_name cast=(const gchar *)
- * @param size cast=(gint)
- * @param flags cast=(GtkIconLookupFlags)
- * @param error cast=(GError **)
- */
-public static final native long /*int*/ _gtk_icon_theme_load_icon(long /*int*/ icon_theme, byte[] icon_name, int size, int flags, long /*int*/ error);
-public static final long /*int*/ gtk_icon_theme_load_icon(long /*int*/ icon_theme, byte[] icon_name, int size, int flags, long /*int*/ error) {
-	lock.lock();
-	try {
-		return _gtk_icon_theme_load_icon (icon_theme, icon_name, size, flags, error);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param icon_info cast=(GtkIconInfo *)
- * @param error cast=(GError **)
- */
-public static final native long /*int*/ _gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]);
-public static final long /*int*/ gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]) {
-	lock.lock();
-	try {
-		return _gtk_icon_info_load_icon(icon_info, error);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param context cast=(GtkIMContext *)
- * @param event cast=(GdkEventKey *)
- */
-public static final native boolean _gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event);
-public static final boolean gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event) {
-	lock.lock();
-	try {
-		return _gtk_im_context_filter_keypress(context, event);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_focus_in(long /*int*/ context);
-public static final void gtk_im_context_focus_in(long /*int*/ context) {
-	lock.lock();
-	try {
-		_gtk_im_context_focus_in(context);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_focus_out(long /*int*/ context);
-public static final void gtk_im_context_focus_out(long /*int*/ context) {
-	lock.lock();
-	try {
-		_gtk_im_context_focus_out(context);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param context cast=(GtkIMContext *)
- * @param str cast=(gchar **)
- * @param attrs cast=(PangoAttrList **)
- * @param cursor_pos cast=(gint *)
- */
-public static final native void _gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos);
-public static final void gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos) {
-	lock.lock();
-	try {
-		_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_im_context_get_type();
-public static final long /*int*/ gtk_im_context_get_type() {
-	lock.lock();
-	try {
-		return _gtk_im_context_get_type();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_reset(long /*int*/ context);
-public static final void gtk_im_context_reset(long /*int*/ context) {
-	lock.lock();
-	try {
-		_gtk_im_context_reset(context);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param context cast=(GtkIMContext *)
- * @param window cast=(GdkWindow *)
- */
-public static final native void _gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window);
-public static final void gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window) {
-	lock.lock();
-	try {
-		_gtk_im_context_set_client_window(context, window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param context cast=(GtkIMContext *)
- * @param area cast=(GdkRectangle *),flags=no_out
- */
-public static final native void _gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area);
-public static final void gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area) {
-	lock.lock();
-	try {
-		_gtk_im_context_set_cursor_location(context, area);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param context cast=(GtkIMMulticontext *)
- * @param menushell cast=(GtkMenuShell *)
- */
-public static final native void _gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell);
-public static final void gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell) {
-	lock.lock();
-	try {
-		_gtk_im_multicontext_append_menuitems(context, menushell);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_im_multicontext_new();
-public static final long /*int*/ gtk_im_multicontext_new() {
-	lock.lock();
-	try {
-		return _gtk_im_multicontext_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param menu_item cast=(GtkImageMenuItem *)
- * @param image cast=(GtkWidget *)
- */
-public static final native void _gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image);
-/** [GTK2/GTK3; 3.10 deprecated] */
-public static final void gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image) {
-	lock.lock();
-	try {
-		_gtk_image_menu_item_set_image(menu_item, image);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_image_new();
-public static final long /*int*/ gtk_image_new() {
-	lock.lock();
-	try {
-		return _gtk_image_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param image cast=(GtkImage *)
- * @param pixel_size cast=(gint)
- */
-public static final native void /*int*/ _gtk_image_set_pixel_size(long /*int*/ image, int pixel_size);
-public static final void /*int*/ gtk_image_set_pixel_size(long /*int*/ image, int pixel_size) {
-	lock.lock();
-	try {
-		_gtk_image_set_pixel_size(image, pixel_size);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param pixbuf cast=(GdkPixbuf *) */
-public static final native long /*int*/ _gtk_image_new_from_pixbuf(long /*int*/ pixbuf);
-public static final long /*int*/ gtk_image_new_from_pixbuf(long /*int*/ pixbuf) {
-	lock.lock();
-	try {
-		return _gtk_image_new_from_pixbuf(pixbuf);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param image cast=(GtkImage *)
- * @param pixbuf cast=(GdkPixbuf *)
- */
-public static final native void _gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf);
-public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf) {
-	lock.lock();
-	try {
-		_gtk_image_set_from_pixbuf(image, pixbuf);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param image cast=(GtkImage *)
- * @param gicon cast=(GIcon *)
- * @param size cast=(GtkIconSize)
- */
-public static final native void _gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size);
-public static final void gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size) {
-	lock.lock();
-	try {
-		_gtk_image_set_from_gicon(image, gicon, size);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param icon_name cast=(const gchar *)
- * @param size cast=(GtkIconSize)
- */
-public static final native long /*int*/ _gtk_image_new_from_icon_name (byte[] icon_name, int size);
-public static final long /*int*/ gtk_image_new_from_icon_name (byte[] icon_name, int size) {
-	lock.lock();
-	try {
-		return _gtk_image_new_from_icon_name (icon_name, size);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param image cast=(GtkImage *)
- * @param icon_name cast=(const gchar *)
- * @param size cast=(GtkIconSize)
- */
-public static final native void _gtk_image_set_from_icon_name (long /*int*/ image, byte[] icon_name, int size);
-public static final void gtk_image_set_from_icon_name (long /*int*/ image, byte[] icon_name, int size) {
-	lock.lock();
-	try {
-		_gtk_image_set_from_icon_name (image, icon_name, size);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param argc cast=(int *)
- * @param argv cast=(char ***)
- */
-public static final native boolean _gtk_init_check(long /*int*/[] argc, long /*int*/[] argv);
-public static final boolean gtk_init_check(long /*int*/[] argc, long /*int*/[] argv) {
-	lock.lock();
-	try {
-		return _gtk_init_check(argc, argv);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param label cast=(GtkLabel *) */
-public static final native long /*int*/ _gtk_label_get_layout(long /*int*/ label);
-public static final long /*int*/ gtk_label_get_layout(long /*int*/ label) {
-	lock.lock();
-	try {
-		return _gtk_label_get_layout(label);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param label cast=(GtkLabel *) */
-public static final native int _gtk_label_get_mnemonic_keyval(long /*int*/ label);
-public static final int gtk_label_get_mnemonic_keyval(long /*int*/ label) {
-	lock.lock();
-	try {
-		return _gtk_label_get_mnemonic_keyval(label);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param label cast=(const gchar *) */
-public static final native long /*int*/ _gtk_label_new(byte[] label);
-public static final long /*int*/ gtk_label_new(byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_label_new(label);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param str cast=(const gchar *) */
-public static final native long /*int*/ _gtk_label_new_with_mnemonic(byte[] str);
-public static final long /*int*/ gtk_label_new_with_mnemonic(byte[] str) {
-	lock.lock();
-	try {
-		return _gtk_label_new_with_mnemonic(str);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param label cast=(GtkLabel *)
- * @param attrs cast=(PangoAttrList *)
- */
-public static final native void _gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs);
-public static final void gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs) {
-	lock.lock();
-	try {
-		_gtk_label_set_attributes(label, attrs);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param label cast=(GtkLabel *)
- * @param jtype cast=(GtkJustification)
- */
-public static final native void _gtk_label_set_justify(long /*int*/ label, int jtype);
-public static final void gtk_label_set_justify(long /*int*/ label, int jtype) {
-	lock.lock();
-	try {
-		_gtk_label_set_justify(label, jtype);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param label cast=(GtkLabel *)
- * @param wrap cast=(gboolean)
- */
-public static final native void _gtk_label_set_line_wrap(long /*int*/ label, boolean wrap);
-public static final void gtk_label_set_line_wrap(long /*int*/ label, boolean wrap) {
-	lock.lock();
-	try {
-		_gtk_label_set_line_wrap(label, wrap);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param label cast=(GtkLabel *)
- * @param wrap_mode cast=(PangoWrapMode)
- */
-public static final native void _gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode);
-public static final void gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode) {
-	lock.lock();
-	try {
-		_gtk_label_set_line_wrap_mode(label, wrap_mode);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param label cast=(GtkLabel *)
- * @param str cast=(const gchar *)
- */
-public static final native void _gtk_label_set_text(long /*int*/ label, long /*int*/ str);
-public static final void gtk_label_set_text(long /*int*/ label, long /*int*/ str) {
-	lock.lock();
-	try {
-		_gtk_label_set_text(label, str);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param label cast=(GtkLabel *)
- * @param str cast=(const gchar *)
- */
-public static final native void _gtk_label_set_text(long /*int*/ label, byte[] str);
-public static final void gtk_label_set_text(long /*int*/ label, byte[] str) {
-	lock.lock();
-	try {
-		_gtk_label_set_text(label, str);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param label cast=(GtkLabel *)
- * @param str cast=(const gchar *)
- */
-public static final native void _gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str);
-public static final void gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str) {
-	lock.lock();
-	try {
-		_gtk_label_set_text_with_mnemonic(label, str);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param list_store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter);
-public static final void gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter) {
-	lock.lock();
-	try {
-		_gtk_list_store_append(list_store, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param store cast=(GtkListStore *) */
-public static final native void _gtk_list_store_clear(long /*int*/ store);
-public static final void gtk_list_store_clear(long /*int*/ store) {
-	lock.lock();
-	try {
-		_gtk_list_store_clear(store);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param list_store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- * @param position cast=(gint)
- */
-public static final native void _gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position);
-public static final void gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position) {
-	lock.lock();
-	try {
-		_gtk_list_store_insert(list_store, iter, position);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param numColumns cast=(gint)
- * @param types cast=(GType *)
- */
-public static final native long /*int*/ _gtk_list_store_newv(int numColumns, long /*int*/[] types);
-public static final long /*int*/ gtk_list_store_newv(int numColumns, long /*int*/[] types) {
-	lock.lock();
-	try {
-		return _gtk_list_store_newv(numColumns, types);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param data cast=(const gchar *)
- * @param length cast=(gssize)
- * @param error cast=(GError **)
- */
-public static final native boolean _gtk_css_provider_load_from_data(long /*int*/ css_provider, byte[] data, long /*int*/ length, long /*int*/ error[]);
-public static final boolean gtk_css_provider_load_from_data(long /*int*/ css_provider, byte[] data, long /*int*/ length, long /*int*/ error[] ) {
-	lock.lock();
-	try {
-		return _gtk_css_provider_load_from_data(css_provider, data, length, error);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_css_provider_new();
-public static final long /*int*/gtk_css_provider_new() {
-	lock.lock();
-	try {
-		return _gtk_css_provider_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_css_provider_to_string(long /*int*/ provider);
-public static final long /*int*/gtk_css_provider_to_string(long /*int*/ provider) {
-	lock.lock();
-	try {
-		return _gtk_css_provider_to_string(provider);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic
- *  @param name cast=(const gchar *)
- *  @param variant cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_css_provider_get_named (byte[] name, byte[] variant);
-public static final long /*int*/gtk_css_provider_get_named(byte[] name, byte[] variant) {
-	lock.lock();
-	try {
-		return _gtk_css_provider_get_named(name, variant);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param screen cast=(GdkScreen *)
- * @param priority cast=(guint)
- */
-public static final native void _gtk_style_context_add_provider_for_screen (long /*int*/ screen, long /*int*/ provider, int priority);
-public static final void gtk_style_context_add_provider_for_screen(long /*int*/ screen, long /*int*/ provider, int priority) {
-	lock.lock();
-	try {
-		_gtk_style_context_add_provider_for_screen(screen, provider, priority);
-	} finally {
-		lock.unlock();
-	}
-}
-
-
-/**
-* @method flags=dynamic
-* @param priority cast=(guint)
-*/
-public static final native void _gtk_style_context_add_provider (long /*int*/ context, long /*int*/ provider, int priority);
-public static final void gtk_style_context_add_provider(
-	long /*int*/context, long /*int*/provider, int priority) {
-	lock.lock();
-	try {
-		_gtk_style_context_add_provider(context, provider, priority);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param list_store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter);
-public static final void gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter) {
-	lock.lock();
-	try {
-		_gtk_list_store_remove(list_store, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator);
-public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_list_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator);
-public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_list_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator);
-public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_list_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- * @param value flags=no_out
- */
-public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator);
-public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator) {
-	lock.lock();
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
-	try {
-		_gtk_list_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- * @param value flags=no_out
- */
-public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator);
-public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator) {
-	lock.lock();
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	try {
-		_gtk_list_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkListStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator);
-public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_list_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native int _gtk_major_version();
-public static final int gtk_major_version() {
-	lock.lock();
-	try {
-		return _gtk_major_version();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native int _gtk_minor_version();
-public static final int gtk_minor_version() {
-	lock.lock();
-	try {
-		return _gtk_minor_version();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native int _gtk_micro_version();
-public static final int gtk_micro_version() {
-	lock.lock();
-	try {
-		return _gtk_micro_version();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native int _glib_major_version();
-public static final int glib_major_version() {
-	lock.lock();
-	try {
-		return _glib_major_version();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native int _glib_minor_version();
-public static final int glib_minor_version() {
-	lock.lock();
-	try {
-		return _glib_minor_version();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=const */
-public static final native int _glib_micro_version();
-public static final int glib_micro_version() {
-	lock.lock();
-	try {
-		return _glib_micro_version();
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native void _gtk_main();
-public static final void gtk_main() {
-	lock.lock();
-	try {
-		_gtk_main();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param event cast=(GdkEvent *) */
-public static final native void _gtk_main_do_event(long /*int*/ event);
-public static final void gtk_main_do_event(long /*int*/ event) {
-	lock.lock();
-	try {
-		_gtk_main_do_event(event);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_menu_bar_new();
-public static final long /*int*/ gtk_menu_bar_new() {
-	lock.lock();
-	try {
-		return _gtk_menu_bar_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param menu_item cast=(GtkMenuItem *) */
-public static final native long /*int*/ _gtk_menu_item_get_submenu(long /*int*/ menu_item);
-public static final long /*int*/ gtk_menu_item_get_submenu(long /*int*/ menu_item) {
-	lock.lock();
-	try {
-		return _gtk_menu_item_get_submenu(menu_item);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param label cast=(const gchar *) */
-public static final native long /*int*/ _gtk_menu_item_new_with_label(byte[] label);
-public static final long /*int*/ gtk_menu_item_new_with_label(byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_menu_item_new_with_label(label);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_menu_item_new();
-public static final long /*int*/ gtk_menu_item_new() {
-	lock.lock();
-	try {
-		return _gtk_menu_item_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param menu_item cast=(GtkMenuItem *)
- * @param submenu cast=(GtkWidget *)
- */
-public static final native void _gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu);
-public static final void gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu) {
-	lock.lock();
-	try {
-		_gtk_menu_item_set_submenu(menu_item, submenu);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_menu_new();
-public static final long /*int*/ gtk_menu_new() {
-	lock.lock();
-	try {
-		return _gtk_menu_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param menu cast=(GtkMenu *) */
-public static final native void _gtk_menu_popdown(long /*int*/ menu);
-public static final void gtk_menu_popdown(long /*int*/ menu) {
-	lock.lock();
-	try {
-		_gtk_menu_popdown(menu);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @method flags=dynamic
- * @param menu cast=(GtkMenu *)
- * @param parent_menu_shell cast=(GtkWidget *)
- * @param parent_menu_item cast=(GtkWidget *)
- * @param func cast=(GtkMenuPositionFunc)
- * @param data cast=(gpointer)
- * @param button cast=(guint)
- * @param activate_time cast=(guint32)
- */
-public static final native void _gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time);
-/** [GTK2/GTK3; 3.22 deprecated] */
-public static final void gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time) {
-	lock.lock();
-	try {
-		_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- *  @method flags=dynamic
- */
-public static final native void _gtk_menu_popup_at_pointer(long /*int*/ menu, long /*int*/ trigger_event);
-public static void gtk_menu_popup_at_pointer(long /*int*/ menu, long /*int*/ trigger_event) {
-	lock.lock();
-	try {
-		_gtk_menu_popup_at_pointer(menu, trigger_event);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/** @param menu_shell cast=(GtkMenuShell *) */
-public static final native void _gtk_menu_shell_deactivate(long /*int*/ menu_shell);
-public static final void gtk_menu_shell_deactivate(long /*int*/ menu_shell) {
-	lock.lock();
-	try {
-		_gtk_menu_shell_deactivate(menu_shell);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param menu_shell cast=(GtkMenuShell *)
- * @param child cast=(GtkWidget *)
- * @param position cast=(gint)
- */
-public static final native void _gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position);
-public static final void gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position) {
-	lock.lock();
-	try {
-		_gtk_menu_shell_insert(menu_shell, child, position);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param menu_shell cast=(GtkMenuShell *)
- * @param take_focus cast=(gboolean)
- */
-public static final native void _gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus);
-public static final void gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus) {
-	lock.lock();
-	try {
-		_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param icon_widget cast=(GtkWidget *)
- * @param label cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label);
-public static final long /*int*/ gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_menu_tool_button_new(icon_widget, label);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param parent cast=(GtkWindow *)
- * @param flags cast=(GtkDialogFlags)
- * @param type cast=(GtkMessageType)
- * @param buttons cast=(GtkButtonsType)
- * @param message_format cast=(const gchar *)
- * @param arg cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format, byte[] arg);
-public static final long /*int*/ gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format, byte[] arg) {
-	lock.lock();
-	try {
-		return _gtk_message_dialog_new(parent, flags, type, buttons, message_format, arg);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param misc cast=(GtkMisc *)
- * @param xalign cast=(gfloat)
- * @param yalign cast=(gfloat)
- */
-public static final native void _gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign);
-/** [GTK2/GTK3; 3.14 deprecated] */
-public static final void gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign) {
-	lock.lock();
-	try {
-		_gtk_misc_set_alignment(misc, xalign, yalign);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param notebook cast=(GtkNotebook *) */
-public static final native int _gtk_notebook_get_current_page(long /*int*/ notebook);
-public static final int gtk_notebook_get_current_page(long /*int*/ notebook) {
-	lock.lock();
-	try {
-		return _gtk_notebook_get_current_page(notebook);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param notebook cast=(GtkNotebook *) */
-public static final native boolean _gtk_notebook_get_scrollable(long /*int*/ notebook);
-public static final boolean gtk_notebook_get_scrollable(long /*int*/ notebook) {
-	lock.lock();
-	try {
-		return _gtk_notebook_get_scrollable(notebook);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param notebook cast=(GtkNotebook *)
- * @param child cast=(GtkWidget *)
- * @param tab_label cast=(GtkWidget *)
- * @param position cast=(gint)
- */
-public static final native void _gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position);
-public static final void gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position) {
-	lock.lock();
-	try {
-		_gtk_notebook_insert_page(notebook, child, tab_label, position);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_notebook_new();
-public static final long /*int*/ gtk_notebook_new() {
-	lock.lock();
-	try {
-		return _gtk_notebook_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param notebook cast=(GtkNotebook *) */
-public static final native void _gtk_notebook_next_page(long /*int*/ notebook);
-public static final void gtk_notebook_next_page(long /*int*/ notebook) {
-	lock.lock();
-	try {
-		_gtk_notebook_next_page(notebook);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param notebook cast=(GtkNotebook *) */
-public static final native void _gtk_notebook_prev_page(long /*int*/ notebook);
-public static final void gtk_notebook_prev_page(long /*int*/ notebook) {
-	lock.lock();
-	try {
-		_gtk_notebook_prev_page(notebook);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param notebook cast=(GtkNotebook *)
- * @param page_num cast=(gint)
- */
-public static final native void _gtk_notebook_remove_page(long /*int*/ notebook, int page_num);
-public static final void gtk_notebook_remove_page(long /*int*/ notebook, int page_num) {
-	lock.lock();
-	try {
-		_gtk_notebook_remove_page(notebook, page_num);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param notebook cast=(GtkNotebook *)
- * @param page_num cast=(gint)
- */
-public static final native void _gtk_notebook_set_current_page(long /*int*/ notebook, int page_num);
-public static final void gtk_notebook_set_current_page(long /*int*/ notebook, int page_num) {
-	lock.lock();
-	try {
-		_gtk_notebook_set_current_page(notebook, page_num);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param notebook cast=(GtkNotebook *)
- * @param scrollable cast=(gboolean)
- */
-public static final native void _gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable);
-public static final void gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable) {
-	lock.lock();
-	try {
-		_gtk_notebook_set_scrollable(notebook, scrollable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param notebook cast=(GtkNotebook *)
- * @param show_tabs cast=(gboolean)
- */
-public static final native void _gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs);
-public static final void gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs) {
-	lock.lock();
-	try {
-		_gtk_notebook_set_show_tabs(notebook, show_tabs);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param notebook cast=(GtkNotebook *)
- * @param pos cast=(GtkPositionType)
- */
-public static final native void _gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos);
-public static final void gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos) {
-	lock.lock();
-	try {
-		_gtk_notebook_set_tab_pos(notebook, pos);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param object cast=(GObject *)
- */
-public static final native long /*int*/ _g_object_ref_sink(long /*int*/ object);
-public static final long /*int*/ g_object_ref_sink(long /*int*/ object) {
-	lock.lock();
-	try {
-		return _g_object_ref_sink(object);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param orientable cast=(GtkOrientable *)
- * @param orientation cast=(GtkOrientation)
- */
-public static final native void _gtk_orientable_set_orientation(long /*int*/ orientable, int orientation);
-public static final void gtk_orientable_set_orientation(long /*int*/ orientable, int orientation) {
-	lock.lock();
-	try {
-		_gtk_orientable_set_orientation(orientable, orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_page_setup_new ();
-public static final long /*int*/ gtk_page_setup_new () {
-	lock.lock();
-	try {
-		return _gtk_page_setup_new ();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- */
-public static final native int _gtk_page_setup_get_orientation(long /*int*/ setup);
-public static final int gtk_page_setup_get_orientation(long /*int*/ setup) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_orientation(setup);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param orientation cast=(GtkPageOrientation)
- */
-public static final native void _gtk_page_setup_set_orientation(long /*int*/ setup, int orientation);
-public static final void gtk_page_setup_set_orientation(long /*int*/ setup, int orientation) {
-	lock.lock();
-	try {
-		_gtk_page_setup_set_orientation(setup, orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- */
-public static final native long /*int*/ _gtk_page_setup_get_paper_size(long /*int*/ setup);
-public static final long /*int*/ gtk_page_setup_get_paper_size(long /*int*/ setup) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_paper_size(setup);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param size cast=(GtkPaperSize *)
- */
-public static final native void _gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size);
-public static final void gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size) {
-	lock.lock();
-	try {
-		_gtk_page_setup_set_paper_size(setup, size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_page_setup_get_top_margin(long /*int*/ setup, int unit);
-public static final double gtk_page_setup_get_top_margin(long /*int*/ setup, int unit) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_top_margin(setup, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param margin cast=(gdouble)
- * @param unit cast=(GtkUnit)
- */
-public static final native void _gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit) {
-	lock.lock();
-	try {
-		_gtk_page_setup_set_top_margin(setup, margin, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param unit cast=(GtkUnit)
- *
- */
-public static final native double _gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit);
-public static final double gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_bottom_margin(setup, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param margin cast=(gdouble)
- * @param unit cast=(GtkUnit)
- */
-public static final native void _gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit) {
-	lock.lock();
-	try {
-		_gtk_page_setup_set_bottom_margin(setup, margin, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_page_setup_get_left_margin(long /*int*/ setup, int unit);
-public static final double gtk_page_setup_get_left_margin(long /*int*/ setup, int unit) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_left_margin(setup, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param margin cast=(gdouble)
- * @param unit cast=(GtkUnit)
- */
-public static final native void _gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit) {
-	lock.lock();
-	try {
-		_gtk_page_setup_set_left_margin(setup, margin, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_page_setup_get_right_margin(long /*int*/ setup, int unit);
-public static final double gtk_page_setup_get_right_margin(long /*int*/ setup, int unit) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_right_margin(setup, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param margin cast=(gdouble)
- * @param unit cast=(GtkUnit)
- */
-public static final native void _gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit) {
-	lock.lock();
-	try {
-		_gtk_page_setup_set_right_margin(setup, margin, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_page_setup_get_paper_width(long /*int*/ setup, int unit);
-public static final double gtk_page_setup_get_paper_width(long /*int*/ setup, int unit) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_paper_width(setup, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_page_setup_get_paper_height(long /*int*/ setup, int unit);
-public static final double gtk_page_setup_get_paper_height(long /*int*/ setup, int unit) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_paper_height(setup, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_page_setup_get_page_width(long /*int*/ setup, int unit);
-public static final double gtk_page_setup_get_page_width(long /*int*/ setup, int unit) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_page_width(setup, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param setup cast=(GtkPageSetup *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_page_setup_get_page_height(long /*int*/ setup, int unit);
-public static final double gtk_page_setup_get_page_height(long /*int*/ setup, int unit) {
-	lock.lock();
-	try {
-		return _gtk_page_setup_get_page_height(setup, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param window cast=(GdkWindow *)
- * @param area flags=no_out
- * @param widget cast=(GtkWidget *)
- * @param detail cast=(const gchar *)
- */
-public static final native void _gtk_paint_handle(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_paint_handle(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int orientation) {
-	lock.lock();
-	try {
-		_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param x cast=(gdouble)
- * @param y cast=(gdouble)
- * @param width cast=(gdouble)
- * @param height cast=(gdouble)
- */
-public static final native void _gtk_render_frame(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height);
-public static final void gtk_render_frame(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) {
-	lock.lock();
-	try {
-		_gtk_render_frame(context, cr, x, y, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param x cast=(gdouble)
- * @param y cast=(gdouble)
- * @param width cast=(gdouble)
- * @param height cast=(gdouble)
- */
-public static final native void _gtk_render_background(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height);
-public static final void gtk_render_background(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) {
-	lock.lock();
-	try {
-		_gtk_render_background(context, cr, x, y, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param window cast=(GdkWindow *)
- * @param widget cast=(GtkWidget *)
- * @param detail cast=(const gchar *)
- */
-public static final native void _gtk_paint_flat_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_paint_flat_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
-	lock.lock();
-	try {
-		_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
-* @method flags=dynamic
-* @param x cast=(gdouble)
-* @param y cast=(gdouble)
-* @param width cast=(gdouble)
-* @param height cast=(gdouble)
-*/
-public static final native void _gtk_render_focus(long /*int*/ context, long /*int*/ cr,  double x , double y, double width, double height);
-public static final void gtk_render_focus(long /*int*/ context, long /*int*/ cr,  double x , double y, double width, double height) {
-	lock.lock();
-	try {
-		_gtk_render_focus(context, cr,  x, y, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param window cast=(GdkWindow *)
- * @param widget cast=(GtkWidget *)
- * @param detail cast=(const gchar *)
- */
-public static final native void _gtk_paint_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_paint_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
-	lock.lock();
-	try {
-		_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param size cast=(GtkPaperSize *)
- */
-public static final native void _gtk_paper_size_free(long /*int*/ size);
-public static final void gtk_paper_size_free(long /*int*/ size) {
-	lock.lock();
-	try {
-		_gtk_paper_size_free(size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param name cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_paper_size_new(byte [] name);
-public static final long /*int*/ gtk_paper_size_new(byte [] name) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_new(name);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param ppd_name cast=(const gchar *)
- * @param ppd_display_name cast=(const gchar *)
- * @param width cast=(gdouble)
- * @param height cast=(gdouble)
- */
-public static final native long /*int*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);
-public static final long /*int*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param name cast=(const gchar *)
- * @param display_name cast=(const gchar *)
- * @param width cast=(gdouble)
- * @param height cast=(gdouble)
- * @param unit cast=(GtkUnit)
- */
-public static final native long /*int*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);
-public static final long /*int*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param size cast=(GtkPaperSize *)
- */
-public static final native long /*int*/ _gtk_paper_size_get_name(long /*int*/ size);
-public static final long /*int*/ gtk_paper_size_get_name(long /*int*/ size) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_get_name(size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param size cast=(GtkPaperSize *)
- */
-public static final native long /*int*/ _gtk_paper_size_get_display_name(long /*int*/ size);
-public static final long /*int*/ gtk_paper_size_get_display_name(long /*int*/ size) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_get_display_name(size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param size cast=(GtkPaperSize *)
- */
-public static final native long /*int*/ _gtk_paper_size_get_ppd_name(long /*int*/ size);
-public static final long /*int*/ gtk_paper_size_get_ppd_name(long /*int*/ size) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_get_ppd_name(size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param size cast=(GtkPaperSize *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_paper_size_get_width(long /*int*/ size, int unit);
-public static final double gtk_paper_size_get_width(long /*int*/ size, int unit) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_get_width(size, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param size cast=(GtkPaperSize *)
- * @param unit cast=(GtkUnit)
- */
-public static final native double _gtk_paper_size_get_height(long /*int*/ size, int unit);
-public static final double gtk_paper_size_get_height(long /*int*/ size, int unit) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_get_height(size, unit);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param size cast=(GtkPaperSize *)
- */
-public static final native boolean _gtk_paper_size_is_custom(long /*int*/ size);
-public static final boolean gtk_paper_size_is_custom(long /*int*/ size) {
-	lock.lock();
-	try {
-		return _gtk_paper_size_is_custom(size);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_plug_new(long /*int*/ socket_id);
-public static final long /*int*/ gtk_plug_new(long /*int*/ socket_id) {
-	lock.lock();
-	try {
-		return _gtk_plug_new(socket_id);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param printer cast=(GtkPrinter *)
- */
-public static final native long /*int*/ _gtk_printer_get_backend(long /*int*/ printer);
-public static final long /*int*/ gtk_printer_get_backend(long /*int*/ printer) {
-	lock.lock();
-	try {
-		return _gtk_printer_get_backend(printer);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param printer cast=(GtkPrinter *)
- */
-public static final native long /*int*/ _gtk_printer_get_name(long /*int*/ printer);
-public static final long /*int*/ gtk_printer_get_name(long /*int*/ printer) {
-	lock.lock();
-	try {
-		return _gtk_printer_get_name(printer);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param printer cast=(GtkPrinter *)
- */
-public static final native boolean _gtk_printer_is_default(long /*int*/ printer);
-public static final boolean gtk_printer_is_default(long /*int*/ printer) {
-	lock.lock();
-	try {
-		return _gtk_printer_is_default(printer);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param func cast=(GtkPrinterFunc)
- * @param data cast=(gpointer)
- * @param destroy cast=(GDestroyNotify)
- * @param wait cast=(gboolean)
- */
-public static final native void _gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait);
-public static final void gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait) {
-	lock.lock();
-	try {
-		_gtk_enumerate_printers(func, data, destroy, wait);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param title cast=(const gchar *)
- * @param printer cast=(GtkPrinter *)
- * @param settings cast=(GtkPrintSettings *)
- * @param page_setup cast=(GtkPageSetup *)
- */
-public static final native long /*int*/ _gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup);
-public static final long /*int*/ gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup) {
-	lock.lock();
-	try {
-		return _gtk_print_job_new(title, printer, settings, page_setup);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param job cast=(GtkPrintJob *)
- * @param error cast=(GError **)
- */
-public static final native long /*int*/ _gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]);
-public static final long /*int*/ gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]) {
-	lock.lock();
-	try {
-		return _gtk_print_job_get_surface(job, error);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param job cast=(GtkPrintJob *)
- * @param callback cast=(GtkPrintJobCompleteFunc)
- * @param user_data cast=(gpointer)
- * @param dnotify cast=(GDestroyNotify)
- */
-public static final native void _gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify);
-public static final void gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify) {
-	lock.lock();
-	try {
-		_gtk_print_job_send(job, callback, user_data, dnotify);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_print_settings_new();
-public static final long /*int*/ gtk_print_settings_new() {
-	lock.lock();
-	try {
-		return _gtk_print_settings_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param func cast=(GtkPrintSettingsFunc)
- * @param data cast=(gpointer)
- */
-public static final native void _gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data);
-public static final void gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data) {
-	lock.lock();
-	try {
-		_gtk_print_settings_foreach(settings, func, data);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param key cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_print_settings_get(long /*int*/ settings, byte [] key);
-public static final long /*int*/ gtk_print_settings_get(long /*int*/ settings, byte [] key) {
-	lock.lock();
-	try {
-		return _gtk_print_settings_get(settings, key);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param key cast=(const gchar *)
- * @param value cast=(const gchar *)
- */
-public static final native void _gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value);
-public static final void gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value) {
-	lock.lock();
-	try {
-		_gtk_print_settings_set(settings, key, value);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param printer cast=(const gchar *)
- */
-public static final native void _gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer);
-public static final void gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer) {
-	lock.lock();
-	try {
-		_gtk_print_settings_set_printer(settings, printer);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param orientation cast=(GtkPageOrientation)
- */
-public static final native void _gtk_print_settings_set_orientation(long /*int*/ settings, int orientation);
-public static final void gtk_print_settings_set_orientation(long /*int*/ settings, int orientation) {
-	lock.lock();
-	try {
-		_gtk_print_settings_set_orientation(settings, orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- */
-public static final native boolean _gtk_print_settings_get_collate(long /*int*/ settings);
-public static final boolean gtk_print_settings_get_collate(long /*int*/ settings) {
-	lock.lock();
-	try {
-		return _gtk_print_settings_get_collate(settings);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param collate cast=(gboolean)
- */
-public static final native void _gtk_print_settings_set_collate(long /*int*/ settings, boolean collate);
-public static final void gtk_print_settings_set_collate(long /*int*/ settings, boolean collate) {
-	lock.lock();
-	try {
-		_gtk_print_settings_set_collate(settings, collate);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- */
-public static final native int _gtk_print_settings_get_duplex(long /*int*/ settings);
-public static final int gtk_print_settings_get_duplex(long /*int*/ settings) {
-	lock.lock();
-	try {
-		return _gtk_print_settings_get_duplex(settings);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param duplex cast=(GtkPrintDuplex)
- */
-public static final native void _gtk_print_settings_set_duplex(long /*int*/ settings, int duplex);
-public static final void gtk_print_settings_set_duplex(long /*int*/ settings, int duplex) {
-	lock.lock();
-	try {
-		_gtk_print_settings_set_duplex(settings, duplex);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- */
-public static final native int _gtk_print_settings_get_n_copies(long /*int*/ settings);
-public static final int gtk_print_settings_get_n_copies(long /*int*/ settings) {
-	lock.lock();
-	try {
-		return _gtk_print_settings_get_n_copies(settings);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param num_copies cast=(gint)
- */
-public static final native void _gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies);
-public static final void gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies) {
-	lock.lock();
-	try {
-		_gtk_print_settings_set_n_copies(settings, num_copies);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- */
-public static final native int _gtk_print_settings_get_print_pages(long /*int*/ settings);
-public static final int gtk_print_settings_get_print_pages(long /*int*/ settings) {
-	lock.lock();
-	try {
-		return _gtk_print_settings_get_print_pages(settings);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param pages cast=(GtkPrintPages)
- */
-public static final native void _gtk_print_settings_set_print_pages(long /*int*/ settings, int pages);
-public static final void gtk_print_settings_set_print_pages(long /*int*/ settings, int pages) {
-	lock.lock();
-	try {
-		_gtk_print_settings_set_print_pages(settings, pages);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param num_ranges cast=(gint *)
- */
-public static final native long /*int*/ _gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges);
-public static final long /*int*/ gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges) {
-	lock.lock();
-	try {
-		return _gtk_print_settings_get_page_ranges(settings, num_ranges);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- * @param page_ranges cast=(GtkPageRange *)
- * @param num_ranges cast=(gint)
- */
-public static final native void _gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges);
-public static final void gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges) {
-	lock.lock();
-	try {
-		_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param settings cast=(GtkPrintSettings *)
- */
-public static final native int _gtk_print_settings_get_resolution(long /*int*/ settings);
-public static final int gtk_print_settings_get_resolution(long /*int*/ settings) {
-	lock.lock();
-	try {
-		return _gtk_print_settings_get_resolution(settings);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param title cast=(const gchar *)
- * @param parent cast=(GtkWindow *)
- */
-public static final native long /*int*/ _gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent);
-public static final long /*int*/ gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent) {
-	lock.lock();
-	try {
-		return _gtk_print_unix_dialog_new(title, parent);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- * @param embed cast=(gboolean)
- */
-public static final native void _gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed);
-public static final void gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed) {
-	lock.lock();
-	try {
-		_gtk_print_unix_dialog_set_embed_page_setup(dialog, embed);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- * @param page_setup cast=(GtkPageSetup *)
- */
-public static final native void _gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup);
-public static final void gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup) {
-	lock.lock();
-	try {
-		_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- */
-public static final native long /*int*/ _gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog);
-public static final long /*int*/ gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog) {
-	lock.lock();
-	try {
-		return _gtk_print_unix_dialog_get_page_setup(dialog);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- * @param current_page cast=(gint)
- */
-public static final native void _gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page);
-public static final void gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page) {
-	lock.lock();
-	try {
-		_gtk_print_unix_dialog_set_current_page(dialog, current_page);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- */
-public static final native int _gtk_print_unix_dialog_get_current_page(long /*int*/ dialog);
-public static final int gtk_print_unix_dialog_get_current_page(long /*int*/ dialog) {
-	lock.lock();
-	try {
-		return _gtk_print_unix_dialog_get_current_page(dialog);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- * @param settings cast=(GtkPrintSettings *)
- */
-public static final native void _gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings);
-public static final void gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings) {
-	lock.lock();
-	try {
-		_gtk_print_unix_dialog_set_settings(dialog, settings);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- */
-public static final native long /*int*/ _gtk_print_unix_dialog_get_settings(long /*int*/ dialog);
-public static final long /*int*/ gtk_print_unix_dialog_get_settings(long /*int*/ dialog) {
-	lock.lock();
-	try {
-		return _gtk_print_unix_dialog_get_settings(dialog);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- */
-public static final native long /*int*/ _gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog);
-public static final long /*int*/ gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog) {
-	lock.lock();
-	try {
-		return _gtk_print_unix_dialog_get_selected_printer(dialog);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param dialog cast=(GtkPrintUnixDialog *)
- * @param capabilities cast=(GtkPrintCapabilities)
- */
-public static final native void _gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities);
-public static final void gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities) {
-	lock.lock();
-	try {
-		_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_progress_bar_new();
-public static final long /*int*/ gtk_progress_bar_new() {
-	lock.lock();
-	try {
-		return _gtk_progress_bar_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param pbar cast=(GtkProgressBar *) */
-public static final native void _gtk_progress_bar_pulse(long /*int*/ pbar);
-public static final void gtk_progress_bar_pulse(long /*int*/ pbar) {
-	lock.lock();
-	try {
-		_gtk_progress_bar_pulse(pbar);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param pbar cast=(GtkProgressBar *)
- * @param fraction cast=(gdouble)
- */
-public static final native void _gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction);
-public static final void gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction) {
-	lock.lock();
-	try {
-		_gtk_progress_bar_set_fraction(pbar, fraction);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param pbar cast=(GtkProgressBar *)
- * @param inverted cast=(gboolean)
- */
-public static final native void _gtk_progress_bar_set_inverted(long /*int*/ pbar, boolean inverted);
-public static final void gtk_progress_bar_set_inverted(long /*int*/ pbar, boolean inverted) {
-	lock.lock();
-	try {
-		_gtk_progress_bar_set_inverted(pbar, inverted);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param pbar cast=(GtkProgressBar *)
- */
-public static final native void _gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation);
-public static final void gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation) {
-	lock.lock();
-	try {
-		_gtk_progress_bar_set_orientation(pbar, orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param radio_button cast=(GtkRadioButton *) */
-public static final native long /*int*/ _gtk_radio_button_get_group(long /*int*/ radio_button);
-public static final long /*int*/ gtk_radio_button_get_group(long /*int*/ radio_button) {
-	lock.lock();
-	try {
-		return _gtk_radio_button_get_group(radio_button);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param group cast=(GSList *) */
-public static final native long /*int*/ _gtk_radio_button_new(long /*int*/ group);
-public static final long /*int*/ gtk_radio_button_new(long /*int*/ group) {
-	lock.lock();
-	try {
-		return _gtk_radio_button_new(group);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
-public static final native long /*int*/ _gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item);
-public static final long /*int*/ gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item) {
-	lock.lock();
-	try {
-		return _gtk_radio_menu_item_get_group(radio_menu_item);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param group cast=(GSList *) */
-public static final native long /*int*/ _gtk_radio_menu_item_new(long /*int*/ group);
-public static final long /*int*/ gtk_radio_menu_item_new(long /*int*/ group) {
-	lock.lock();
-	try {
-		return _gtk_radio_menu_item_new(group);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param group cast=(GSList *)
- * @param label cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label);
-public static final long /*int*/ gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_radio_menu_item_new_with_label(group, label);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param range cast=(GtkRange *) */
-public static final native long /*int*/ _gtk_range_get_adjustment(long /*int*/ range);
-public static final long /*int*/ gtk_range_get_adjustment(long /*int*/ range) {
-	lock.lock();
-	try {
-		return _gtk_range_get_adjustment(range);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_increments(long /*int*/ range, double step, double page);
-public static final void gtk_range_set_increments(long /*int*/ range, double step, double page) {
-	lock.lock();
-	try {
-		_gtk_range_set_increments(range, step, page);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_inverted(long /*int*/ range, boolean setting);
-public static final void gtk_range_set_inverted(long /*int*/ range, boolean setting) {
-	lock.lock();
-	try {
-		_gtk_range_set_inverted(range, setting);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_range(long /*int*/ range, double min, double max);
-public static final void gtk_range_set_range(long /*int*/ range, double min, double max) {
-	lock.lock();
-	try {
-		_gtk_range_set_range(range, min, max);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_value(long /*int*/ range, double value);
-public static final void gtk_range_set_value(long /*int*/ range, double value) {
-	lock.lock();
-	try {
-		_gtk_range_set_value(range, value);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- *  @param range cast=(GtkRange *)
- *  @param slider_start cast=(gint *)
- *  @param slider_end cast=(gint *)
- */
-public static final native void _gtk_range_get_slider_range(long /*int*/ range, int[] slider_start, int[] slider_end);
-public static final void gtk_range_get_slider_range(long /*int*/ range, int[] slider_start, int[] slider_end) {
-        lock.lock();
-        try {
-        	_gtk_range_get_slider_range(range, slider_start, slider_end);
-        } finally {
-                lock.unlock();
-        }
-}
-/**
- * @method flags=dynamic
- * @param rc_string cast=(const gchar *)
- */
-public static final native void _gtk_rc_parse_string(byte[] rc_string);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_rc_parse_string(byte[] rc_string) {
-	lock.lock();
-	try {
-		_gtk_rc_parse_string(rc_string);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param style cast=(GtkRcStyle *) */
-public static final native long /*int*/ _gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index);
-public static final long /*int*/ gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index) {
-	lock.lock();
-	try {
-		return _gtk_rc_style_get_bg_pixmap_name(style, index);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param style cast=(GtkRcStyle *) */
-public static final native int _gtk_rc_style_get_color_flags(long /*int*/ style, int index);
-public static final int gtk_rc_style_get_color_flags(long /*int*/ style, int index) {
-	lock.lock();
-	try {
-		return _gtk_rc_style_get_color_flags(style, index);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkRcStyle *)
- * @param color flags=no_out
- */
-public static final native void _gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_rc_style_set_bg(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkRcStyle *)
- * @param name cast=(char *)
- */
-public static final native void _gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name);
-public static final void gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name) {
-	lock.lock();
-	try {
-		_gtk_rc_style_set_bg_pixmap_name(style, index, name);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param style cast=(GtkRcStyle *) */
-public static final native void _gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag);
-public static final void gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag) {
-	lock.lock();
-	try {
-		_gtk_rc_style_set_color_flags(style, index, flag);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param scale cast=(GtkScale *)
- * @param digits cast=(gint)
- */
-public static final native void _gtk_scale_set_digits(long /*int*/ scale, int digits);
-public static final void gtk_scale_set_digits(long /*int*/ scale, int digits) {
-	lock.lock();
-	try {
-		_gtk_scale_set_digits(scale, digits);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param scale cast=(GtkScale *)
- * @param draw_value cast=(gboolean)
- */
-public static final native void _gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value);
-public static final void gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value) {
-	lock.lock();
-	try {
-		_gtk_scale_set_draw_value(scale, draw_value);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param scrollable cast=(GtkScrollable *)
- */
-public static final native long /*int*/ _gtk_scrollable_get_vadjustment(long /*int*/ scrollable);
-public static final long /*int*/ gtk_scrollable_get_vadjustment(long /*int*/ scrollable) {
-	lock.lock();
-	try {
-		return _gtk_scrollable_get_vadjustment(scrollable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkRcStyle *)
- * @param color flags=no_out
- */
-public static final native void _gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_rc_style_set_fg(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkRcStyle *)
- * @param color flags=no_out
- */
-public static final native void _gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_rc_style_set_text(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param scrolled_window cast=(GtkScrolledWindow *)
- * @param child cast=(GtkWidget *)
- */
-public static final native void _gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child);
-/** [GTK2/GTK3; 3.8 deprecated] */
-public static final void gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child) {
-	lock.lock();
-	try {
-		_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native long /*int*/ _gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window);
-public static final long /*int*/ gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window) {
-	lock.lock();
-	try {
-		return _gtk_scrolled_window_get_hadjustment(scrolled_window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param scrolled_window cast=(GtkScrolledWindow *)
- */
-public static final native long /*int*/ _gtk_scrolled_window_get_hscrollbar(long /*int*/ scrolled_window);
-public static final long /*int*/ gtk_scrolled_window_get_hscrollbar(long /*int*/ scrolled_window) {
-	lock.lock();
-	try {
-		return _gtk_scrolled_window_get_hscrollbar(scrolled_window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param scrolled_window cast=(GtkScrolledWindow *)
- * @param hscrollbar_policy cast=(GtkPolicyType *)
- * @param vscrollbar_policy cast=(GtkPolicyType *)
- */
-public static final native void _gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);
-public static final void gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) {
-	lock.lock();
-	try {
-		_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native int _gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window);
-public static final int gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window) {
-	lock.lock();
-	try {
-		return _gtk_scrolled_window_get_shadow_type(scrolled_window);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native long /*int*/ _gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window);
-public static final long /*int*/ gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window) {
-	lock.lock();
-	try {
-		return _gtk_scrolled_window_get_vadjustment(scrolled_window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param scrolled_window cast=(GtkScrolledWindow *)
- */
-public static final native long /*int*/ _gtk_scrolled_window_get_vscrollbar(long /*int*/ scrolled_window);
-public static final long /*int*/ gtk_scrolled_window_get_vscrollbar(long /*int*/ scrolled_window) {
-	lock.lock();
-	try {
-		return _gtk_scrolled_window_get_vscrollbar(scrolled_window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param hadjustment cast=(GtkAdjustment *)
- * @param vadjustment cast=(GtkAdjustment *)
- */
-public static final native long /*int*/ _gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment);
-public static final long /*int*/ gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment) {
-	lock.lock();
-	try {
-		return _gtk_scrolled_window_new(hadjustment, vadjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param scrolled_window cast=(GtkScrolledWindow *)
- * @param hscrollbar_policy cast=(GtkPolicyType)
- * @param vscrollbar_policy cast=(GtkPolicyType)
- */
-public static final native void _gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);
-public static final void gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) {
-	lock.lock();
-	try {
-		_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param scrolled_window cast=(GtkScrolledWindow *)
- */
-public static final native boolean _gtk_scrolled_window_get_overlay_scrolling(long /*int*/ scrolled_window);
-public static final boolean gtk_scrolled_window_get_overlay_scrolling(long /*int*/ scrolled_window) {
-	lock.lock();
-	try {
-		return _gtk_scrolled_window_get_overlay_scrolling(scrolled_window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param scrolled_window cast=(GtkScrolledWindow *)
- * @param type cast=(GtkShadowType)
- */
-public static final native void _gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type);
-public static final void gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type) {
-	lock.lock();
-	try {
-		_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_settings_get_default();
-public static final long /*int*/ gtk_settings_get_default() {
-	lock.lock();
-	try {
-		return _gtk_settings_get_default();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param settings cast=(GtkSettings *)
- * @param name cast=(const gchar *)
- * @param v_string cast=(const gchar *)
- * @param origin cast=(const gchar *)
- */
-public static final native void _gtk_settings_set_string_property(long /*int*/ settings, byte[] name, byte[] v_string, byte[] origin);
-/** [GTK2/GTK3; 3.16 deprecated] */
-public static final void gtk_settings_set_string_property(long /*int*/ settings, byte[] name, byte[] v_string, byte[] origin) {
-	lock.lock();
-	try {
-		_gtk_settings_set_string_property(settings, name, v_string, origin);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param selection_data cast=(GtkSelectionData *) */
-public static final native void _gtk_selection_data_free(long /*int*/ selection_data);
-public static final void gtk_selection_data_free(long /*int*/ selection_data) {
-	lock.lock();
-	try {
-		_gtk_selection_data_free(selection_data);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection_data cast=(GtkSelectionData *)
- */
-public static final native long /*int*/ _gtk_selection_data_get_data(long /*int*/ selection_data);
-public static final long /*int*/ gtk_selection_data_get_data(long /*int*/ selection_data) {
-	lock.lock();
-	try {
-		return _gtk_selection_data_get_data(selection_data);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection_data cast=(GtkSelectionData *)
- */
-public static final native int _gtk_selection_data_get_format(long /*int*/ selection_data);
-public static final int gtk_selection_data_get_format(long /*int*/ selection_data) {
-	lock.lock();
-	try {
-		return _gtk_selection_data_get_format(selection_data);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection_data cast=(GtkSelectionData *)
- */
-public static final native int _gtk_selection_data_get_length(long /*int*/ selection_data);
-public static final int gtk_selection_data_get_length(long /*int*/ selection_data) {
-	lock.lock();
-	try {
-		return _gtk_selection_data_get_length(selection_data);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection_data cast=(GtkSelectionData *)
- */
-public static final native long /*int*/ _gtk_selection_data_get_target(long /*int*/ selection_data);
-public static final long /*int*/ gtk_selection_data_get_target(long /*int*/ selection_data) {
-	lock.lock();
-	try {
-		return _gtk_selection_data_get_target(selection_data);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection_data cast=(GtkSelectionData *)
- */
-public static final native long /*int*/ _gtk_selection_data_get_data_type(long /*int*/ selection_data);
-public static final long /*int*/ gtk_selection_data_get_data_type(long /*int*/ selection_data) {
-	lock.lock();
-	try {
-		return _gtk_selection_data_get_data_type(selection_data);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection_data cast=(GtkSelectionData *)
- * @param type cast=(GdkAtom)
- * @param format cast=(gint)
- * @param data cast=(const guchar *)
- * @param length cast=(gint)
- */
-public static final native void _gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length);
-public static final void gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length) {
-	lock.lock();
-	try {
-		_gtk_selection_data_set(selection_data, type, format, data, length);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_separator_menu_item_new();
-public static final long /*int*/ gtk_separator_menu_item_new() {
-	lock.lock();
-	try {
-		return _gtk_separator_menu_item_new();
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_separator_tool_item_new();
-public static final long /*int*/ gtk_separator_tool_item_new() {
-	lock.lock();
-	try {
-		return _gtk_separator_tool_item_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param item cast=(GtkSeparatorToolItem *)
- * @param draw cast=(gboolean)
- */
-public static final native void _gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw);
-public static final void gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw) {
-	lock.lock();
-	try {
-		_gtk_separator_tool_item_set_draw(item, draw);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param socket cast=(GtkSocket *) */
-public static final native long /*int*/ _gtk_socket_get_id(long /*int*/ socket);
-public static final long /*int*/ gtk_socket_get_id(long /*int*/ socket) {
-	lock.lock();
-	try {
-		return _gtk_socket_get_id(socket);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_socket_new();
-public static final long /*int*/ gtk_socket_new() {
-	lock.lock();
-	try {
-		return _gtk_socket_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param adjustment cast=(GtkAdjustment *) */
-public static final native long /*int*/ _gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits);
-public static final long /*int*/ gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits) {
-	lock.lock();
-	try {
-		return _gtk_spin_button_new(adjustment, climb_rate, digits);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param spin_button cast=(GtkSpinButton*)
- * @param numeric cast=(gboolean)
- **/
-public static final native void _gtk_spin_button_set_numeric(long /*int*/ spin_button, boolean numeric);
-public static final void gtk_spin_button_set_numeric(long /*int*/ spin_button, boolean numeric) {
-	lock.lock();
-	try {
-		_gtk_spin_button_set_numeric(spin_button, numeric);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param spin_button cast=(GtkSpinButton*)
- * @param adjustment cast=(GtkAdjustment *)
- **/
-public static final native void _gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits);
-public static final void gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits) {
-	lock.lock();
-	try {
-		_gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param spin_button cast=(GtkSpinButton*) */
-public static final native long /*int*/ _gtk_spin_button_get_adjustment(long /*int*/ spin_button);
-public static final long /*int*/ gtk_spin_button_get_adjustment(long /*int*/ spin_button) {
-	lock.lock();
-	try {
-		return _gtk_spin_button_get_adjustment(spin_button);
-	} finally {
-		lock.unlock();
-	}
-}
 
-/** @param spin_button cast=(GtkSpinButton*) */
-public static final native int _gtk_spin_button_get_digits(long /*int*/ spin_button);
-public static final int gtk_spin_button_get_digits(long /*int*/ spin_button) {
-	lock.lock();
-	try {
-		return _gtk_spin_button_get_digits(spin_button);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_digits(long /*int*/ spin_button, int digits);
-public static final void gtk_spin_button_set_digits(long /*int*/ spin_button, int digits) {
-	lock.lock();
-	try {
-		_gtk_spin_button_set_digits(spin_button, digits);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page);
-public static final void gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page) {
-	lock.lock();
-	try {
-		_gtk_spin_button_set_increments(spin_button, step, page);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min);
-public static final void gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min) {
-	lock.lock();
-	try {
-		_gtk_spin_button_set_range(spin_button, max, min);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_value(long /*int*/ spin_button, double value);
-public static final void gtk_spin_button_set_value(long /*int*/ spin_button, double value) {
-	lock.lock();
-	try {
-		_gtk_spin_button_set_value(spin_button, value);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap);
-public static final void gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap) {
-	lock.lock();
-	try {
-		_gtk_spin_button_set_wrap(spin_button, wrap);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_update(long /*int*/ spin_button);
-public static final void gtk_spin_button_update(long /*int*/ spin_button) {
-	lock.lock();
-	try {
-		_gtk_spin_button_update(spin_button);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param handle cast=(GtkStatusIcon*)
- * @param screen cast=(GdkScreen**)
- * @param area cast=(GdkRectangle*)
- * @param orientation cast=(GtkOrientation*)
- */
-public static final native boolean _gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation);
-public static final boolean gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation) {
-	lock.lock();
-	try {
-		return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param handle cast=(GtkStatusIcon*) */
-public static final native boolean _gtk_status_icon_get_visible(long /*int*/ handle);
-public static final boolean gtk_status_icon_get_visible(long /*int*/ handle) {
-	lock.lock();
-	try {
-		return _gtk_status_icon_get_visible(handle);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_status_icon_new();
-public static final long /*int*/ gtk_status_icon_new() {
-	lock.lock();
-	try {
-		return _gtk_status_icon_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param handle cast=(GtkStatusIcon*)
- * @param pixbuf cast=(GdkPixbuf*)
- */
-public static final native void _gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf);
-public static final void gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf) {
-	lock.lock();
-	try {
-		_gtk_status_icon_set_from_pixbuf(handle, pixbuf);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param handle cast=(GtkStatusIcon*)
- * @param visible cast=(gboolean)
- */
-public static final native void _gtk_status_icon_set_visible(long /*int*/ handle, boolean visible);
-public static final void gtk_status_icon_set_visible(long /*int*/ handle, boolean visible) {
-	lock.lock();
-	try {
-		_gtk_status_icon_set_visible(handle, visible);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param handle cast=(GtkStatusIcon *)
- * @param tip_text cast=(const gchar *)
- */
-public static final native void _gtk_status_icon_set_tooltip_text(long /*int*/ handle, byte[] tip_text);
-public static final void gtk_status_icon_set_tooltip_text(long /*int*/ handle, byte[] tip_text) {
-	lock.lock();
-	try {
-		_gtk_status_icon_set_tooltip_text(handle, tip_text);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkStyle *)
- * @param color flags=no_in
- */
-public static final native void _gtk_style_get_base(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_style_get_base(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_style_get_base(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_add_class(long /*int*/ context, byte[] class_name);
-public static final void gtk_style_context_add_class(long /*int*/ context, byte[] class_name) {
-	lock.lock();
-	try {
-		_gtk_style_context_add_class(context, class_name);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_get_background_color(long /*int*/ context, int state, GdkRGBA color);
-/** [GTK3; 3.16 deprecated] */
-public static final void gtk_style_context_get_background_color(long /*int*/ context, int state, GdkRGBA color) {
-	lock.lock();
-	try {
-		_gtk_style_context_get_background_color(context, state, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_get_color(long /*int*/ context, int state, GdkRGBA color);
-public static final void gtk_style_context_get_color(long /*int*/ context, int state, GdkRGBA color) {
-	lock.lock();
-	try {
-		_gtk_style_context_get_color(context, state, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_style_context_get_font(long /*int*/ context, int state);
-/** [GTK3; 3.8 deprecated] */
-public static final long /*int*/ gtk_style_context_get_font(long /*int*/ context, int state) {
-	lock.lock();
-	try {
-		return _gtk_style_context_get_font(context, state);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_get_padding(long /*int*/ context, int state, GtkBorder padding);
-public static final void gtk_style_context_get_padding(long /*int*/ context, int state, GtkBorder padding) {
-	lock.lock();
-	try {
-		_gtk_style_context_get_padding(context, state, padding);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param property cast=(const gchar *),flags=no_out
- * @param terminator cast=(const gchar *),flags=sentinel
- */
-public static final native void _gtk_style_context_get(long /*int*/ context, int state, byte [] property, long /*int*/ [] value, long /*int*/ terminator);
-public static final void gtk_style_context_get(long /*int*/ context, int state, byte [] property, long /*int*/ [] value, long /*int*/ terminator) {
-	lock.lock();
-	try {
-		_gtk_style_context_get(context, state, property, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_get_border(long /*int*/ context, int state, GtkBorder padding);
-public static final void gtk_style_context_get_border(long /*int*/ context, int state, GtkBorder padding) {
-	lock.lock();
-	try {
-		_gtk_style_context_get_border(context, state, padding);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_invalidate(long /*int*/ context);
-/** [GTK3; 3.12 deprecated] */
-public static final void gtk_style_context_invalidate(long /*int*/ context) {
-	lock.lock();
-	try {
-		_gtk_style_context_invalidate(context);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_save(long /*int*/ self);
-public static final void gtk_style_context_save(long /*int*/ self) {
-	lock.lock();
-	try {
-		_gtk_style_context_save(self);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_restore(long /*int*/ context);
-public static final void gtk_style_context_restore(long /*int*/ context) {
-	lock.lock();
-	try {
-		_gtk_style_context_restore(context);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic
- *  @param self cast=(GtkWidget *)
- *  */
-public static final native int _gtk_widget_get_state_flags(long /*int*/ self);
-public static final int gtk_widget_get_state_flags(long /*int*/ self) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_state_flags(self);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _gtk_style_context_set_state(long /*int*/ context, long /*int*/ flags);
-public static final void gtk_style_context_set_state(long /*int*/ context, long /*int*/ flags) {
-	lock.lock();
-	try {
-		_gtk_style_context_set_state(context,flags);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkStyle *)
- * @param color flags=no_in
- */
-public static final native void _gtk_style_get_black(long /*int*/ style, GdkColor color);
-public static final void gtk_style_get_black(long /*int*/ style, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_style_get_black(style, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkStyle *)
- * @param color flags=no_in
- */
-public static final native void _gtk_style_get_bg(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_style_get_bg(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_style_get_bg(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkStyle *)
- * @param color flags=no_in
- */
-public static final native void _gtk_style_get_dark(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_style_get_dark(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_style_get_dark(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkStyle *)
- * @param color flags=no_in
- */
-public static final native void _gtk_style_get_fg(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_style_get_fg(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_style_get_fg(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param style cast=(GtkStyle *) */
-public static final native long /*int*/ _gtk_style_get_font_desc(long /*int*/ style);
-public static final long /*int*/ gtk_style_get_font_desc(long /*int*/ style) {
-	lock.lock();
-	try {
-		return _gtk_style_get_font_desc(style);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkStyle *)
- * @param color flags=no_in
- */
-public static final native void _gtk_style_get_light(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_style_get_light(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_style_get_light(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param style cast=(GtkStyle *)
- * @param color flags=no_in
- */
-public static final native void _gtk_style_get_text(long /*int*/ style, int index, GdkColor color);
-public static final void gtk_style_get_text(long /*int*/ style, int index, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_style_get_text(style, index, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param style cast=(GtkStyle *) */
-public static final native int _gtk_style_get_xthickness(long /*int*/ style);
-public static final int gtk_style_get_xthickness(long /*int*/ style) {
-	lock.lock();
-	try {
-		return _gtk_style_get_xthickness(style);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param style cast=(GtkStyle *) */
-public static final native int _gtk_style_get_ythickness(long /*int*/ style);
-public static final int gtk_style_get_ythickness(long /*int*/ style) {
-	lock.lock();
-	try {
-		return _gtk_style_get_ythickness(style);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param targets cast=(const GtkTargetEntry *)
- * @param ntargets cast=(guint)
- */
-public static final native long /*int*/ _gtk_target_list_new(long /*int*/ targets, int ntargets);
-public static final long /*int*/ gtk_target_list_new(long /*int*/ targets, int ntargets) {
-	lock.lock();
-	try {
-		return _gtk_target_list_new(targets, ntargets);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param list cast=(GtkTargetList *) */
-public static final native void _gtk_target_list_unref(long /*int*/ list);
-public static final void gtk_target_list_unref(long /*int*/ list) {
-	lock.lock();
-	try {
-		_gtk_target_list_unref(list);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param clipboard cast=(GtkClipboard *)
- */
-public static final native void _gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard);
-public static final void gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_copy_clipboard(buffer, clipboard);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param mark_name cast=(const gchar *)
- * @param where cast=(GtkTextIter *)
- * @param left_gravity cast=(gboolean)
- */
-public static final native long /*int*/ _gtk_text_buffer_create_mark(long /*int*/ buffer, byte [] mark_name, byte [] where, boolean left_gravity);
-public static final long /*int*/ gtk_text_buffer_create_mark(long /*int*/ buffer, byte [] mark_name, byte [] where, boolean left_gravity) {
-	lock.lock();
-	try {
-		return _gtk_text_buffer_create_mark(buffer, mark_name, where, left_gravity);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param clipboard cast=(GtkClipboard *)
- * @param default_editable cast=(gboolean)
- */
-public static final native void _gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable);
-public static final void gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param start cast=(GtkTextIter *)
- * @param end cast=(GtkTextIter *)
- */
-public static final native void _gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end);
-public static final void gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_delete(buffer, start, end);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param start cast=(GtkTextIter *)
- * @param end cast=(GtkTextIter *)
- */
-public static final native void _gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end);
-public static final void gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_get_bounds(buffer, start, end);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param iter cast=(GtkTextIter *)
- */
-public static final native void _gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter);
-public static final void gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_get_end_iter(buffer, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param buffer cast=(GtkTextBuffer *) */
-public static final native long /*int*/ _gtk_text_buffer_get_insert(long /*int*/ buffer);
-public static final long /*int*/ gtk_text_buffer_get_insert(long /*int*/ buffer) {
-	lock.lock();
-	try {
-		return _gtk_text_buffer_get_insert(buffer);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param iter cast=(GtkTextIter *)
- * @param line_number cast=(gint)
- */
-public static final native void _gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number);
-public static final void gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param iter cast=(GtkTextIter *)
- * @param mark cast=(GtkTextMark *)
- */
-public static final native void _gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark);
-public static final void gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param iter cast=(GtkTextIter *)
- * @param char_offset cast=(gint)
- */
-public static final native void _gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset);
-public static final void gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param buffer cast=(GtkTextBuffer *) */
-public static final native int _gtk_text_buffer_get_line_count(long /*int*/ buffer);
-public static final int gtk_text_buffer_get_line_count(long /*int*/ buffer) {
-	lock.lock();
-	try {
-		return _gtk_text_buffer_get_line_count(buffer);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param buffer cast=(GtkTextBuffer *) */
-public static final native long /*int*/ _gtk_text_buffer_get_selection_bound(long /*int*/ buffer);
-public static final long /*int*/ gtk_text_buffer_get_selection_bound(long /*int*/ buffer) {
-	lock.lock();
-	try {
-		return _gtk_text_buffer_get_selection_bound(buffer);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param start cast=(GtkTextIter *)
- * @param end cast=(GtkTextIter *)
- */
-public static final native boolean _gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end);
-public static final boolean gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end) {
-	lock.lock();
-	try {
-		return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param start cast=(GtkTextIter *)
- * @param end cast=(GtkTextIter *)
- * @param include_hidden_chars cast=(gboolean)
- */
-public static final native long /*int*/ _gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);
-public static final long /*int*/ gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) {
-	lock.lock();
-	try {
-		return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param iter cast=(GtkTextIter *)
- * @param text cast=(const gchar *)
- * @param len cast=(gint)
- */
-public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len);
-public static final void gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_insert(buffer, iter, text, len);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param iter cast=(GtkTextIter *)
- * @param text cast=(const gchar *)
- * @param len cast=(gint)
- */
-public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len);
-public static final void gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_insert(buffer, iter, text, len);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param ins cast=(const GtkTextIter *)
- * @param bound cast=(const GtkTextIter *)
- */
-public static final native void _gtk_text_buffer_select_range (long /*int*/ buffer, byte[] ins, byte[] bound);
-public static final void gtk_text_buffer_select_range (long /*int*/ buffer, byte[] ins, byte[] bound) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_select_range(buffer, ins, bound);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param clipboard cast=(GtkClipboard *)
- * @param override_location cast=(GtkTextIter *)
- * @param default_editable cast=(gboolean)
- */
-public static final native void _gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable);
-public static final void gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param where cast=(const GtkTextIter *)
- */
-public static final native void _gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where);
-public static final void gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_place_cursor(buffer, where);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param buffer cast=(GtkTextBuffer *)
- * @param text cast=(const gchar *)
- * @param len cast=(gint)
- */
-public static final native void _gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len);
-public static final void gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len) {
-	lock.lock();
-	try {
-		_gtk_text_buffer_set_text(buffer, text, len);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param iter cast=(const GtkTextIter *) */
-public static final native int _gtk_text_iter_get_line(byte[] iter);
-public static final int gtk_text_iter_get_line(byte[] iter) {
-	lock.lock();
-	try {
-		return _gtk_text_iter_get_line(iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param iter cast=(const GtkTextIter *) */
-public static final native int _gtk_text_iter_get_offset(byte[] iter);
-public static final int gtk_text_iter_get_offset(byte[] iter) {
-	lock.lock();
-	try {
-		return _gtk_text_iter_get_offset(iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param win cast=(GtkTextWindowType)
- * @param buffer_x cast=(gint)
- * @param buffer_y cast=(gint)
- * @param window_x cast=(gint *)
- * @param window_y cast=(gint *)
- */
-public static final native void _gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y);
-public static final void gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) {
-	lock.lock();
-	try {
-		_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param text_view cast=(GtkTextView *) */
-public static final native long /*int*/ _gtk_text_view_get_buffer(long /*int*/ text_view);
-public static final long /*int*/ gtk_text_view_get_buffer(long /*int*/ text_view) {
-	lock.lock();
-	try {
-		return _gtk_text_view_get_buffer(text_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param text_view cast=(GtkTextView *) */
-public static final native boolean _gtk_text_view_get_editable(long /*int*/ text_view);
-public static final boolean gtk_text_view_get_editable(long /*int*/ text_view) {
-	lock.lock();
-	try {
-		return _gtk_text_view_get_editable(text_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param iter cast=(GtkTextIter *)
- * @param x cast=(gint)
- * @param y cast=(gint)
- */
-public static final native void _gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y);
-public static final void gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y) {
-	lock.lock();
-	try {
-		_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param iter cast=(const GtkTextIter *)
- * @param location cast=(GdkRectangle *),flags=no_in
- */
-public static final native void _gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location);
-public static final void gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location) {
-	lock.lock();
-	try {
-		_gtk_text_view_get_iter_location(text_view, iter, location);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param target_iter cast=(GtkTextIter *)
- * @param y cast=(gint)
- * @param line_top cast=(gint *)
- */
-public static final native void _gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top);
-public static final void gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top) {
-	lock.lock();
-	try {
-		_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param target_iter cast=(GtkTextIter *)
- * @param y cast=(gint *)
- * @param height cast=(gint *)
- */
-public static final native void _gtk_text_view_get_line_yrange(long /*int*/ text_view, byte[] target_iter, int[] y, int[] height);
-public static final void gtk_text_view_get_line_yrange(long /*int*/ text_view, byte[] target_iter, int[] y, int[] height) {
-	lock.lock();
-	try {
-		_gtk_text_view_get_line_yrange(text_view, target_iter, y, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param visible_rect cast=(GdkRectangle *),flags=no_in
- */
-public static final native void _gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect);
-public static final void gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect) {
-	lock.lock();
-	try {
-		_gtk_text_view_get_visible_rect(text_view, visible_rect);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param win cast=(GtkTextWindowType)
- */
-public static final native long /*int*/ _gtk_text_view_get_window(long /*int*/ text_view, int win);
-public static final long /*int*/ gtk_text_view_get_window(long /*int*/ text_view, int win) {
-	lock.lock();
-	try {
-		return _gtk_text_view_get_window(text_view, win);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_text_view_new();
-public static final long /*int*/ gtk_text_view_new() {
-	lock.lock();
-	try {
-		return _gtk_text_view_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param mark cast=(GtkTextMark *)
- * @param within_margin cast=(gdouble)
- * @param use_align cast=(gboolean)
- * @param xalign cast=(gdouble)
- * @param yalign cast=(gdouble)
- */
-public static final native void _gtk_text_view_scroll_to_mark(long /*int*/ text_view, long /*int*/ mark, double within_margin, boolean use_align, double xalign, double yalign);
-public static final void gtk_text_view_scroll_to_mark(long /*int*/ text_view, long /*int*/ mark, double within_margin, boolean use_align, double xalign, double yalign) {
-	lock.lock();
-	try {
-		_gtk_text_view_scroll_to_mark(text_view, mark, within_margin, use_align, xalign, yalign);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param iter cast=(GtkTextIter *)
- * @param within_margin cast=(gdouble)
- * @param use_align cast=(gboolean)
- * @param xalign cast=(gdouble)
- * @param yalign cast=(gdouble)
- */
-public static final native boolean _gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign);
-public static final boolean gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) {
-	lock.lock();
-	try {
-		return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param setting cast=(gboolean)
- */
-public static final native void _gtk_text_view_set_editable(long /*int*/ text_view, boolean setting);
-public static final void gtk_text_view_set_editable(long /*int*/ text_view, boolean setting) {
-	lock.lock();
-	try {
-		_gtk_text_view_set_editable(text_view, setting);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param text_view cast=(GtkTextView *) */
-public static final native void _gtk_text_view_set_justification(long /*int*/ text_view, int justification);
-public static final void gtk_text_view_set_justification(long /*int*/ text_view, int justification) {
-	lock.lock();
-	try {
-		_gtk_text_view_set_justification(text_view, justification);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param text_view cast=(GtkTextView *)
- * @param tabs cast=(PangoTabArray *)
- */
-public static final native void _gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs);
-public static final void gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs) {
-	lock.lock();
-	try {
-		_gtk_text_view_set_tabs(text_view, tabs);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param text_view cast=(GtkTextView *) */
-public static final native void _gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode);
-public static final void gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode) {
-	lock.lock();
-	try {
-		_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param interval cast=(guint32)
- * @param function cast=(GSourceFunc)
- * @param data cast=(gpointer)
- */
-public static final native int _g_timeout_add(int interval, long /*int*/ function, long /*int*/ data);
-public static final int g_timeout_add(int interval, long /*int*/ function, long /*int*/ data) {
-	lock.lock();
-	try {
-		return _g_timeout_add(interval, function, data);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param toggle_button cast=(GtkToggleButton *) */
-public static final native boolean _gtk_toggle_button_get_active(long /*int*/ toggle_button);
-public static final boolean gtk_toggle_button_get_active(long /*int*/ toggle_button) {
-	lock.lock();
-	try {
-		return _gtk_toggle_button_get_active(toggle_button);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_toggle_button_new();
-public static final long /*int*/ gtk_toggle_button_new() {
-	lock.lock();
-	try {
-		return _gtk_toggle_button_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param toggle_button cast=(GtkToggleButton *)
- * @param is_active cast=(gboolean)
- */
-public static final native void _gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active);
-public static final void gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active) {
-	lock.lock();
-	try {
-		_gtk_toggle_button_set_active(toggle_button, is_active);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param toggle_button cast=(GtkToggleButton *)
- * @param setting cast=(gboolean)
- */
-public static final native void _gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting);
-public static final void gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting) {
-	lock.lock();
-	try {
-		_gtk_toggle_button_set_inconsistent(toggle_button, setting);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param toggle_button cast=(GtkToggleButton *)
- * @param draw_indicator cast=(gboolean)
- */
-public static final native void _gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator);
-public static final void gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator) {
-	lock.lock();
-	try {
-		_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param button cast=(GtkToggleToolButton *) */
-public static final native boolean _gtk_toggle_tool_button_get_active(long /*int*/ button);
-public static final boolean gtk_toggle_tool_button_get_active(long /*int*/ button) {
-	lock.lock();
-	try {
-		return _gtk_toggle_tool_button_get_active(button);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_toggle_tool_button_new();
-public static final long /*int*/ gtk_toggle_tool_button_new() {
-	lock.lock();
-	try {
-		return _gtk_toggle_tool_button_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param item cast=(GtkToggleToolButton *)
- * @param selected cast=(gboolean)
- */
-public static final native void _gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected);
-public static final void gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected) {
-	lock.lock();
-	try {
-		_gtk_toggle_tool_button_set_active(item, selected);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param icon_widget cast=(GtkWidget *)
- * @param label cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_tool_button_new(long /*int*/ icon_widget, byte[] label);
-public static final long /*int*/ gtk_tool_button_new(long /*int*/ icon_widget, byte[] label) {
-	lock.lock();
-	try {
-		return _gtk_tool_button_new(icon_widget, label);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param button cast=(GtkToolButton *)
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget);
-public static final void gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_tool_button_set_icon_widget(button, widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param button cast=(GtkToolButton *)
- * @param label cast=(const gchar *)
- */
-public static final native void _gtk_tool_button_set_label(long /*int*/ button,  byte[] label);
-public static final void gtk_tool_button_set_label(long /*int*/ button,  byte[] label) {
-	lock.lock();
-	try {
-		_gtk_tool_button_set_label(button, label);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param button cast=(GtkToolButton *)
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_tool_button_set_label_widget(long /*int*/ button,  long /*int*/ widget);
-public static final void gtk_tool_button_set_label_widget(long /*int*/ button,  long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_tool_button_set_label_widget(button, widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param item cast=(GtkToolButton *)
- * @param underline cast=(gboolean)
- */
-public static final native void _gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline);
-public static final void gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline) {
-	lock.lock();
-	try {
-		_gtk_tool_button_set_use_underline(item, underline);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param item cast=(GtkToolItem *)
- * @param menu_id cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id);
-public static final long /*int*/ gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id) {
-	lock.lock();
-	try {
-		return _gtk_tool_item_get_proxy_menu_item(item, menu_id);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param item cast=(GtkToolItem *) */
-public static final native long /*int*/ _gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item);
-public static final long /*int*/ gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item) {
-	lock.lock();
-	try {
-		return _gtk_tool_item_retrieve_proxy_menu_item(item);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param item cast=(GtkToolItem *)
- * @param important cast=(gboolean)
- */
-public static final native void _gtk_tool_item_set_is_important(long /*int*/ item, boolean important);
-public static final void gtk_tool_item_set_is_important(long /*int*/ item, boolean important) {
-	lock.lock();
-	try {
-		_gtk_tool_item_set_is_important(item, important);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param item cast=(GtkToolItem *)
- * @param menu_id cast=(const gchar *)
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget);
-public static final void gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_tool_item_set_proxy_menu_item(item, menu_id, widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param toolbar cast=(GtkToolbar *)
- * @param item cast=(GtkToolItem *)
- */
-public static final native void _gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos);
-public static final void gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos) {
-	lock.lock();
-	try {
-		_gtk_toolbar_insert(toolbar, item, pos);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_toolbar_new();
-public static final long /*int*/ gtk_toolbar_new() {
-	lock.lock();
-	try {
-		return _gtk_toolbar_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param toolbar cast=(GtkToolbar *)
- * @param show_arrow cast=(gboolean)
- */
-public static final native void _gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow);
-public static final void gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow) {
-	lock.lock();
-	try {
-		_gtk_toolbar_set_show_arrow(toolbar, show_arrow);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param toolbar cast=(GtkToolbar *)
- * @param style cast=(GtkToolbarStyle)
- */
-public static final native void _gtk_toolbar_set_style(long /*int*/ toolbar, int style);
-public static final void gtk_toolbar_set_style(long /*int*/ toolbar, int style) {
-	lock.lock();
-	try {
-		_gtk_toolbar_set_style(toolbar, style);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param toolbar cast=(GtkToolbar *)
- */
-public static final native void _gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size);
-public static final void gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size) {
-	lock.lock();
-	try {
-		_gtk_toolbar_set_icon_size(toolbar, size);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, int terminator);
-public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, int terminator);
-public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- * @param path cast=(GtkTreePath *)
- */
-public static final native boolean _gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path);
-public static final boolean gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_model_get_iter(tree_model, iter, path);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native boolean _gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter);
-public static final boolean gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter) {
-	lock.lock();
-	try {
-		return _gtk_tree_model_get_iter_first(tree_model, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_model cast=(GtkTreeModel *) */
-public static final native int _gtk_tree_model_get_n_columns(long /*int*/ tree_model);
-public static final int gtk_tree_model_get_n_columns(long /*int*/ tree_model) {
-	lock.lock();
-	try {
-		return _gtk_tree_model_get_n_columns(tree_model);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native long /*int*/ _gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter);
-public static final long /*int*/ gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter) {
-	lock.lock();
-	try {
-		return _gtk_tree_model_get_path(tree_model, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_tree_model_get_type();
-public static final long /*int*/ gtk_tree_model_get_type() {
-	lock.lock();
-	try {
-		return _gtk_tree_model_get_type();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- * @param parent cast=(GtkTreeIter *)
- */
-public static final native boolean _gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent);
-public static final boolean gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent) {
-	lock.lock();
-	try {
-		return _gtk_tree_model_iter_children(model, iter, parent);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native int _gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter);
-public static final int gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter) {
-	lock.lock();
-	try {
-		return _gtk_tree_model_iter_n_children(model, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native boolean _gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter);
-public static final boolean gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter) {
-	lock.lock();
-	try {
-		return _gtk_tree_model_iter_next(model, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- * @param parent cast=(GtkTreeIter *)
- */
-public static final native boolean _gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n);
-public static final boolean gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n) {
-	lock.lock();
-	try {
-		return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_append_index(long /*int*/ path, int index);
-public static final void gtk_tree_path_append_index(long /*int*/ path, int index) {
-	lock.lock();
-	try {
-		_gtk_tree_path_append_index(path, index);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param a cast=(const GtkTreePath *)
- * @param b cast=(const GtkTreePath *)
- */
-public static final native long /*int*/ _gtk_tree_path_compare(long /*int*/ a, long /*int*/ b);
-public static final long /*int*/ gtk_tree_path_compare(long /*int*/ a, long /*int*/ b) {
-	lock.lock();
-	try {
-		 return _gtk_tree_path_compare(a, b);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_free(long /*int*/ path);
-public static final void gtk_tree_path_free(long /*int*/ path) {
-	lock.lock();
-	try {
-		_gtk_tree_path_free(path);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(GtkTreePath *) */
-public static final native int _gtk_tree_path_get_depth(long /*int*/ path);
-public static final int gtk_tree_path_get_depth(long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_path_get_depth(path);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(GtkTreePath *) */
-public static final native long /*int*/ _gtk_tree_path_get_indices(long /*int*/ path);
-public static final long /*int*/ gtk_tree_path_get_indices(long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_path_get_indices(path);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_tree_path_new();
-public static final long /*int*/ gtk_tree_path_new() {
-	lock.lock();
-	try {
-		return _gtk_tree_path_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(const gchar *) */
-public static final native long /*int*/ _gtk_tree_path_new_from_string(byte[] path);
-public static final long /*int*/ gtk_tree_path_new_from_string(byte[] path) {
-	lock.lock();
-	try {
-		return _gtk_tree_path_new_from_string(path);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(const gchar *) */
-public static final native long /*int*/ _gtk_tree_path_new_from_string(long /*int*/ path);
-public static final long /*int*/ gtk_tree_path_new_from_string(long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_path_new_from_string(path);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_next(long /*int*/ path);
-public static final void gtk_tree_path_next(long /*int*/ path) {
-	lock.lock();
-	try {
-		_gtk_tree_path_next(path);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(GtkTreePath *) */
-public static final native boolean _gtk_tree_path_prev(long /*int*/ path);
-public static final boolean gtk_tree_path_prev(long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_path_prev(path);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param path cast=(GtkTreePath *) */
-public static final native boolean _gtk_tree_path_up(long /*int*/ path);
-public static final boolean gtk_tree_path_up(long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_path_up(path);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- */
-public static final native int _gtk_tree_selection_count_selected_rows(long /*int*/ selection);
-public static final int gtk_tree_selection_count_selected_rows(long /*int*/ selection) {
-	lock.lock();
-	try {
-		return _gtk_tree_selection_count_selected_rows(selection);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- * @param model cast=(GtkTreeModel **)
- */
-public static final native long /*int*/ _gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model);
-public static final long /*int*/ gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model) {
-	lock.lock();
-	try {
-		return _gtk_tree_selection_get_selected_rows(selection, model);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- * @param path cast=(GtkTreePath *)
- */
-public static final native boolean _gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path);
-public static final boolean gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_selection_path_is_selected(selection, path);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param selection cast=(GtkTreeSelection *) */
-public static final native void _gtk_tree_selection_select_all(long /*int*/ selection);
-public static final void gtk_tree_selection_select_all(long /*int*/ selection) {
-	lock.lock();
-	try {
-		_gtk_tree_selection_select_all(selection);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter);
-public static final void gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter) {
-	lock.lock();
-	try {
-		_gtk_tree_selection_select_iter(selection, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- */
-public static final native long /*int*/ _gtk_tree_selection_get_select_function(long /*int*/ selection);
-public static final long /*int*/ gtk_tree_selection_get_select_function(long /*int*/ selection) {
-	lock.lock();
-	try {
-		return _gtk_tree_selection_get_select_function(selection);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- * @param func cast=(GtkTreeSelectionFunc)
- * @param data cast=(gpointer)
- * @param destroy cast=(GDestroyNotify)
- */
-public static final native void _gtk_tree_selection_set_select_function(long /*int*/ selection, long /*int*/ func, long /*int*/ data, long /*int*/ destroy);
-public static final void gtk_tree_selection_set_select_function(long /*int*/ selection, long /*int*/ func, long /*int*/ data, long /*int*/ destroy) {
-	lock.lock();
-	try {
-		_gtk_tree_selection_set_select_function(selection, func, data, destroy);
-	} finally {
-		lock.unlock();
-	}
-}
-
-
-/**
- * @param selection cast=(GtkTreeSelection *)
- * @param path cast=(GtkTreePath *)
- */
-public static final native void _gtk_tree_selection_select_path(long /*int*/ selection, long /*int*/ path);
-public static final  void gtk_tree_selection_select_path(long /*int*/ selection, long /*int*/ path) {
-	lock.lock();
-	try {
-		_gtk_tree_selection_select_path(selection, path);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- * @param mode cast=(GtkSelectionMode)
- */
-public static final native void _gtk_tree_selection_set_mode(long /*int*/ selection, int mode);
-public static final void gtk_tree_selection_set_mode(long /*int*/ selection, int mode) {
-	lock.lock();
-	try {
-		_gtk_tree_selection_set_mode(selection, mode);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- * @param path cast=(GtkTreePath *)
- */
-public static final native void _gtk_tree_selection_unselect_path(long /*int*/ selection, long /*int*/ path);
-public static final  void gtk_tree_selection_unselect_path(long /*int*/ selection, long /*int*/ path) {
-	lock.lock();
-	try {
-		_gtk_tree_selection_unselect_path(selection, path);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param selection cast=(GtkTreeSelection *) */
-public static final native void _gtk_tree_selection_unselect_all(long /*int*/ selection);
-public static final void gtk_tree_selection_unselect_all(long /*int*/ selection) {
-	lock.lock();
-	try {
-		_gtk_tree_selection_unselect_all(selection);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param selection cast=(GtkTreeSelection *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter);
-public static final void gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter) {
-	lock.lock();
-	try {
-		_gtk_tree_selection_unselect_iter(selection, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- * @param parent cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent);
-public static final void gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent) {
-	lock.lock();
-	try {
-		_gtk_tree_store_append(store, iter, parent);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param store cast=(GtkTreeStore *) */
-public static final native void _gtk_tree_store_clear(long /*int*/ store);
-public static final void gtk_tree_store_clear(long /*int*/ store) {
-	lock.lock();
-	try {
-		_gtk_tree_store_clear(store);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- * @param parent cast=(GtkTreeIter *)
- * @param position cast=(gint)
- */
-public static final native void _gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position);
-public static final void gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position) {
-	lock.lock();
-	try {
-		_gtk_tree_store_insert(store, iter, parent, position);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param types cast=(GType *) */
-public static final native long /*int*/ _gtk_tree_store_newv(int numColumns, long /*int*/[] types);
-public static final long /*int*/ gtk_tree_store_newv(int numColumns, long /*int*/[] types) {
-	lock.lock();
-	try {
-		return _gtk_tree_store_newv(numColumns, types);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter);
-public static final void gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter) {
-	lock.lock();
-	try {
-		_gtk_tree_store_remove(store, iter);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator);
-public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_tree_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator);
-public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_tree_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator);
-public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_tree_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- * @param value flags=no_out
- */
-public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator);
-public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator) {
-	lock.lock();
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
-	try {
-		_gtk_tree_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- * @param value flags=no_out
- */
-public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator);
-public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkRGBA value, int terminator) {
-	lock.lock();
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	try {
-		_gtk_tree_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param store cast=(GtkTreeStore *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator);
-public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator) {
-	lock.lock();
-	try {
-		_gtk_tree_store_set(store, iter, column, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- */
-public static final native long /*int*/ _gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path);
-public static final long /*int*/ gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_create_row_drag_icon(view, path);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- */
-public static final native boolean _gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path);
-public static final boolean gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_collapse_row(view, path);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param treeColumn cast=(GtkTreeViewColumn *)
- * @param cellRenderer cast=(GtkCellRenderer *)
- * @param attribute cast=(const gchar *)
- * @param column cast=(gint)
- */
-public static final native void _gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column);
-public static final void gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param cell_renderer cast=(GtkCellRenderer *)
- * @param start_pos cast=(gint *)
- * @param width cast=(gint *)
- */
-public static final native boolean _gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width);
-public static final boolean gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param cell_area cast=(GdkRectangle *),flags=no_in
- * @param x_offset cast=(gint *)
- * @param y_offset cast=(gint *)
- * @param width cast=(gint *)
- * @param height cast=(gint *)
- */
-public static final native void _gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height);
-public static final void gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param tree_model cast=(GtkTreeModel *)
- * @param iter cast=(GtkTreeIter *)
- */
-public static final native void _gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded);
-public static final void gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_clear(long /*int*/ tree_column);
-public static final void gtk_tree_view_column_clear(long /*int*/ tree_column) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_clear(tree_column);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param column cast=(GtkTreeViewColumn *)
- */
-public static final native long /*int*/_gtk_tree_view_column_get_button(long /*int*/ column);
-public static final long /*int*/ gtk_tree_view_column_get_button(long /*int*/ column) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_column_get_button(column);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_fixed_width(long /*int*/ column);
-public static final int gtk_tree_view_column_get_fixed_width(long /*int*/ column) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_column_get_fixed_width(column);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_reorderable(long /*int*/ column);
-public static final boolean gtk_tree_view_column_get_reorderable(long /*int*/ column) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_column_get_reorderable(column);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_resizable(long /*int*/ column);
-public static final boolean gtk_tree_view_column_get_resizable(long /*int*/ column) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_column_get_resizable(column);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_visible(long /*int*/ column);
-public static final boolean gtk_tree_view_column_get_visible(long /*int*/ column) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_column_get_visible(column);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_width(long /*int*/ column);
-public static final int gtk_tree_view_column_get_width(long /*int*/ column) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_column_get_width(column);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_tree_view_column_new();
-public static final long /*int*/ gtk_tree_view_column_new() {
-	lock.lock();
-	try {
-		return _gtk_tree_view_column_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param cell_renderer cast=(GtkCellRenderer *)
- * @param expand cast=(gboolean)
- */
-public static final native void _gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);
-public static final void gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param cell_renderer cast=(GtkCellRenderer *)
- * @param expand cast=(gboolean)
- */
-public static final native void _gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);
-public static final void gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign);
-public static final void gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_alignment(tree_column, xalign);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param cell_renderer cast=(GtkCellRenderer *)
- * @param func cast=(GtkTreeCellDataFunc)
- * @param func_data cast=(gpointer)
- * @param destroy cast=(GDestroyNotify)
- */
-public static final native void _gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy);
-public static final void gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param column cast=(GtkTreeViewColumn *)
- * @param clickable cast=(gboolean)
- */
-public static final native void _gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable);
-public static final void gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_clickable(column, clickable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param column cast=(GtkTreeViewColumn *)
- * @param fixed_width cast=(gint)
- */
-public static final native void _gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width);
-public static final void gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_fixed_width(column, fixed_width);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param min_width cast=(gint)
- */
-public static final native void _gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width);
-public static final void gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_min_width(tree_column, min_width);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param column cast=(GtkTreeViewColumn *)
- * @param reorderable cast=(gboolean)
- */
-public static final native void _gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable);
-public static final void gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_reorderable(column, reorderable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param column cast=(GtkTreeViewColumn *)
- * @param resizable cast=(gboolean)
- */
-public static final native void _gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable);
-public static final void gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_resizable(column, resizable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param column cast=(GtkTreeViewColumn *)
- * @param type cast=(GtkTreeViewColumnSizing)
- */
-public static final native void _gtk_tree_view_column_set_sizing(long /*int*/ column, int type);
-public static final void gtk_tree_view_column_set_sizing(long /*int*/ column, int type) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_sizing(column, type);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param setting cast=(gboolean)
- */
-public static final native void _gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting);
-public static final void gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param order cast=(GtkSortType)
- */
-public static final native void _gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order);
-public static final void gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_sort_order(tree_column, order);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible);
-public static final void gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_visible(tree_column, visible);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_column cast=(GtkTreeViewColumn *)
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget);
-public static final void gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_tree_view_column_set_widget(tree_column, widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- */
-public static final native void _gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos);
-public static final void gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos) {
-	lock.lock();
-	try {
-		_gtk_tree_view_set_drag_dest_row(view, path, pos);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- * @param open_all cast=(gboolean)
- */
-public static final native boolean _gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all);
-public static final boolean gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_expand_row(view, path, open_all);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- * @param column cast=(GtkTreeViewColumn *)
- * @param rect cast=(GdkRectangle *)
- */
-public static final native void _gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);
-public static final void gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) {
-	lock.lock();
-	try {
-		_gtk_tree_view_get_background_area(tree_view, path, column, rect);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_view cast=(GtkTreeView *) */
-public static final native long /*int*/ _gtk_tree_view_get_bin_window(long /*int*/ tree_view);
-public static final long /*int*/ gtk_tree_view_get_bin_window(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_bin_window(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- * @param column cast=(GtkTreeViewColumn *)
- * @param rect cast=(GdkRectangle *),flags=no_in
- */
-public static final native void _gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);
-public static final void gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) {
-	lock.lock();
-	try {
-		_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_view cast=(GtkTreeView *) */
-public static final native long /*int*/_gtk_tree_view_get_expander_column(long /*int*/ tree_view);
-public static final long /*int*/gtk_tree_view_get_expander_column(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_expander_column(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param n cast=(gint)
- */
-public static final native long /*int*/ _gtk_tree_view_get_column(long /*int*/ tree_view, int n);
-public static final long /*int*/ gtk_tree_view_get_column(long /*int*/ tree_view, int n) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_column(tree_view, n);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_view cast=(GtkTreeView *) */
-public static final native long /*int*/ _gtk_tree_view_get_columns(long /*int*/ tree_view);
-public static final long /*int*/ gtk_tree_view_get_columns(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_columns(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath **)
- * @param focus_column cast=(GtkTreeViewColumn **)
- */
-public static final native void _gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column);
-public static final void gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column) {
-	lock.lock();
-	try {
-		_gtk_tree_view_get_cursor(tree_view, path, focus_column);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_view cast=(GtkTreeView *) */
-public static final native boolean _gtk_tree_view_get_headers_visible(long /*int*/ tree_view);
-public static final boolean gtk_tree_view_get_headers_visible(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_headers_visible(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param tree_view cast=(GtkTreeView *)
- */
-public static final native long /*int*/ _gtk_tree_view_get_vadjustment(long /*int*/ tree_view);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final long /*int*/ gtk_tree_view_get_vadjustment(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_vadjustment(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param x cast=(gint)
- * @param y cast=(gint)
- * @param path cast=(GtkTreePath **)
- * @param column cast=(GtkTreeViewColumn **)
- * @param cell_x cast=(gint *)
- * @param cell_y cast=(gint *)
- */
-public static final native boolean _gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y);
-public static final boolean gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param tree_view cast=(GtkTreeView *)
- */
-public static final native boolean _gtk_tree_view_get_rules_hint(long /*int*/ tree_view);
-/** [GTK2/GTK3; 3.14 deprecated] */
-public static final boolean gtk_tree_view_get_rules_hint(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_rules_hint(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_view cast=(GtkTreeView *) */
-public static final native long /*int*/ _gtk_tree_view_get_selection(long /*int*/ tree_view);
-public static final long /*int*/ gtk_tree_view_get_selection(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_selection(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param visible_rect flags=no_in
- */
-public static final native void _gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect);
-public static final void gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect) {
-	lock.lock();
-	try {
-		_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param column cast=(GtkTreeViewColumn *)
- * @param position cast=(gint)
- */
-public static final native int _gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position);
-public static final int gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_insert_column(tree_view, column, position);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param column cast=(GtkTreeViewColumn *)
- * @param base_column cast=(GtkTreeViewColumn *)
- */
-public static final native void _gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/ base_column);
-public static final void gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/base_column) {
-	lock.lock();
-	try {
-		_gtk_tree_view_move_column_after(tree_view, column, base_column);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param model cast=(GtkTreeModel *) */
-public static final native long /*int*/ _gtk_tree_view_new_with_model(long /*int*/ model);
-public static final long /*int*/ gtk_tree_view_new_with_model(long /*int*/ model) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_new_with_model(model);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param column cast=(GtkTreeViewColumn *)
- */
-public static final native void _gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column);
-public static final void gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column) {
-	lock.lock();
-	try {
-		_gtk_tree_view_remove_column(tree_view, column);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- */
-public static final native boolean _gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path);
-public static final boolean gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_row_expanded(view, path);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- * @param column cast=(GtkTreeViewColumn *)
- * @param use_align cast=(gboolean)
- * @param row_aligh cast=(gfloat)
- * @param column_align cast=(gfloat)
- */
-public static final native void _gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align);
-public static final void gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align) {
-	lock.lock();
-	try {
-		_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param tree_x cast=(gint)
- * @param tree_y cast=(gint)
- */
-public static final native void _gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y);
-public static final void gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y) {
-	lock.lock();
-	try {
-		_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param path cast=(GtkTreePath *)
- * @param focus_column cast=(GtkTreeViewColumn *)
- */
-public static final native void _gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing);
-public static final void gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing) {
-	lock.lock();
-	try {
-		_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView*)
- * @param grid_lines cast=(GtkTreeViewGridLines)
- */
-public static final native void _gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines);
-public static final void gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines) {
-	lock.lock();
-	try {
-		_gtk_tree_view_set_grid_lines(tree_view, grid_lines);
-	} finally {
-		lock.unlock();
-	}
-}
-
-/**
- * @param tree_view cast=(GtkTreeView*)
- */
-public static final native int _gtk_tree_view_get_grid_lines(long /*int*/ tree_view);
-public static final int gtk_tree_view_get_grid_lines(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		return _gtk_tree_view_get_grid_lines(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-
-
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param visible cast=(gboolean)
- */
-public static final native void _gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible);
-public static final void gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible) {
-	lock.lock();
-	try {
-		_gtk_tree_view_set_headers_visible(tree_view, visible);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param model cast=(GtkTreeModel *)
- */
-public static final native void _gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model);
-public static final void gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model) {
-	lock.lock();
-	try {
-		_gtk_tree_view_set_model(tree_view, model);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param tree_view cast=(GtkTreeView *)
- */
-public static final native void _gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting);
-/** [GTK2/GTK3; 3.14 deprecated] */
-public static final void gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting) {
-	lock.lock();
-	try {
-		_gtk_tree_view_set_rules_hint(tree_view, setting);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param column cast=(gint)
- */
-public static final native void _gtk_tree_view_set_search_column(long /*int*/ tree_view, int column);
-public static final void gtk_tree_view_set_search_column(long /*int*/ tree_view, int column) {
-	lock.lock();
-	try {
-		_gtk_tree_view_set_search_column(tree_view, column);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param tree_view cast=(GtkTreeView *) */
-public static final native void _gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view);
-public static final void gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view) {
-	lock.lock();
-	try {
-		_gtk_tree_view_unset_rows_drag_dest(tree_view);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param tree_view cast=(GtkTreeView *)
- * @param bx cast=(gint)
- * @param by cast=(gint)
- * @param tx cast=(gint *)
- * @param ty cast=(gint *)
- */
-public static final native void _gtk_tree_view_convert_bin_window_to_tree_coords(long /*int*/ tree_view, int bx, int by, int[] tx, int[] ty);
-public static final void gtk_tree_view_convert_bin_window_to_tree_coords(long /*int*/ tree_view, int bx, int by, int[] tx, int[] ty) {
-	lock.lock();
-	try {
-		_gtk_tree_view_convert_bin_window_to_tree_coords(tree_view, bx, by, tx, ty);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param homogeneous cast=(gboolean)
- * @param spacing cast=(gint)
- */
-public static final native long /*int*/ _gtk_vbox_new(boolean homogeneous, int spacing);
-/** [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_vbox_new(boolean homogeneous, int spacing) {
-	lock.lock();
-	try {
-		return _gtk_vbox_new(homogeneous, spacing);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param viewport cast=(GtkViewport *)
- * @param type cast=(GtkShadowType)
- */
-public static final native void _gtk_viewport_set_shadow_type(long /*int*/ viewport, int type);
-public static final void gtk_viewport_set_shadow_type(long /*int*/ viewport, int type) {
-	lock.lock();
-	try {
-		_gtk_viewport_set_shadow_type(viewport, type);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native long /*int*/ _gtk_vscale_new(long /*int*/ adjustment);
-/** [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_vscale_new(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_vscale_new(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param adjustment cast=(GtkAdjustment *)
- */
-public static final native long /*int*/ _gtk_vscrollbar_new(long /*int*/ adjustment);
-/**  [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_vscrollbar_new(long /*int*/ adjustment) {
-	lock.lock();
-	try {
-		return _gtk_vscrollbar_new(adjustment);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_vseparator_new();
-/** [GTK2/GTK3; 3.2 deprecated] */
-public static final long /*int*/ gtk_vseparator_new() {
-	lock.lock();
-	try {
-		return _gtk_vseparator_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param accel_signal cast=(const gchar *)
- * @param accel_group cast=(GtkAccelGroup *)
- * @param accel_key cast=(guint)
- * @param accel_mods cast=(GdkModifierType)
- */
-public static final native void _gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags);
-public static final void gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags) {
-	lock.lock();
-	try {
-		_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param events cast=(gint)
- */
-public static final native void _gtk_widget_add_events(long /*int*/ widget, int events);
-public static final void gtk_widget_add_events(long /*int*/ widget, int events) {
-	lock.lock();
-	try {
-		_gtk_widget_add_events(widget, events);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_child_focus(long /*int*/ widget, int direction);
-public static final boolean gtk_widget_child_focus(long /*int*/ widget, int direction) {
-	lock.lock();
-	try {
-		return _gtk_widget_child_focus(widget, direction);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param text cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text);
-public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text) {
-	lock.lock();
-	try {
-		return _gtk_widget_create_pango_layout(widget, text);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param text cast=(const gchar *)
- */
-public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text);
-public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text) {
-	lock.lock();
-	try {
-		return _gtk_widget_create_pango_layout(widget, text);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_destroy(long /*int*/ widget);
-public static final void gtk_widget_destroy(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_widget_destroy(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic [GTK3; GTK2 deprecated (different signature)] */
-public static final native void _gtk_widget_draw(long /*int*/ widget, long /*int*/ cr);
-public static final void gtk_widget_draw(long /*int*/ widget, long /*int*/ cr) {
-	lock.lock();
-	try {
-		_gtk_widget_draw(widget, cr);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param event cast=(GdkEvent *)
- */
-public static final native boolean _gtk_widget_event(long /*int*/ widget, long /*int*/ event);
-public static final boolean gtk_widget_event(long /*int*/ widget, long /*int*/ event) {
-	lock.lock();
-	try {
-		return _gtk_widget_event(widget, event);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ _gtk_widget_get_accessible (long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_accessible (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_accessible(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_get_visible (long /*int*/ widget);
-public static final boolean gtk_widget_get_visible (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_visible(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_get_realized (long /*int*/ widget);
-public static final boolean gtk_widget_get_realized (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_realized(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_get_has_window (long /*int*/ widget);
-public static final boolean gtk_widget_get_has_window (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_has_window(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_get_can_default (long /*int*/ widget);
-public static final boolean gtk_widget_get_can_default (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_can_default(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_get_child_visible (long /*int*/ widget);
-public static final boolean gtk_widget_get_child_visible (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_child_visible(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _gtk_widget_get_default_style();
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final long /*int*/ gtk_widget_get_default_style() {
-	lock.lock();
-	try {
-		return _gtk_widget_get_default_style();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native int _gtk_widget_get_events(long /*int*/ widget);
-public static final int gtk_widget_get_events(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_events(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ _gtk_widget_get_window (long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_window (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_window(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */
-public static final native long /*int*/ _gtk_widget_get_modifier_style(long /*int*/ widget);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final long /*int*/ gtk_widget_get_modifier_style(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_modifier_style(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *)  */
-public static final native boolean _gtk_widget_get_mapped(long /*int*/ widget);
-public static final boolean gtk_widget_get_mapped(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_mapped(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ _gtk_widget_get_pango_context(long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_pango_context(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_pango_context(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ _gtk_widget_get_parent(long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_parent(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_parent(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ _gtk_widget_get_parent_window(long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_parent_window(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_parent_window(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param allocation cast=(GtkAllocation *),flags=no_in
- * */
-public static final native void _gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation);
-public static final void gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation) {
-	lock.lock();
-	try {
-		_gtk_widget_get_allocation(widget, allocation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param x cast=(gdouble)
- * @param y cast=(gdouble)
- * @param width cast=(gdouble)
- * @param height cast=(gdouble)
- */
-public static final native void _gtk_render_handle(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height);
-public static final void gtk_render_handle(long /*int*/ context, long /*int*/ cr, double x , double y, double width, double height) {
-	lock.lock();
-	try {
-		_gtk_render_handle(context,cr, x ,y, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */
-public static final native long /*int*/ _gtk_widget_get_style_context(long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_style_context(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_style_context(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */
-public static final native long /*int*/ _gtk_widget_get_style(long /*int*/ widget);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final long /*int*/ gtk_widget_get_style(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_style(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param width cast=(gint *)
- * @param height cast=(gint *)
- */
-public static final native void _gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height);
-public static final void gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height) {
-	lock.lock();
-	try {
-		_gtk_widget_get_size_request(widget, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ _gtk_widget_get_toplevel (long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_toplevel (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_toplevel(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native long /*int*/ _gtk_widget_get_tooltip_text (long /*int*/ widget);
-public static final long /*int*/ gtk_widget_get_tooltip_text (long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_tooltip_text(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_grab_focus(long /*int*/ widget);
-public static final void gtk_widget_grab_focus(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_widget_grab_focus(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_has_focus(long /*int*/ widget);
-public static final boolean gtk_widget_has_focus(long /*int*/ widget) {
-       lock.lock();
-       try {
-               return _gtk_widget_has_focus(widget);
-       } finally {
-               lock.unlock();
-       }
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_hide(long /*int*/ widget);
-public static final void gtk_widget_hide(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_widget_hide(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_widget_input_shape_combine_region(long /*int*/ widget, long /*int*/ region);
-public static final void gtk_widget_input_shape_combine_region(long /*int*/ widget, long /*int*/ region) {
-	lock.lock();
-	try {
-		_gtk_widget_input_shape_combine_region(widget, region);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */
-public static final native boolean _gtk_widget_is_composited(long /*int*/ widget);
-/** [GTK2/GTK3; 3.22 deprecated] */
-public static final boolean gtk_widget_is_composited(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_is_composited(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_is_focus(long /*int*/ widget);
-public static final boolean gtk_widget_is_focus(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_is_focus(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_map(long /*int*/ widget);
-public static final void gtk_widget_map(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_widget_map(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param group_cycling cast=(gboolean)
- */
-public static final native boolean _gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling);
-public static final boolean gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling) {
-	lock.lock();
-	try {
-		return _gtk_widget_mnemonic_activate(widget, group_cycling);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param state cast=(GtkStateType)
- * @param color cast=(GdkColor *),flags=no_out
- */
-public static final native void _gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_widget_modify_base(widget, state, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param state cast=(GtkStateType)
- * @param color cast=(GdkColor *),flags=no_out
- */
-public static final native void _gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color) {
-	lock.lock();
-	try {
-		_gtk_widget_modify_bg(widget, state, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param pango_font_descr cast=(PangoFontDescription *)
- */
-public static final native void _gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr) {
-	lock.lock();
-	try {
-		_gtk_widget_modify_font(widget, pango_font_descr);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param style cast=(GtkRcStyle *)
- */
-public static final native void _gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style) {
-	lock.lock();
-	try {
-		_gtk_widget_modify_style(widget, style);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_widget_override_color(long /*int*/ widget, int state, GdkRGBA color);
-/** [GTK3; 3.16 deprecated]*/
-public static final void gtk_widget_override_color(long /*int*/ widget, int state, GdkRGBA color) {
-	lock.lock();
-	try {
-		_gtk_widget_override_color(widget, state, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_widget_override_background_color(long /*int*/ widget, int state, GdkRGBA color);
-/** [GTK3; 3.16 deprecated] */
-public static final void gtk_widget_override_background_color(long /*int*/ widget, int state, GdkRGBA color) {
-	lock.lock();
-	try {
-		_gtk_widget_override_background_color(widget, state, color);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native void _gtk_widget_override_font(long /*int*/ widget, long /*int*/ font);
-/** [GTK3; 3.16 deprecated] */
-public static final void gtk_widget_override_font(long /*int*/ widget, long /*int*/ font) {
-	lock.lock();
-	try {
-		_gtk_widget_override_font(widget, font);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_queue_resize(long /*int*/ widget);
-public static final void gtk_widget_queue_resize(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_widget_queue_resize(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_realize(long /*int*/ widget);
-public static final void gtk_widget_realize(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_widget_realize(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param accel_group cast=(GtkAccelGroup *)
- * @param accel_key cast=(guint)
- * @param accel_mods cast=(GdkModifierType)
- */
-public static final native void _gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods);
-public static final void gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods) {
-	lock.lock();
-	try {
-		_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param new_parent cast=(GtkWidget *)
- */
-public static final native void _gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent);
-public static final void gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent) {
-	lock.lock();
-	try {
-		_gtk_widget_reparent(widget, new_parent);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param event cast=(GdkEvent *)
- */
-public static final native int _gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event);
-public static final int gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event) {
-	lock.lock();
-	try {
-		return _gtk_widget_send_expose(widget, event);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable);
-public static final void gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable) {
-	lock.lock();
-	try {
-		_gtk_widget_set_app_paintable(widget, app_paintable);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param dir cast=(GtkTextDirection) */
-public static final native void _gtk_widget_set_default_direction(int dir);
-public static final void gtk_widget_set_default_direction(int dir) {
-	lock.lock();
-	try {
-		_gtk_widget_set_default_direction(dir);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param can_default cast=(gboolean)
- */
-public static final native void _gtk_widget_set_can_default(long /*int*/ widget, boolean can_default);
-public static final void gtk_widget_set_can_default(long /*int*/ widget, boolean can_default) {
-	lock.lock();
-	try {
-		_gtk_widget_set_can_default(widget,can_default) ;
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_queue_draw(long /*int*/ widget);
-public static final void gtk_widget_queue_draw(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_widget_queue_draw(widget) ;
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param can_focus cast=(gboolean)
- */
-public static final native void _gtk_widget_set_can_focus(long /*int*/ widget, boolean can_focus);
-public static final void gtk_widget_set_can_focus(long /*int*/ widget, boolean can_focus) {
-	lock.lock();
-	try {
-		_gtk_widget_set_can_focus(widget,can_focus);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param mapped cast=(gboolean)
- */
-public static final native void _gtk_widget_set_mapped(long /*int*/ widget, boolean mapped);
-public static final void gtk_widget_set_mapped(long /*int*/ widget, boolean mapped) {
-	lock.lock();
-	try {
-		_gtk_widget_set_mapped(widget,mapped);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param visible cast=(gboolean)
- */
-public static final native void _gtk_widget_set_visible(long /*int*/ widget, boolean visible);
-public static final void gtk_widget_set_visible(long /*int*/ widget, boolean visible) {
-	lock.lock();
-	try {
-		_gtk_widget_set_visible(widget, visible);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param dir cast=(GtkTextDirection)
- */
-public static final native void _gtk_widget_set_direction(long /*int*/ widget, int dir);
-public static final void gtk_widget_set_direction(long /*int*/ widget, int dir) {
-	lock.lock();
-	try {
-		_gtk_widget_set_direction(widget, dir);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param receives_default cast=(gboolean)
- */
-public static final native void _gtk_widget_set_receives_default(long /*int*/ widget, boolean receives_default);
-public static final void gtk_widget_set_receives_default(long /*int*/ widget, boolean receives_default) {
-	lock.lock();
-	try {
-		_gtk_widget_set_receives_default(widget, receives_default);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param double_buffered cast=(gboolean)
- */
-public static final native void _gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered);
-public static final void gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered) {
-	lock.lock();
-	try {
-		_gtk_widget_set_double_buffered(widget, double_buffered);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param val cast=(gboolean)
- */
-public static final native void _gtk_widget_set_focus_on_click(long /*int*/ widget, boolean val);
-public static final void gtk_widget_set_focus_on_click(long /*int*/ widget, boolean val) {
-	lock.lock();
-	try {
-		_gtk_widget_set_focus_on_click(widget, val);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param name cast=(const char *)
- */
-public static final native void _gtk_widget_set_name(long /*int*/ widget, byte[] name);
-public static final void gtk_widget_set_name(long /*int*/ widget, byte[] name) {
-	lock.lock();
-	try {
-		_gtk_widget_set_name(widget, name);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_widget_set_opacity(long /*int*/ widget, double opacity);
-public static final void gtk_widget_set_opacity(long /*int*/ widget, double opacity) {
-	lock.lock();
-	try {
-		_gtk_widget_set_opacity(widget, opacity);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- */
-public static final native double _gtk_widget_get_opacity(long /*int*/ widget);
-public static final double gtk_widget_get_opacity(long /*int*/ widget) {
-	lock.lock();
-	try {
-		return _gtk_widget_get_opacity(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param redraw cast=(gboolean)
- */
-public static final native void _gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw);
-public static final void gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw) {
-	lock.lock();
-	try {
-		_gtk_widget_set_redraw_on_allocate(widget, redraw);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param sensitive cast=(gboolean)
- */
-public static final native void _gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive);
-public static final void gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive) {
-	lock.lock();
-	try {
-		_gtk_widget_set_sensitive(widget, sensitive);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param width cast=(gint)
- * @param height cast=(gint)
- */
-public static final native void _gtk_widget_set_size_request(long /*int*/ widget, int width, int height);
-public static final void gtk_widget_set_size_request(long /*int*/ widget, int width, int height) {
-	lock.lock();
-	try {
-		_gtk_widget_set_size_request(widget, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param state cast=(GtkStateType)
- */
-public static final native void _gtk_widget_set_state(long /*int*/ widget, int state);
-/** [GTK2/GTK3; 3.0 deprecated] */
-public static final void gtk_widget_set_state(long /*int*/ widget, int state) {
-	lock.lock();
-	try {
-		_gtk_widget_set_state(widget, state);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_show(long /*int*/ widget);
-public static final void gtk_widget_show(long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_widget_show(widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param allocation cast=(GtkAllocation *),flags=no_out
- */
-public static final native void _gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation);
-public static final void gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation) {
-	lock.lock();
-	try {
-		_gtk_widget_size_allocate(widget, allocation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param widget cast=(GtkWidget *)
- * @param requisition cast=(GtkRequisition *),flags=no_in
- */
-public static final native void _gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition);
-/** [GTK2/GTK3; 2.x/3.0 deprecated] */
-public static final void gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition) {
-	lock.lock();
-	try {
-		_gtk_widget_size_request(widget, requisition);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param allocation cast=(GtkAllocation *),flags=no_out
- */
-public static final native void _gtk_widget_set_allocation(long /*int*/ widget, GtkAllocation allocation);
-public static final void gtk_widget_set_allocation(long /*int*/ widget, GtkAllocation allocation) {
-	lock.lock();
-	try {
-		_gtk_widget_set_allocation(widget, allocation);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param property_name cast=(const gchar *)
- * @param terminator cast=(const gchar *),flags=sentinel
- */
-public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator);
-public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator) {
-	lock.lock();
-	try {
-		_gtk_widget_style_get(widget, property_name, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param property_name cast=(const gchar *)
- * @param terminator cast=(const gchar *),flags=sentinel
- */
-public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator);
-public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator) {
-	lock.lock();
-	try {
-		_gtk_widget_style_get(widget, property_name, value, terminator);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param src_widget cast=(GtkWidget *)
- * @param dest_widget cast=(GtkWidget *)
- * @param dest_x cast=(gint *)
- * @param dest_y cast=(gint *)
- */
-public static final native boolean _gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y);
-public static final boolean gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) {
-	lock.lock();
-	try {
-		return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param window cast=(GtkWindow *) */
-public static final native boolean _gtk_window_activate_default(long /*int*/ window);
-public static final boolean gtk_window_activate_default(long /*int*/ window) {
-	lock.lock();
-	try {
-		return _gtk_window_activate_default(window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param accel_group cast=(GtkAccelGroup *)
- */
-public static final native void _gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group);
-public static final void gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group) {
-	lock.lock();
-	try {
-		_gtk_window_add_accel_group(window, accel_group);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_deiconify(long /*int*/ handle);
-public static final void gtk_window_deiconify(long /*int*/ handle) {
-	lock.lock();
-	try {
-		_gtk_window_deiconify(handle);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param window cast=(GtkWindow *) */
-public static final native long /*int*/ _gtk_window_get_focus(long /*int*/ window);
-public static final long /*int*/ gtk_window_get_focus(long /*int*/ window) {
-	lock.lock();
-	try {
-		return _gtk_window_get_focus(window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- */
-public static final native long /*int*/ _gtk_window_get_group(long /*int*/ window);
-public static final long /*int*/ gtk_window_get_group(long /*int*/ window) {
-	lock.lock();
-	try {
-		return _gtk_window_get_group(window);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param window cast=(GtkWindow *) */
-public static final native long /*int*/ _gtk_window_get_icon_list(long /*int*/ window);
-public static final long /*int*/ gtk_window_get_icon_list(long /*int*/ window) {
-	lock.lock();
-	try {
-		return _gtk_window_get_icon_list(window);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param window cast=(GtkWindow *) */
-public static final native boolean _gtk_window_get_modal(long /*int*/ window);
-public static final boolean gtk_window_get_modal(long /*int*/ window) {
-	lock.lock();
-	try {
-		return _gtk_window_get_modal(window);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param window cast=(GtkWindow *) */
-public static final native int _gtk_window_get_mnemonic_modifier(long /*int*/ window);
-public static final int gtk_window_get_mnemonic_modifier(long /*int*/ window) {
-	lock.lock();
-	try {
-		return _gtk_window_get_mnemonic_modifier(window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param window cast=(GtkWindow *)
- */
-public static final native double _gtk_window_get_opacity (long /*int*/ window);
-/** [GTK2/GTK3; 3.8 deprecated] */
-public static final double gtk_window_get_opacity (long /*int*/ window) {
-	lock.lock();
-	try {
-		return _gtk_window_get_opacity (window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param handle cast=(GtkWindow *)
- * @param x cast=(gint *)
- * @param y cast=(gint *)
- */
-public static final native void _gtk_window_get_position(long /*int*/ handle, int[] x, int[] y);
-public static final void gtk_window_get_position(long /*int*/ handle, int[] x, int[] y) {
-	lock.lock();
-	try {
-		_gtk_window_get_position(handle, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param group cast=(GtkWindowGroup*)
- * @param window cast=(GtkWindow*)
- */
-public static final native void _gtk_window_group_add_window(long /*int*/ group, long /*int*/ window);
-public static final void gtk_window_group_add_window(long /*int*/ group, long /*int*/ window) {
-	lock.lock();
-	try {
-		_gtk_window_group_add_window(group, window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param group cast=(GtkWindowGroup*)
- * @param window cast=(GtkWindow*)
- */
-public static final native void _gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window);
-public static final void gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window) {
-	lock.lock();
-	try {
-		_gtk_window_group_remove_window(group, window);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_window_group_new();
-public static final long /*int*/ gtk_window_group_new() {
-	lock.lock();
-	try {
-		return _gtk_window_group_new();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param handle cast=(GtkWindow *) */
-public static final native boolean _gtk_window_is_active(long /*int*/ handle);
-public static final boolean gtk_window_is_active(long /*int*/ handle) {
-	lock.lock();
-	try {
-		return _gtk_window_is_active(handle);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_iconify(long /*int*/ handle);
-public static final void gtk_window_iconify(long /*int*/ handle) {
-	lock.lock();
-	try {
-		_gtk_window_iconify(handle);
-	} finally {
-		lock.unlock();
-	}
-}
-public static final native long /*int*/ _gtk_window_list_toplevels ();
-public static final long /*int*/ gtk_window_list_toplevels () {
-	lock.lock();
-	try {
-		return _gtk_window_list_toplevels ();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_maximize(long /*int*/ handle);
-public static final void gtk_window_maximize(long /*int*/ handle) {
-	lock.lock();
-	try {
-		_gtk_window_maximize(handle);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_fullscreen(long /*int*/ handle);
-public static final void gtk_window_fullscreen(long /*int*/ handle) {
-	lock.lock();
-	try {
-		_gtk_window_fullscreen(handle);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_unfullscreen(long /*int*/ handle);
-public static final void gtk_window_unfullscreen(long /*int*/ handle) {
-	lock.lock();
-	try {
-		_gtk_window_unfullscreen(handle);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param handle cast=(GtkWindow *)
- * @param x cast=(gint)
- * @param y cast=(gint)
- */
-public static final native void _gtk_window_move(long /*int*/ handle, int x, int y);
-public static final void gtk_window_move(long /*int*/ handle, int x, int y) {
-	lock.lock();
-	try {
-		_gtk_window_move(handle, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param type cast=(GtkWindowType) */
-public static final native long /*int*/ _gtk_window_new(int type);
-public static final long /*int*/ gtk_window_new(int type) {
-	lock.lock();
-	try {
-		return _gtk_window_new(type);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param accel_group cast=(GtkAccelGroup *)
- */
-public static final native void _gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group);
-public static final void gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group) {
-	lock.lock();
-	try {
-		_gtk_window_remove_accel_group(window, accel_group);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param handle cast=(GtkWindow *)
- * @param x cast=(gint)
- * @param y cast=(gint)
- */
-public static final native void _gtk_window_resize(long /*int*/ handle, int x, int y);
-public static final void gtk_window_resize(long /*int*/ handle, int x, int y) {
-	lock.lock();
-	try {
-		_gtk_window_resize(handle, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param handle cast=(GtkWindow *)
- * @param width cast=(gint *)
- * @param height cast=(gint *)
- */
-public static final native void _gtk_window_get_size(long /*int*/ handle, int[] width, int[] height);
-public static final void gtk_window_get_size(long /*int*/ handle, int[] width, int[] height) {
-	lock.lock();
-	try {
-		_gtk_window_get_size(handle, width, height);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param widget cast=(GtkWidget *)
- */
-public static final native void _gtk_window_set_default(long /*int*/ window, long /*int*/ widget);
-public static final void gtk_window_set_default(long /*int*/ window, long /*int*/ widget) {
-	lock.lock();
-	try {
-		_gtk_window_set_default(window, widget);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param decorated cast=(gboolean)
- */
-public static final native void _gtk_window_set_decorated(long /*int*/ window, boolean decorated);
-public static final void gtk_window_set_decorated(long /*int*/ window, boolean decorated) {
-	lock.lock();
-	try {
-		_gtk_window_set_decorated(window, decorated);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param setting cast=(gboolean)
- */
-public static final native void _gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting);
-public static final void gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting) {
-	lock.lock();
-	try {
-		_gtk_window_set_destroy_with_parent(window, setting);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param geometry_widget cast=(GtkWidget *)
- * @param geometry flags=no_out
- */
-public static final native void _gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask);
-public static final void gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask) {
-	lock.lock();
-	try {
-		_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param list cast=(GList *)
- */
-public static final native void _gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list);
-public static final void gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list) {
-	lock.lock();
-	try {
-		_gtk_window_set_icon_list(window, list);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param modal cast=(gboolean)
- */
-public static final native void _gtk_window_set_modal(long /*int*/ window, boolean modal);
-public static final void gtk_window_set_modal(long /*int*/ window, boolean modal) {
-	lock.lock();
-	try {
-		_gtk_window_set_modal(window, modal);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- * @param window cast=(GtkWindow *)
- */
-public static final native void _gtk_window_set_opacity(long /*int*/ window, double opacity);
-/** [GTK2/GTK3; 3.8 deprecated] */
-public static final void gtk_window_set_opacity(long /*int*/ window, double opacity) {
-	lock.lock();
-	try {
-		 _gtk_window_set_opacity(window, opacity);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param tip_text cast=(const gchar *)
- */
-public static final native void _gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text);
-public static final void gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text) {
-	lock.lock();
-	try {
-		_gtk_widget_set_tooltip_text(widget, tip_text);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param widget cast=(GtkWidget *)
- * @param parent_window cast=(GdkWindow *)
- */
-public static final native void _gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window);
-public static final void gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window) {
-	lock.lock();
-	try {
-		_gtk_widget_set_parent_window(widget, parent_window);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param resizable cast=(gboolean)
- */
-public static final native void _gtk_window_set_resizable(long /*int*/ window, boolean resizable);
-public static final void gtk_window_set_resizable(long /*int*/ window, boolean resizable) {
-	lock.lock();
-	try {
-		_gtk_window_set_resizable(window, resizable);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param title cast=(const gchar *)
- */
-public static final native void _gtk_window_set_title(long /*int*/ window, byte[] title);
-public static final void gtk_window_set_title(long /*int*/ window, byte[] title) {
-	lock.lock();
-	try {
-		_gtk_window_set_title(window, title);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param skips_taskbar cast=(gboolean)
- */
-public static final native void _gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar);
-public static final void gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar) {
-	lock.lock();
-	try {
-		_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param window cast=(GtkWindow *) */
-public static final native void _gtk_window_set_type_hint(long /*int*/ window, int hint);
-public static final void gtk_window_set_type_hint(long /*int*/ window, int hint) {
-	lock.lock();
-	try {
-		_gtk_window_set_type_hint(window, hint);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @param window cast=(GtkWindow *)
- * @param parent cast=(GtkWindow *)
- */
-public static final native void _gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent);
-public static final void gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent) {
-	lock.lock();
-	try {
-		_gtk_window_set_transient_for(window, parent);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_unmaximize(long /*int*/ handle);
-public static final void gtk_window_unmaximize(long /*int*/ handle) {
-	lock.lock();
-	try {
-		_gtk_window_unmaximize(handle);
-	} finally {
-		lock.unlock();
-	}
-}
 
 // Technically works on OSX also, but currently only used on Linux.
 // Once SWT is moved to Java 9, consider using 'ProcessHandle.current().getPid();' instead,
@@ -16680,9 +6853,9 @@ public static final String getThemeName() {
 public static final byte [] getThemeNameBytes() {
 	byte [] buffer = null;
 	int length;
-	long /*int*/ settings = OS.gtk_settings_get_default ();
+	long /*int*/ settings = GTK.gtk_settings_get_default ();
 	long /*int*/ [] ptr = new long /*int*/ [1];
-	OS.g_object_get (settings, OS.gtk_theme_name, ptr, 0);
+	OS.g_object_get (settings, GTK.gtk_theme_name, ptr, 0);
 	if (ptr [0] == 0) {
 		return buffer;
 	}
@@ -16705,12 +6878,12 @@ public static final byte [] getThemeNameBytes() {
  * @since 3.104
  */
 public static final void setDarkThemePreferred(boolean preferred){
-	if (!GTK3) return; //only applicable to GTK3
+	if (!GTK.GTK3) return; //only applicable to GTK3
 	gdk_flush();
-	g_object_set(gtk_settings_get_default(), gtk_application_prefer_dark_theme,
+	g_object_set(GTK.gtk_settings_get_default(), GTK.gtk_application_prefer_dark_theme,
 			preferred, 0);
-	g_object_notify(gtk_settings_get_default(),
-			gtk_application_prefer_dark_theme);
+	g_object_notify(GTK.gtk_settings_get_default(),
+			GTK.gtk_application_prefer_dark_theme);
 }
 
 
@@ -17052,4 +7225,18 @@ public static final long /*int*/ g_variant_new_string (byte[] string) {
 		lock.unlock();
 	}
 }
+
+/**
+ * @param object cast=(GObject *)
+ */
+public static final native long /*int*/ _g_object_ref_sink(long /*int*/ object);
+
+public static final long /*int*/ g_object_ref_sink(long /*int*/ object) {
+	lock.lock();
+	try {
+		return _g_object_ref_sink(object);
+	} finally {
+		lock.unlock();
+	}
+}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
index 8808376a0a..5119dc2467 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
@@ -290,20 +290,20 @@ public void setPrintToFile(boolean printToFile) {
 public PrinterData open() {
 	byte [] titleBytes = Converter.wcsToMbcs (getText(), true);
 	long /*int*/ topHandle = getParent().handle;
-	while (topHandle != 0 && !OS.GTK_IS_WINDOW(topHandle)) {
-		topHandle = OS.gtk_widget_get_parent(topHandle);
+	while (topHandle != 0 && !GTK.GTK_IS_WINDOW(topHandle)) {
+		topHandle = GTK.gtk_widget_get_parent(topHandle);
 	}
-	handle = OS.gtk_print_unix_dialog_new(titleBytes, topHandle);
+	handle = GTK.gtk_print_unix_dialog_new(titleBytes, topHandle);
 
 	//TODO: Not currently implemented. May need new API. For now, disable 'Current' in the dialog. (see gtk bug 344519)
-	OS.gtk_print_unix_dialog_set_current_page(handle, -1);
+	GTK.gtk_print_unix_dialog_set_current_page(handle, -1);
 
-	OS.gtk_print_unix_dialog_set_manual_capabilities(handle,
-		OS.GTK_PRINT_CAPABILITY_COLLATE | OS.GTK_PRINT_CAPABILITY_COPIES | OS.GTK_PRINT_CAPABILITY_PAGE_SET);
+	GTK.gtk_print_unix_dialog_set_manual_capabilities(handle,
+		GTK.GTK_PRINT_CAPABILITY_COLLATE | GTK.GTK_PRINT_CAPABILITY_COPIES | GTK.GTK_PRINT_CAPABILITY_PAGE_SET);
 
 	/* Set state into print dialog settings. */
-	long /*int*/ settings = OS.gtk_print_settings_new();
-	long /*int*/ page_setup = OS.gtk_page_setup_new();
+	long /*int*/ settings = GTK.gtk_print_settings_new();
+	long /*int*/ page_setup = GTK.gtk_page_setup_new();
 
 	if (printerData.otherData != null) {
 		Printer.restore(printerData.otherData, settings, page_setup);
@@ -322,59 +322,59 @@ public PrinterData open() {
 	}
 	if (printerName != null) {
 		byte [] nameBytes = Converter.wcsToMbcs (printerName, true);
-		OS.gtk_print_settings_set_printer(settings, nameBytes);
+		GTK.gtk_print_settings_set_printer(settings, nameBytes);
 	}
 
 	switch (printerData.scope) {
 		case PrinterData.ALL_PAGES:
-			OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_ALL);
+			GTK.gtk_print_settings_set_print_pages(settings, GTK.GTK_PRINT_PAGES_ALL);
 			break;
 		case PrinterData.PAGE_RANGE:
-			OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_RANGES);
+			GTK.gtk_print_settings_set_print_pages(settings, GTK.GTK_PRINT_PAGES_RANGES);
 			int [] pageRange = new int[2];
 			pageRange[0] = printerData.startPage - 1;
 			pageRange[1] = printerData.endPage - 1;
-			OS.gtk_print_settings_set_page_ranges(settings, pageRange, 1);
+			GTK.gtk_print_settings_set_page_ranges(settings, pageRange, 1);
 			break;
 		case PrinterData.SELECTION:
 			//TODO: Not correctly implemented. May need new API. For now, set to ALL. (see gtk bug 344519)
-			OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_ALL);
+			GTK.gtk_print_settings_set_print_pages(settings, GTK.GTK_PRINT_PAGES_ALL);
 			break;
 	}
 	if ((printerData.printToFile || Printer.GTK_FILE_BACKEND.equals(printerData.driver)) && printerData.fileName != null) {
 		// TODO: GTK_FILE_BACKEND is not GTK API (see gtk bug 345590)
 		byte [] uri = Printer.uriFromFilename(printerData.fileName);
 		if (uri != null) {
-			OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
+			GTK.gtk_print_settings_set(settings, GTK.GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
 		}
 	}
-	OS.gtk_print_settings_set_n_copies(settings, printerData.copyCount);
-	OS.gtk_print_settings_set_collate(settings, printerData.collate);
+	GTK.gtk_print_settings_set_n_copies(settings, printerData.copyCount);
+	GTK.gtk_print_settings_set_collate(settings, printerData.collate);
 	/*
 	 * Bug in GTK.  The unix dialog gives priority to the value of the non-API
 	 * field cups-Duplex in the print_settings (which we preserve in otherData).
 	 * The fix is to manually clear cups-Duplex before setting the duplex field.
 	 */
 	byte [] keyBuffer = Converter.wcsToMbcs ("cups-Duplex", true);
-	OS.gtk_print_settings_set(settings, keyBuffer, (byte[]) null);
+	GTK.gtk_print_settings_set(settings, keyBuffer, (byte[]) null);
 	if (printerData.duplex != SWT.DEFAULT) {
-		int duplex = printerData.duplex == PrinterData.DUPLEX_LONG_EDGE ? OS.GTK_PRINT_DUPLEX_HORIZONTAL
-			: printerData.duplex == PrinterData.DUPLEX_SHORT_EDGE ? OS.GTK_PRINT_DUPLEX_VERTICAL
-			: OS.GTK_PRINT_DUPLEX_SIMPLEX;
-		OS.gtk_print_settings_set_duplex (settings, duplex);
+		int duplex = printerData.duplex == PrinterData.DUPLEX_LONG_EDGE ? GTK.GTK_PRINT_DUPLEX_HORIZONTAL
+			: printerData.duplex == PrinterData.DUPLEX_SHORT_EDGE ? GTK.GTK_PRINT_DUPLEX_VERTICAL
+			: GTK.GTK_PRINT_DUPLEX_SIMPLEX;
+		GTK.gtk_print_settings_set_duplex (settings, duplex);
 	}
-	int orientation = printerData.orientation == PrinterData.LANDSCAPE ? OS.GTK_PAGE_ORIENTATION_LANDSCAPE : OS.GTK_PAGE_ORIENTATION_PORTRAIT;
-	OS.gtk_print_settings_set_orientation(settings, orientation);
-	OS.gtk_page_setup_set_orientation(page_setup, orientation);
+	int orientation = printerData.orientation == PrinterData.LANDSCAPE ? GTK.GTK_PAGE_ORIENTATION_LANDSCAPE : GTK.GTK_PAGE_ORIENTATION_PORTRAIT;
+	GTK.gtk_print_settings_set_orientation(settings, orientation);
+	GTK.gtk_page_setup_set_orientation(page_setup, orientation);
 
-	OS.gtk_print_unix_dialog_set_settings(handle, settings);
-	OS.gtk_print_unix_dialog_set_page_setup(handle, page_setup);
-	OS.gtk_print_unix_dialog_set_embed_page_setup(handle, true);
+	GTK.gtk_print_unix_dialog_set_settings(handle, settings);
+	GTK.gtk_print_unix_dialog_set_page_setup(handle, page_setup);
+	GTK.gtk_print_unix_dialog_set_embed_page_setup(handle, true);
 	OS.g_object_unref(settings);
 	OS.g_object_unref(page_setup);
-	long /*int*/ group = OS.gtk_window_get_group(0);
-	OS.gtk_window_group_add_window (group, handle);
-	OS.gtk_window_set_modal(handle, true);
+	long /*int*/ group = GTK.gtk_window_get_group(0);
+	GTK.gtk_window_group_add_window (group, handle);
+	GTK.gtk_window_set_modal(handle, true);
 	PrinterData data = null;
 	//TODO: Handle 'Print Preview' (GTK_RESPONSE_APPLY).
 	Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent ();
@@ -382,17 +382,17 @@ public PrinterData open() {
 	int signalId = 0;
 	long /*int*/ hookId = 0;
 	if ((getStyle () & SWT.RIGHT_TO_LEFT) != 0) {
-		signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
+		signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
 		hookId = OS.g_signal_add_emission_hook (signalId, 0, ((LONG) display.getData (GET_EMISSION_PROC_KEY)).value, handle, 0);
 	}
 	display.setData (ADD_IDLE_PROC_KEY, null);
 	Object oldModal = null;
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		oldModal = display.getData (GET_MODAL_DIALOG);
 		display.setData (SET_MODAL_DIALOG, this);
 	}
 	display.sendPreExternalEventDispatchEvent ();
-	int response = OS.gtk_dialog_run (handle);
+	int response = GTK.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -401,28 +401,28 @@ public PrinterData open() {
 	*/
 	OS.gdk_threads_leave();
 	display.sendPostExternalEventDispatchEvent ();
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		display.setData (SET_MODAL_DIALOG, oldModal);
 	}
 	if ((getStyle () & SWT.RIGHT_TO_LEFT) != 0) {
 		OS.g_signal_remove_emission_hook (signalId, hookId);
 	}
-	if (response == OS.GTK_RESPONSE_OK) {
-		long /*int*/ printer = OS.gtk_print_unix_dialog_get_selected_printer(handle);
+	if (response == GTK.GTK_RESPONSE_OK) {
+		long /*int*/ printer = GTK.gtk_print_unix_dialog_get_selected_printer(handle);
 		if (printer != 0) {
 			/* Get state from print dialog. */
-			settings = OS.gtk_print_unix_dialog_get_settings(handle); // must unref
-			page_setup = OS.gtk_print_unix_dialog_get_page_setup(handle); // do not unref
+			settings = GTK.gtk_print_unix_dialog_get_settings(handle); // must unref
+			page_setup = GTK.gtk_print_unix_dialog_get_page_setup(handle); // do not unref
 			data = Printer.printerDataFromGtkPrinter(printer);
-			int print_pages = OS.gtk_print_settings_get_print_pages(settings);
+			int print_pages = GTK.gtk_print_settings_get_print_pages(settings);
 			switch (print_pages) {
-				case OS.GTK_PRINT_PAGES_ALL:
+				case GTK.GTK_PRINT_PAGES_ALL:
 					data.scope = PrinterData.ALL_PAGES;
 					break;
-				case OS.GTK_PRINT_PAGES_RANGES:
+				case GTK.GTK_PRINT_PAGES_RANGES:
 					data.scope = PrinterData.PAGE_RANGE;
 					int[] num_ranges = new int[1];
-					long /*int*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges);
+					long /*int*/ page_ranges = GTK.gtk_print_settings_get_page_ranges(settings, num_ranges);
 					int [] pageRange = new int[2];
 					int length = num_ranges[0];
 					int min = Integer.MAX_VALUE, max = 0;
@@ -435,29 +435,29 @@ public PrinterData open() {
 					data.startPage = min == Integer.MAX_VALUE ? 1 : min;
 					data.endPage = max == 0 ? 1 : max;
 					break;
-				case OS.GTK_PRINT_PAGES_CURRENT:
+				case GTK.GTK_PRINT_PAGES_CURRENT:
 					//TODO: Disabled in dialog (see above). This code will not run. (see gtk bug 344519)
 					data.scope = PrinterData.SELECTION;
-					data.startPage = data.endPage = OS.gtk_print_unix_dialog_get_current_page(handle);
+					data.startPage = data.endPage = GTK.gtk_print_unix_dialog_get_current_page(handle);
 					break;
 			}
 
 			data.printToFile = Printer.GTK_FILE_BACKEND.equals(data.driver); // TODO: GTK_FILE_BACKEND is not GTK API (see gtk bug 345590)
 			if (data.printToFile) {
-				long /*int*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI);
+				long /*int*/ address = GTK.gtk_print_settings_get(settings, GTK.GTK_PRINT_SETTINGS_OUTPUT_URI);
 				int length = C.strlen (address);
 				byte [] buffer = new byte [length];
 				C.memmove (buffer, address, length);
 				data.fileName = new String (Converter.mbcsToWcs (buffer));
 			}
 
-			data.copyCount = OS.gtk_print_settings_get_n_copies(settings);
-			data.collate = OS.gtk_print_settings_get_collate(settings);
-			int duplex = OS.gtk_print_settings_get_duplex(settings);
-			data.duplex = duplex == OS.GTK_PRINT_DUPLEX_HORIZONTAL ? PrinterData.DUPLEX_LONG_EDGE
-					: duplex == OS.GTK_PRINT_DUPLEX_VERTICAL ? PrinterData.DUPLEX_SHORT_EDGE
+			data.copyCount = GTK.gtk_print_settings_get_n_copies(settings);
+			data.collate = GTK.gtk_print_settings_get_collate(settings);
+			int duplex = GTK.gtk_print_settings_get_duplex(settings);
+			data.duplex = duplex == GTK.GTK_PRINT_DUPLEX_HORIZONTAL ? PrinterData.DUPLEX_LONG_EDGE
+					: duplex == GTK.GTK_PRINT_DUPLEX_VERTICAL ? PrinterData.DUPLEX_SHORT_EDGE
 					: PrinterData.DUPLEX_NONE;
-			data.orientation = OS.gtk_page_setup_get_orientation(page_setup) == OS.GTK_PAGE_ORIENTATION_LANDSCAPE ? PrinterData.LANDSCAPE : PrinterData.PORTRAIT;
+			data.orientation = GTK.gtk_page_setup_get_orientation(page_setup) == GTK.GTK_PAGE_ORIENTATION_LANDSCAPE ? PrinterData.LANDSCAPE : PrinterData.PORTRAIT;
 
 			/* Save other print_settings data as key/value pairs in otherData. */
 			Callback printSettingsCallback = new Callback(this, "GtkPrintSettingsFunc", 3); //$NON-NLS-1$
@@ -465,32 +465,32 @@ public PrinterData open() {
 			if (GtkPrintSettingsFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 			index = 0;
 			settingsData = new byte[1024];
-			OS.gtk_print_settings_foreach (settings, GtkPrintSettingsFunc, 0);
+			GTK.gtk_print_settings_foreach (settings, GtkPrintSettingsFunc, 0);
 			printSettingsCallback.dispose ();
 			index++; // extra null terminator after print_settings and before page_setup
 
 			/* Save page_setup data as key/value pairs in otherData.
 			 * Note that page_setup properties must be stored and restored in the same order.
 			 */
-			store("orientation", OS.gtk_page_setup_get_orientation(page_setup)); //$NON-NLS-1$
-			store("top_margin", OS.gtk_page_setup_get_top_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
-			store("bottom_margin", OS.gtk_page_setup_get_bottom_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
-			store("left_margin", OS.gtk_page_setup_get_left_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
-			store("right_margin", OS.gtk_page_setup_get_right_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
-			long /*int*/ paper_size = OS.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$
-			storeBytes("paper_size_name", OS.gtk_paper_size_get_name(paper_size)); //$NON-NLS-1$
-			storeBytes("paper_size_display_name", OS.gtk_paper_size_get_display_name(paper_size)); //$NON-NLS-1$
-			storeBytes("paper_size_ppd_name", OS.gtk_paper_size_get_ppd_name(paper_size)); //$NON-NLS-1$
-			store("paper_size_width", OS.gtk_paper_size_get_width(paper_size, OS.GTK_UNIT_MM)); //$NON-NLS-1$
-			store("paper_size_height", OS.gtk_paper_size_get_height(paper_size, OS.GTK_UNIT_MM)); //$NON-NLS-1$
-			store("paper_size_is_custom", OS.gtk_paper_size_is_custom(paper_size)); //$NON-NLS-1$
+			store("orientation", GTK.gtk_page_setup_get_orientation(page_setup)); //$NON-NLS-1$
+			store("top_margin", GTK.gtk_page_setup_get_top_margin(page_setup, GTK.GTK_UNIT_MM)); //$NON-NLS-1$
+			store("bottom_margin", GTK.gtk_page_setup_get_bottom_margin(page_setup, GTK.GTK_UNIT_MM)); //$NON-NLS-1$
+			store("left_margin", GTK.gtk_page_setup_get_left_margin(page_setup, GTK.GTK_UNIT_MM)); //$NON-NLS-1$
+			store("right_margin", GTK.gtk_page_setup_get_right_margin(page_setup, GTK.GTK_UNIT_MM)); //$NON-NLS-1$
+			long /*int*/ paper_size = GTK.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$
+			storeBytes("paper_size_name", GTK.gtk_paper_size_get_name(paper_size)); //$NON-NLS-1$
+			storeBytes("paper_size_display_name", GTK.gtk_paper_size_get_display_name(paper_size)); //$NON-NLS-1$
+			storeBytes("paper_size_ppd_name", GTK.gtk_paper_size_get_ppd_name(paper_size)); //$NON-NLS-1$
+			store("paper_size_width", GTK.gtk_paper_size_get_width(paper_size, GTK.GTK_UNIT_MM)); //$NON-NLS-1$
+			store("paper_size_height", GTK.gtk_paper_size_get_height(paper_size, GTK.GTK_UNIT_MM)); //$NON-NLS-1$
+			store("paper_size_is_custom", GTK.gtk_paper_size_is_custom(paper_size)); //$NON-NLS-1$
 			data.otherData = settingsData;
 			OS.g_object_unref(settings);
 			printerData = data;
 		}
 	}
 	display.setData (REMOVE_IDLE_PROC_KEY, null);
-	OS.gtk_widget_destroy (handle);
+	GTK.gtk_widget_destroy (handle);
 	return data;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
index 6c4d5c1349..0e123fb107 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
@@ -71,7 +71,7 @@ static void gtk_init() {
 			OS.g_thread_init(0);
 		}
 	}
-	if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) {
+	if (!GTK.gtk_init_check (new long /*int*/ [] {0}, null)) {
 		SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]");
 	}
 }
@@ -92,7 +92,7 @@ public static PrinterData[] getPrinterList() {
 	Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_List", 2); //$NON-NLS-1$
 	long /*int*/ GtkPrinterFunc_List = printerCallback.getAddress();
 	if (GtkPrinterFunc_List == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-	OS.gtk_enumerate_printers(GtkPrinterFunc_List, 0, 0, true);
+	GTK.gtk_enumerate_printers(GtkPrinterFunc_List, 0, 0, true);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -140,7 +140,7 @@ public static PrinterData getDefaultPrinterData() {
 	Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_Default", 2); //$NON-NLS-1$
 	long /*int*/ GtkPrinterFunc_Default = printerCallback.getAddress();
 	if (GtkPrinterFunc_Default == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-	OS.gtk_enumerate_printers(GtkPrinterFunc_Default, 0, 0, true);
+	GTK.gtk_enumerate_printers(GtkPrinterFunc_Default, 0, 0, true);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -153,7 +153,7 @@ public static PrinterData getDefaultPrinterData() {
 }
 
 static long /*int*/ GtkPrinterFunc_Default (long /*int*/ printer, long /*int*/ user_data) {
-	if (OS.gtk_printer_is_default(printer)) {
+	if (GTK.gtk_printer_is_default(printer)) {
 		findData = printerDataFromGtkPrinter(printer);
 		return 1;
 	}
@@ -167,7 +167,7 @@ static long /*int*/ gtkPrinterFromPrinterData(PrinterData data) {
 	if (GtkPrinterFunc_FindNamedPrinter == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 	findPrinter = 0;
 	findData = data;
-	OS.gtk_enumerate_printers(GtkPrinterFunc_FindNamedPrinter, 0, 0, true);
+	GTK.gtk_enumerate_printers(GtkPrinterFunc_FindNamedPrinter, 0, 0, true);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -192,14 +192,14 @@ static long /*int*/ GtkPrinterFunc_FindNamedPrinter (long /*int*/ printer, long
 }
 
 static PrinterData printerDataFromGtkPrinter(long /*int*/ printer) {
-	long /*int*/ backend = OS.gtk_printer_get_backend(printer);
+	long /*int*/ backend = GTK.gtk_printer_get_backend(printer);
 	long /*int*/ address = OS.G_OBJECT_TYPE_NAME(backend);
 	int length = C.strlen (address);
 	byte [] buffer = new byte [length];
 	C.memmove (buffer, address, length);
 	String backendType = new String (Converter.mbcsToWcs (buffer));
 
-	address = OS.gtk_printer_get_name (printer);
+	address = GTK.gtk_printer_get_name (printer);
 	length = C.strlen (address);
 	buffer = new byte [length];
 	C.memmove (buffer, address, length);
@@ -225,7 +225,7 @@ static void restore(byte [] data, long /*int*/ settings, long /*int*/ page_setup
 		end++;
 		byte [] valueBuffer = new byte [end - start];
 		System.arraycopy (settingsData, start, valueBuffer, 0, valueBuffer.length);
-		OS.gtk_print_settings_set(settings, keyBuffer, valueBuffer);
+		GTK.gtk_print_settings_set(settings, keyBuffer, valueBuffer);
 		if (DEBUG) System.out.println(new String (Converter.mbcsToWcs (keyBuffer))+": "+new String (Converter.mbcsToWcs (valueBuffer)));
 	}
 	end++; // skip extra null terminator
@@ -233,11 +233,11 @@ static void restore(byte [] data, long /*int*/ settings, long /*int*/ page_setup
 	/* Retrieve stored page_setup data.
 	 * Note that page_setup properties must be stored (in PrintDialog) and restored (here) in the same order.
 	 */
-	OS.gtk_page_setup_set_orientation(page_setup, restoreInt("orientation")); //$NON-NLS-1$
-	OS.gtk_page_setup_set_top_margin(page_setup, restoreDouble("top_margin"), OS.GTK_UNIT_MM); //$NON-NLS-1$
-	OS.gtk_page_setup_set_bottom_margin(page_setup, restoreDouble("bottom_margin"), OS.GTK_UNIT_MM); //$NON-NLS-1$
-	OS.gtk_page_setup_set_left_margin(page_setup, restoreDouble("left_margin"), OS.GTK_UNIT_MM); //$NON-NLS-1$
-	OS.gtk_page_setup_set_right_margin(page_setup, restoreDouble("right_margin"), OS.GTK_UNIT_MM); //$NON-NLS-1$
+	GTK.gtk_page_setup_set_orientation(page_setup, restoreInt("orientation")); //$NON-NLS-1$
+	GTK.gtk_page_setup_set_top_margin(page_setup, restoreDouble("top_margin"), GTK.GTK_UNIT_MM); //$NON-NLS-1$
+	GTK.gtk_page_setup_set_bottom_margin(page_setup, restoreDouble("bottom_margin"), GTK.GTK_UNIT_MM); //$NON-NLS-1$
+	GTK.gtk_page_setup_set_left_margin(page_setup, restoreDouble("left_margin"), GTK.GTK_UNIT_MM); //$NON-NLS-1$
+	GTK.gtk_page_setup_set_right_margin(page_setup, restoreDouble("right_margin"), GTK.GTK_UNIT_MM); //$NON-NLS-1$
 	byte [] name = restoreBytes("paper_size_name", true); //$NON-NLS-1$
 	byte [] display_name = restoreBytes("paper_size_display_name", true); //$NON-NLS-1$
 	byte [] ppd_name = restoreBytes("paper_size_ppd_name", true); //$NON-NLS-1$
@@ -247,15 +247,15 @@ static void restore(byte [] data, long /*int*/ settings, long /*int*/ page_setup
 	long /*int*/ paper_size = 0;
 	if (custom) {
 		if (ppd_name.length > 0) {
-			paper_size = OS.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height);
+			paper_size = GTK.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height);
 		} else {
-			paper_size = OS.gtk_paper_size_new_custom(name, display_name, width, height, OS.GTK_UNIT_MM);
+			paper_size = GTK.gtk_paper_size_new_custom(name, display_name, width, height, GTK.GTK_UNIT_MM);
 		}
 	} else {
-		paper_size = OS.gtk_paper_size_new(name);
+		paper_size = GTK.gtk_paper_size_new(name);
 	}
-	OS.gtk_page_setup_set_paper_size(page_setup, paper_size);
-	OS.gtk_paper_size_free(paper_size);
+	GTK.gtk_page_setup_set_paper_size(page_setup, paper_size);
+	GTK.gtk_paper_size_free(paper_size);
 }
 
 static byte [] uriFromFilename(String filename) {
@@ -405,7 +405,7 @@ public long /*int*/ internal_new_GC(GCData data) {
 		}
 		data.device = this;
 		data.drawable = drawable;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			data.backgroundRGBA = getSystemColor (SWT.COLOR_WHITE).handleRGBA;
 			data.foregroundRGBA = getSystemColor (SWT.COLOR_BLACK).handleRGBA;
 		} else {
@@ -414,12 +414,12 @@ public long /*int*/ internal_new_GC(GCData data) {
 		}
 		data.font = getSystemFont ();
 		Point dpi = getDPI(), screenDPI = getIndependentDPI();
-		data.width = (int)(OS.gtk_page_setup_get_paper_width (pageSetup, OS.GTK_UNIT_POINTS) * dpi.x / screenDPI.x);
-		data.height = (int)(OS.gtk_page_setup_get_paper_height (pageSetup, OS.GTK_UNIT_POINTS) * dpi.y / screenDPI.y);
+		data.width = (int)(GTK.gtk_page_setup_get_paper_width (pageSetup, GTK.GTK_UNIT_POINTS) * dpi.x / screenDPI.x);
+		data.height = (int)(GTK.gtk_page_setup_get_paper_height (pageSetup, GTK.GTK_UNIT_POINTS) * dpi.y / screenDPI.y);
 		if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 		Cairo.cairo_identity_matrix(cairo);
-		double printX = OS.gtk_page_setup_get_left_margin(pageSetup, OS.GTK_UNIT_POINTS);
-		double printY = OS.gtk_page_setup_get_top_margin(pageSetup, OS.GTK_UNIT_POINTS);
+		double printX = GTK.gtk_page_setup_get_left_margin(pageSetup, GTK.GTK_UNIT_POINTS);
+		double printY = GTK.gtk_page_setup_get_top_margin(pageSetup, GTK.GTK_UNIT_POINTS);
 		Cairo.cairo_translate(cairo, printX, printY);
 		Cairo.cairo_scale(cairo, screenDPI.x / (float)dpi.x, screenDPI.y / (float)dpi.y);
 		double[] matrix = new double[6];
@@ -483,9 +483,9 @@ public boolean isAutoScalable() {
 public boolean startJob(String jobName) {
 	checkDevice();
 	byte [] buffer = Converter.wcsToMbcs (jobName, true);
-	printJob = OS.gtk_print_job_new (buffer, printer, settings, pageSetup);
+	printJob = GTK.gtk_print_job_new (buffer, printer, settings, pageSetup);
 	if (printJob == 0) return false;
-	surface = OS.gtk_print_job_get_surface(printJob, null);
+	surface = GTK.gtk_print_job_get_surface(printJob, null);
 	if (surface == 0) {
 		OS.g_object_unref(printJob);
 		printJob = 0;
@@ -530,7 +530,7 @@ public void endJob() {
 	checkDevice();
 	if (printJob == 0) return;
 	Cairo.cairo_surface_finish(surface);
-	OS.gtk_print_job_send(printJob, 0, 0, 0);
+	GTK.gtk_print_job_send(printJob, 0, 0, 0);
 	OS.g_object_unref(printJob);
 	printJob = 0;
 }
@@ -572,8 +572,8 @@ public void cancelJob() {
 public boolean startPage() {
 	checkDevice();
 	if (printJob == 0) return false;
-	double width = OS.gtk_page_setup_get_paper_width (pageSetup, OS.GTK_UNIT_POINTS);
-	double height = OS.gtk_page_setup_get_paper_height (pageSetup, OS.GTK_UNIT_POINTS);
+	double width = GTK.gtk_page_setup_get_paper_width (pageSetup, GTK.GTK_UNIT_POINTS);
+	double height = GTK.gtk_page_setup_get_paper_height (pageSetup, GTK.GTK_UNIT_POINTS);
 	int type = Cairo.cairo_surface_get_type (surface);
 	switch (type) {
 		case Cairo.CAIRO_SURFACE_TYPE_PS:
@@ -616,7 +616,7 @@ public void endPage() {
 @Override
 public Point getDPI() {
 	checkDevice();
-	int resolution = OS.gtk_print_settings_get_resolution(settings);
+	int resolution = GTK.gtk_print_settings_get_resolution(settings);
 	if (DEBUG) System.out.println("print_settings.resolution=" + resolution);
 	//TODO: use new api for get x resolution and get y resolution
 	if (resolution == 0) return new Point(72, 72);
@@ -642,8 +642,8 @@ public Point getDPI() {
 public Rectangle getBounds() {
 	checkDevice();
 	Point dpi = getDPI(), screenDPI = getIndependentDPI();
-	double width = OS.gtk_page_setup_get_paper_width (pageSetup, OS.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
-	double height = OS.gtk_page_setup_get_paper_height (pageSetup, OS.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
+	double width = GTK.gtk_page_setup_get_paper_width (pageSetup, GTK.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
+	double height = GTK.gtk_page_setup_get_paper_height (pageSetup, GTK.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
 	return new Rectangle(0, 0, (int) width, (int) height);
 }
 
@@ -668,8 +668,8 @@ public Rectangle getBounds() {
 public Rectangle getClientArea() {
 	checkDevice();
 	Point dpi = getDPI(), screenDPI = getIndependentDPI();
-	double width = OS.gtk_page_setup_get_page_width(pageSetup, OS.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
-	double height = OS.gtk_page_setup_get_page_height(pageSetup, OS.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
+	double width = GTK.gtk_page_setup_get_page_width(pageSetup, GTK.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
+	double height = GTK.gtk_page_setup_get_page_height(pageSetup, GTK.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
 	return new Rectangle(0, 0, (int) width, (int) height);
 }
 
@@ -715,12 +715,12 @@ Point getIndependentDPI () {
 public Rectangle computeTrim(int x, int y, int width, int height) {
 	checkDevice();
 	Point dpi = getDPI(), screenDPI = getIndependentDPI();
-	double printWidth = OS.gtk_page_setup_get_page_width(pageSetup, OS.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
-	double printHeight = OS.gtk_page_setup_get_page_height(pageSetup, OS.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
-	double paperWidth = OS.gtk_page_setup_get_paper_width (pageSetup, OS.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
-	double paperHeight = OS.gtk_page_setup_get_paper_height (pageSetup, OS.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
-	double printX = -OS.gtk_page_setup_get_left_margin(pageSetup, OS.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
-	double printY = -OS.gtk_page_setup_get_top_margin(pageSetup, OS.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
+	double printWidth = GTK.gtk_page_setup_get_page_width(pageSetup, GTK.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
+	double printHeight = GTK.gtk_page_setup_get_page_height(pageSetup, GTK.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
+	double paperWidth = GTK.gtk_page_setup_get_paper_width (pageSetup, GTK.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
+	double paperHeight = GTK.gtk_page_setup_get_paper_height (pageSetup, GTK.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
+	double printX = -GTK.gtk_page_setup_get_left_margin(pageSetup, GTK.GTK_UNIT_POINTS) * dpi.x / screenDPI.x;
+	double printY = -GTK.gtk_page_setup_get_top_margin(pageSetup, GTK.GTK_UNIT_POINTS) * dpi.y / screenDPI.y;
 	double hTrim = paperWidth - printWidth;
 	double vTrim = paperHeight - printHeight;
 	return new Rectangle(x + (int)printX, y + (int)printY, width + (int)hTrim, height + (int)vTrim);
@@ -754,8 +754,8 @@ protected void create(DeviceData deviceData) {
  */
 @Override
 protected void init() {
-	settings = OS.gtk_print_settings_new();
-	pageSetup = OS.gtk_page_setup_new();
+	settings = GTK.gtk_print_settings_new();
+	pageSetup = GTK.gtk_page_setup_new();
 	if (data.otherData != null) {
 		restore(data.otherData, settings, pageSetup);
 	}
@@ -764,33 +764,33 @@ protected void init() {
 	if (data.printToFile && data.fileName != null) {
 		byte [] uri = uriFromFilename(data.fileName);
 		if (uri != null) {
-			OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
+			GTK.gtk_print_settings_set(settings, GTK.GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
 		}
 	}
-	OS.gtk_print_settings_set_n_copies(settings, data.copyCount);
-	OS.gtk_print_settings_set_collate(settings, data.collate);
+	GTK.gtk_print_settings_set_n_copies(settings, data.copyCount);
+	GTK.gtk_print_settings_set_collate(settings, data.collate);
 	if (data.duplex != SWT.DEFAULT) {
-		int duplex = data.duplex == PrinterData.DUPLEX_LONG_EDGE ? OS.GTK_PRINT_DUPLEX_HORIZONTAL
-			: data.duplex == PrinterData.DUPLEX_SHORT_EDGE ? OS.GTK_PRINT_DUPLEX_VERTICAL
-			: OS.GTK_PRINT_DUPLEX_SIMPLEX;
-		OS.gtk_print_settings_set_duplex (settings, duplex);
+		int duplex = data.duplex == PrinterData.DUPLEX_LONG_EDGE ? GTK.GTK_PRINT_DUPLEX_HORIZONTAL
+			: data.duplex == PrinterData.DUPLEX_SHORT_EDGE ? GTK.GTK_PRINT_DUPLEX_VERTICAL
+			: GTK.GTK_PRINT_DUPLEX_SIMPLEX;
+		GTK.gtk_print_settings_set_duplex (settings, duplex);
 		/*
 		 * Bug in GTK.  The cups backend only looks at the value
 		 * of the non-API field cups-Duplex in the print_settings.
 		 * The fix is to manually set cups-Duplex to Tumble or NoTumble.
 		 */
 		String cupsDuplexType = null;
-		if (duplex == OS.GTK_PRINT_DUPLEX_HORIZONTAL) cupsDuplexType = "DuplexNoTumble";
-		else if (duplex == OS.GTK_PRINT_DUPLEX_VERTICAL) cupsDuplexType = "DuplexTumble";
+		if (duplex == GTK.GTK_PRINT_DUPLEX_HORIZONTAL) cupsDuplexType = "DuplexNoTumble";
+		else if (duplex == GTK.GTK_PRINT_DUPLEX_VERTICAL) cupsDuplexType = "DuplexTumble";
 		if (cupsDuplexType != null) {
 			byte [] keyBuffer = Converter.wcsToMbcs ("cups-Duplex", true);
 			byte [] valueBuffer = Converter.wcsToMbcs (cupsDuplexType, true);
-			OS.gtk_print_settings_set(settings, keyBuffer, valueBuffer);
+			GTK.gtk_print_settings_set(settings, keyBuffer, valueBuffer);
 		}
 	}
-	int orientation = data.orientation == PrinterData.LANDSCAPE ? OS.GTK_PAGE_ORIENTATION_LANDSCAPE : OS.GTK_PAGE_ORIENTATION_PORTRAIT;
-	OS.gtk_page_setup_set_orientation(pageSetup, orientation);
-	OS.gtk_print_settings_set_orientation(settings, orientation);
+	int orientation = data.orientation == PrinterData.LANDSCAPE ? GTK.GTK_PAGE_ORIENTATION_LANDSCAPE : GTK.GTK_PAGE_ORIENTATION_PORTRAIT;
+	GTK.gtk_page_setup_set_orientation(pageSetup, orientation);
+	GTK.gtk_print_settings_set_orientation(settings, orientation);
 	super.init ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
index 2273f0bd19..cfedfc0c81 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
@@ -146,13 +146,13 @@ public static Program[] getPrograms() {
 public ImageData getImageData() {
 	if (iconPath == null) return null;
 	ImageData data = null;
-	long /*int*/ icon_theme =OS.gtk_icon_theme_get_default();
+	long /*int*/ icon_theme =GTK.gtk_icon_theme_get_default();
 	byte[] icon = Converter.wcsToMbcs (iconPath, true);
 	long /*int*/ gicon = OS.g_icon_new_for_string(icon, null);
 	if (gicon != 0) {
-		long /*int*/ gicon_info = OS.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0);
+		long /*int*/ gicon_info = GTK.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0);
 		if (gicon_info != 0) {
-			long /*int*/ pixbuf = OS.gtk_icon_info_load_icon(gicon_info, null);
+			long /*int*/ pixbuf = GTK.gtk_icon_info_load_icon(gicon_info, null);
 			if (pixbuf != 0) {
 				int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
 				long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
@@ -182,10 +182,10 @@ public ImageData getImageData() {
 					data.bytesPerLine = stride;
 				}
 			}
-			if (OS.GTK_VERSION >= OS.VERSION(3, 8, 0)) {
+			if (GTK.GTK_VERSION >= OS.VERSION(3, 8, 0)) {
 				OS.g_object_unref(gicon_info);
 			} else {
-				OS.gtk_icon_info_free(gicon_info);
+				GTK.gtk_icon_info_free(gicon_info);
 			}
 		}
 		OS.g_object_unref(gicon);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
index 6b810715fb..c035a50dc6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
@@ -607,9 +607,9 @@ static String getString (long /*int*/ strPtr) {
 
 static Browser FindBrowser (long /*int*/ webView) {
 	if (webView == 0) return null;
-	long /*int*/ parent = OS.gtk_widget_get_parent (webView);
+	long /*int*/ parent = GTK.gtk_widget_get_parent (webView);
 	if (WEBKIT1){
-		parent = OS.gtk_widget_get_parent (parent);
+		parent = GTK.gtk_widget_get_parent (parent);
 	}
 	return (Browser)Display.getCurrent ().findWidget (parent);
 }
@@ -678,7 +678,7 @@ static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ obje
 }
 
 static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long /*int*/ user_data) {
-	if (OS.GTK_IS_SCROLLED_WINDOW (arg0)) {
+	if (GTK.GTK_IS_SCROLLED_WINDOW (arg0)) {
 		/*
 		 * Stop the propagation of events that are not consumed by WebKit, before
 		 * they reach the parent embedder.  These events have already been received.
@@ -742,7 +742,7 @@ static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long
 					}
 				}
 				if (WEBKIT1 || (WEBKIT2 && browser != null)) {
-					OS.gtk_widget_event (browser.handle, event);
+					GTK.gtk_widget_event (browser.handle, event);
 				}
 			}
 		}
@@ -1036,8 +1036,8 @@ public void create (Composite parent, int style) {
 	}
 
 	if (WEBKIT1){
-		scrolledWindow = OS.gtk_scrolled_window_new (0, 0);
-		OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
+		scrolledWindow = GTK.gtk_scrolled_window_new (0, 0);
+		GTK.gtk_scrolled_window_set_policy (scrolledWindow, GTK.GTK_POLICY_AUTOMATIC, GTK.GTK_POLICY_AUTOMATIC);
 	}
 
 	webView = WebKitGTK.webkit_web_view_new ();
@@ -1057,9 +1057,9 @@ public void create (Composite parent, int style) {
 	}
 
 	if (WEBKIT1){
-		OS.gtk_container_add (scrolledWindow, webView);
-		OS.gtk_container_add (browser.handle, scrolledWindow);
-		OS.gtk_widget_show (scrolledWindow);
+		GTK.gtk_container_add (scrolledWindow, webView);
+		GTK.gtk_container_add (browser.handle, scrolledWindow);
+		GTK.gtk_widget_show (scrolledWindow);
 
 		OS.g_signal_connect (webView, WebKitGTK.close_web_view, Proc2.getAddress (), CLOSE_WEB_VIEW);
 		OS.g_signal_connect (webView, WebKitGTK.console_message, Proc5.getAddress (), CONSOLE_MESSAGE);
@@ -1076,7 +1076,7 @@ public void create (Composite parent, int style) {
 		OS.g_signal_connect (webView, WebKitGTK.window_object_cleared, Proc5.getAddress (), WINDOW_OBJECT_CLEARED);
 		OS.g_signal_connect (webView, WebKitGTK.status_bar_text_changed, Proc3.getAddress (), STATUS_BAR_TEXT_CHANGED);
 	} else {
-		OS.gtk_container_add (browser.handle, webView);
+		GTK.gtk_container_add (browser.handle, webView);
 		OS.g_signal_connect (webView, WebKitGTK.close, Proc2.getAddress (), CLOSE_WEB_VIEW);
 		OS.g_signal_connect (webView, WebKitGTK.create, Proc3.getAddress (), CREATE_WEB_VIEW);
 		OS.g_signal_connect (webView, WebKitGTK.load_changed, Proc3.getAddress (), LOAD_CHANGED);
@@ -1089,8 +1089,8 @@ public void create (Composite parent, int style) {
 		OS.g_signal_connect (webView, WebKitGTK.authenticate, Proc3.getAddress (), AUTHENTICATE);
 	}
 
-	OS.gtk_widget_show (webView);
-	OS.gtk_widget_show (browser.handle);
+	GTK.gtk_widget_show (webView);
+	GTK.gtk_widget_show (browser.handle);
 
 	OS.g_signal_connect (webView, WebKitGTK.notify_title, Proc3.getAddress (), NOTIFY_TITLE);
 
@@ -1165,7 +1165,7 @@ public void create (Composite parent, int style) {
 				break;
 			}
 			case SWT.FocusIn: {
-				OS.gtk_widget_grab_focus (webView);
+				GTK.gtk_widget_grab_focus (webView);
 				break;
 			}
 			case SWT.Resize: {
@@ -1883,7 +1883,7 @@ boolean handleDOMEvent (long /*int*/ event, int type) {
 
 	/* key event */
 	int keyEventState = 0;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventKey gdkEvent = new GdkEventKey ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -2389,9 +2389,9 @@ void onDispose (Event e) {
 void onResize (Event e) {
 	Rectangle rect = DPIUtil.autoScaleUp(browser.getClientArea ());
 	if (WEBKIT2){
-		OS.gtk_widget_set_size_request (webView, rect.width, rect.height);
+		GTK.gtk_widget_set_size_request (webView, rect.width, rect.height);
 	} else {
-		OS.gtk_widget_set_size_request (scrolledWindow, rect.width, rect.height);
+		GTK.gtk_widget_set_size_request (scrolledWindow, rect.width, rect.height);
 	}
 }
 
@@ -3280,11 +3280,11 @@ long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_m
 	browser.notifyListeners (SWT.MenuDetect, event);
 	if (!event.doit) {
 		/* clear the menu */
-		long /*int*/ children = OS.gtk_container_get_children (webkit_menu);
+		long /*int*/ children = GTK.gtk_container_get_children (webkit_menu);
 		long /*int*/ current = children;
 		while (current != 0) {
 			long /*int*/ item = OS.g_list_data (current);
-			OS.gtk_container_remove (webkit_menu, item);
+			GTK.gtk_container_remove (webkit_menu, item);
 			current = OS.g_list_next (current);
 		}
 		OS.g_list_free (children);
@@ -3297,11 +3297,11 @@ long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_m
 		}
 		menu.setVisible (true);
 		/* clear the menu */
-		long /*int*/ children = OS.gtk_container_get_children (webkit_menu);
+		long /*int*/ children = GTK.gtk_container_get_children (webkit_menu);
 		long /*int*/ current = children;
 		while (current != 0) {
 			long /*int*/ item = OS.g_list_data (current);
-			OS.gtk_container_remove (webkit_menu, item);
+			GTK.gtk_container_remove (webkit_menu, item);
 			current = OS.g_list_next (current);
 		}
 		OS.g_list_free (children);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index d8a8912168..df2f0f4234 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -51,7 +51,7 @@ public class WebKitGTK extends C {
 			if (webkit2VersionFunction != 0) { // SWT_WEBKIT2 env variable is not set but webkit2 was loaded as fallback
 				webkit2 = "1";
 			}
-			WEBKIT2 = webkit2 != null && webkit2.equals("1") && OS.GTK3; // $NON-NLS-1$
+			WEBKIT2 = webkit2 != null && webkit2.equals("1") && GTK.GTK3; // $NON-NLS-1$
 			WEBKIT1 = !WEBKIT2;
 		}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
index d2c50bea2e..d4b8a03730 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
@@ -220,7 +220,7 @@ public Color(Device device, RGB rgb, int alpha) {
 
 @Override
 void destroy() {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		handleRGBA = null;
 	} else {
 		int pixel = handle.pixel;
@@ -251,7 +251,7 @@ public boolean equals(Object object) {
 	if (object == this) return true;
 	if (!(object instanceof Color)) return false;
 	Color color = (Color)object;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color.handleRGBA;
 		if (handleRGBA == gdkRGBA) return true;
 		return device == color.device && Double.compare(handleRGBA.red, gdkRGBA.red) == 0 &&
@@ -292,7 +292,7 @@ public int getAlpha() {
  */
 public int getBlue() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return (int) (handleRGBA.blue * 255) & 0xFF;
 	} else {
 		return (handle.blue >> 8) & 0xFF;
@@ -310,7 +310,7 @@ public int getBlue() {
  */
 public int getGreen() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return (int) (handleRGBA.green * 255) & 0xFF;
 	} else {
 		return (handle.green >> 8) & 0xFF;
@@ -328,7 +328,7 @@ public int getGreen() {
  */
 public int getRed() {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return (int) (handleRGBA.red * 255) & 0xFF;
 	} else {
 		return (handle.red >> 8) & 0xFF;
@@ -348,7 +348,7 @@ public int getRed() {
 @Override
 public int hashCode() {
 	if (isDisposed()) return 0;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return Double.hashCode(handleRGBA.red) ^ Double.hashCode(handleRGBA.green) ^ Double.hashCode(handleRGBA.blue)
 				^ Double.hashCode(handleRGBA.alpha);
 	} else {
@@ -401,7 +401,7 @@ public RGBA getRGBA () {
  * @noreference This method is not intended to be referenced by clients.
  */
 public static Color gtk_new(Device device, GdkColor gdkColor) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return gtk_new(device, gdkColor, 255);
 }
 
@@ -421,7 +421,7 @@ public static Color gtk_new(Device device, GdkColor gdkColor) {
  * @noreference This method is not intended to be referenced by clients.
  */
 public static Color gtk_new(Device device, GdkRGBA gdkRGBA) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	Color color = new Color(device);
 	color.handleRGBA = gdkRGBA;
 	color.alpha = (int) (gdkRGBA.alpha * 255);
@@ -445,7 +445,7 @@ public static Color gtk_new(Device device, GdkRGBA gdkRGBA) {
  * @noreference This method is not intended to be referenced by clients.
  */
 public static Color gtk_new(Device device, GdkColor gdkColor, int alpha) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	Color color = new Color(device);
 	color.handle = gdkColor;
 	color.alpha = alpha;
@@ -469,7 +469,7 @@ public static Color gtk_new(Device device, GdkColor gdkColor, int alpha) {
  * @noreference This method is not intended to be referenced by clients.
  */
 public static Color gtk_new(Device device, GdkRGBA gdkRGBA, int alpha) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	Color color = new Color(device);
 	color.handleRGBA = gdkRGBA;
 	color.alpha = alpha;
@@ -499,7 +499,7 @@ void init(int red, int green, int blue, int alpha) {
 		(alpha > 255) || (alpha < 0)) {
 			SWT.error(SWT.ERROR_INVALID_ARGUMENT);
 	}
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		GdkColor gdkColor = new GdkColor();
 		gdkColor.red = (short)((red & 0xFF) | ((red & 0xFF) << 8));
 		gdkColor.green = (short)((green & 0xFF) | ((green & 0xFF) << 8));
@@ -547,7 +547,7 @@ void init(int red, int green, int blue, int alpha) {
  */
 @Override
 public boolean isDisposed() {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return handleRGBA == null;
 	} else {
 		return handle == null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
index 65df4cbfe5..e311da5b7d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
@@ -449,7 +449,7 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
 }
 
 long /*int*/ createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		for (int i = 0; i < sourceData.length; i++) {
 			byte s = sourceData[i];
 			sourceData[i] = (byte)(((s & 0x80) >> 7) |
@@ -610,7 +610,7 @@ public String toString () {
 }
 
 void gdk_cursor_unref (long /*int*/ cursor) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		OS.g_object_unref (cursor);
 	} else {
 		OS.gdk_cursor_unref(cursor);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
index 3696dfc67e..38d45f547a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
@@ -639,30 +639,30 @@ protected void init () {
 	if (emptyTab == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 	OS.pango_tab_array_set_tab(emptyTab, 0, OS.PANGO_TAB_LEFT, 1);
 
-	shellHandle = OS.gtk_window_new(OS.GTK_WINDOW_TOPLEVEL);
+	shellHandle = GTK.gtk_window_new(GTK.GTK_WINDOW_TOPLEVEL);
 	if (shellHandle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_realize(shellHandle);
+	GTK.gtk_widget_realize(shellHandle);
 
 	/* Initialize the system font slot */
 	long /*int*/ [] defaultFontArray = new long /*int*/ [1];
 	long /*int*/ defaultFont;
-	if (OS.GTK3) {
-		long /*int*/ context = OS.gtk_widget_get_style_context (shellHandle);
-		if (OS.GTK_VERSION < OS.VERSION(3, 8, 0)) {
-			defaultFont = OS.gtk_style_context_get_font (context, OS.GTK_STATE_FLAG_NORMAL);
-		} else if (OS.GTK_VERSION >= OS.VERSION(3, 18, 0)) {
-			OS.gtk_style_context_save(context);
-			OS.gtk_style_context_set_state(context, OS.GTK_STATE_FLAG_NORMAL);
-			OS.gtk_style_context_get(context, OS.GTK_STATE_FLAG_NORMAL, OS.gtk_style_property_font, defaultFontArray, 0);
-			OS.gtk_style_context_restore(context);
+	if (GTK.GTK3) {
+		long /*int*/ context = GTK.gtk_widget_get_style_context (shellHandle);
+		if (GTK.GTK_VERSION < OS.VERSION(3, 8, 0)) {
+			defaultFont = GTK.gtk_style_context_get_font (context, GTK.GTK_STATE_FLAG_NORMAL);
+		} else if (GTK.GTK_VERSION >= OS.VERSION(3, 18, 0)) {
+			GTK.gtk_style_context_save(context);
+			GTK.gtk_style_context_set_state(context, GTK.GTK_STATE_FLAG_NORMAL);
+			GTK.gtk_style_context_get(context, GTK.GTK_STATE_FLAG_NORMAL, GTK.gtk_style_property_font, defaultFontArray, 0);
+			GTK.gtk_style_context_restore(context);
 			defaultFont = defaultFontArray [0];
 		} else {
-			OS.gtk_style_context_get(context, OS.GTK_STATE_FLAG_NORMAL, OS.gtk_style_property_font, defaultFontArray, 0);
+			GTK.gtk_style_context_get(context, GTK.GTK_STATE_FLAG_NORMAL, GTK.gtk_style_property_font, defaultFontArray, 0);
 			defaultFont = defaultFontArray [0];
 		}
 	} else {
-		long /*int*/ style = OS.gtk_widget_get_style (shellHandle);
-		defaultFont = OS.gtk_style_get_font_desc (style);
+		long /*int*/ style = GTK.gtk_widget_get_style (shellHandle);
+		defaultFont = GTK.gtk_style_get_font_desc (style);
 	}
 	defaultFont = OS.pango_font_description_copy (defaultFont);
 	Point dpi = getDPI(), screenDPI = getScreenDPI();
@@ -673,14 +673,14 @@ protected void init () {
 	systemFont = Font.gtk_new (this, defaultFont);
 
 	/* Load certain CSS globally to save native GTK calls */
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/ screen = OS.gdk_screen_get_default();
-		long /*int*/ provider = OS.gtk_css_provider_new();
+		long /*int*/ provider = GTK.gtk_css_provider_new();
 		String resourcePath = "";
 		if (screen != 0 && provider != 0) {
 			String userCSS = "";
 			String additionalCSSPath = System.getProperty("org.eclipse.swt.internal.gtk.cssFile");
-			if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0) && additionalCSSPath != null){
+			if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0) && additionalCSSPath != null){
 				try (BufferedReader buffer = new BufferedReader(new FileReader(
 						new File(additionalCSSPath)))) {
 					userCSS = buffer.lines().collect(Collectors.joining("\n"));
@@ -690,7 +690,7 @@ protected void init () {
 
 			}
 
-			if (OS.GTK_VERSION < OS.VERSION(3, 20, 0)) {
+			if (GTK.GTK_VERSION < OS.VERSION(3, 20, 0)) {
 				resourcePath = "/org/eclipse/swt/internal/gtk/swtgtk_pre320.css";
 			} else {
 				resourcePath = "/org/eclipse/swt/internal/gtk/swtgtk_320.css";
@@ -699,8 +699,8 @@ protected void init () {
 					Device.class.getResourceAsStream(resourcePath)))) {
 				String css = buffer.lines().collect(Collectors.joining("\n"));
 				String fullCSS = css + userCSS;
-				OS.gtk_style_context_add_provider_for_screen (screen, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-				OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (fullCSS, true), -1, null);
+				GTK.gtk_style_context_add_provider_for_screen (screen, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+				GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (fullCSS, true), -1, null);
 			} catch (IOException e) {
 				//Resource was not loaded thus no modifications to the gtk theme will be applied
 			}
@@ -854,7 +854,7 @@ static synchronized void register (Device device) {
  * @see #destroy
  */
 protected void release () {
-	if (shellHandle != 0) OS.gtk_widget_destroy(shellHandle);
+	if (shellHandle != 0) GTK.gtk_widget_destroy(shellHandle);
 	shellHandle = 0;
 
 	/* Dispose the default font */
@@ -862,7 +862,7 @@ protected void release () {
 	systemFont = null;
 
 	if (gdkColors != null) {
-		if (!OS.GTK3) {
+		if (!GTK.GTK3) {
 			long /*int*/ colormap = OS.gdk_colormap_get_system();
 			for (int i = 0; i < gdkColors.length; i++) {
 				GdkColor color = gdkColors [i];
@@ -1017,7 +1017,7 @@ protected int getDeviceZoom() {
 	long /*int*/ screen = OS.gdk_screen_get_default();
 	int dpi = (int) OS.gdk_screen_get_resolution (screen);
 	if (dpi <= 0) dpi = 96; // gdk_screen_get_resolution returns -1 in case of error
-	if (OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		int monitor_num = OS.gdk_screen_get_monitor_at_point (screen, 0, 0);
 		int scale = OS.gdk_screen_get_monitor_scale_factor (screen, monitor_num);
 		dpi = dpi * scale;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index a1820d473b..0f718ffc9a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -248,7 +248,7 @@ void checkGC (int mask) {
 		GdkRGBA colorRGBA = null;
 		Pattern pattern;
 		if ((state & FOREGROUND) != 0) {
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				colorRGBA = data.foregroundRGBA;
 			} else {
 				color = data.foreground;
@@ -256,7 +256,7 @@ void checkGC (int mask) {
 			pattern = data.foregroundPattern;
 			data.state &= ~BACKGROUND;
 		} else {
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				colorRGBA = data.backgroundRGBA;
 			} else {
 				color = data.background;
@@ -277,7 +277,7 @@ void checkGC (int mask) {
 				Cairo.cairo_set_source(cairo, pattern.handle);
 			}
 		} else {
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				Cairo.cairo_set_source_rgba(cairo, colorRGBA.red, colorRGBA.green, colorRGBA.blue, data.alpha / (float)0xFF);
 			} else {
 				Cairo.cairo_set_source_rgba(cairo, (color.red & 0xFFFF) / (float)0xFFFF, (color.green & 0xFFFF) / (float)0xFFFF, (color.blue & 0xFFFF) / (float)0xFFFF, data.alpha / (float)0xFF);
@@ -526,7 +526,7 @@ void copyAreaInPixels(int srcX, int srcY, int width, int height, int destX, int
 		Cairo.cairo_restore(handle);
 		if (paint) {
 			long /*int*/ visibleRegion;
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				visibleRegion = OS.gdk_window_get_visible_region (drawable);
 			} else {
 				visibleRegion = OS.gdk_drawable_get_visible_region (drawable);
@@ -589,7 +589,7 @@ void createLayout() {
 	long /*int*/ layout = OS.pango_layout_new(context);
 	if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 	data.layout = layout;
-	OS.pango_context_set_language(context, OS.gtk_get_default_language());
+	OS.pango_context_set_language(context, GTK.gtk_get_default_language());
 	OS.pango_context_set_base_dir(context, (data.style & SWT.MIRRORED) != 0 ? OS.PANGO_DIRECTION_RTL : OS.PANGO_DIRECTION_LTR);
 	OS.pango_layout_set_auto_dir(layout, false);
 }
@@ -724,12 +724,12 @@ public void drawFocus(int x, int y, int width, int height) {
 void drawFocusInPixels(int x, int y, int width, int height) {
 	long /*int*/ cairo = data.cairo;
 	checkGC(FOREGROUND);
-	if (OS.GTK3) {
-		long /*int*/  context = OS.gtk_widget_get_style_context(data.device.shellHandle);
-		OS.gtk_render_focus(context, cairo, x, y, width, height);
+	if (GTK.GTK3) {
+		long /*int*/  context = GTK.gtk_widget_get_style_context(data.device.shellHandle);
+		GTK.gtk_render_focus(context, cairo, x, y, width, height);
 	} else {
 		int[] lineWidth = new int[1];
-		OS.gtk_widget_style_get(data.device.shellHandle, OS.focus_line_width, lineWidth, 0);
+		GTK.gtk_widget_style_get(data.device.shellHandle, OS.focus_line_width, lineWidth, 0);
 		Cairo.cairo_save(cairo);
 		Cairo.cairo_set_line_width(cairo, lineWidth[0]);
 		double[] dashes = new double[]{1, 1};
@@ -1925,7 +1925,7 @@ public int getAntialias() {
  */
 public Color getBackground() {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return Color.gtk_new(data.device, data.backgroundRGBA);
 	} else {
 		return Color.gtk_new(data.device, data.background);
@@ -2169,7 +2169,7 @@ public FontMetrics getFontMetrics() {
  */
 public Color getForeground() {
 	if (handle == 0) SWT.error(SWT.ERROR_WIDGET_DISPOSED);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return Color.gtk_new(data.device, data.foregroundRGBA);
 	} else {
 		return Color.gtk_new(data.device, data.foreground);
@@ -2528,7 +2528,7 @@ double[] identity() {
 }
 
 void init(Drawable drawable, GCData data, long /*int*/ gdkGC) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		if (data.foregroundRGBA != null) data.state &= ~FOREGROUND;
 		if (data.backgroundRGBA != null) data.state &= ~(BACKGROUND | BACKGROUND_BG);
 	} else {
@@ -2764,7 +2764,7 @@ public void setBackground(Color color) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	if (color == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	if (color.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		data.backgroundRGBA = color.handleRGBA;
 	} else {
 		data.background = color.handle;
@@ -2835,7 +2835,7 @@ static void setCairoRegion(long /*int*/ cairo, long /*int*/ rgn) {
 }
 
 static void setCairoPatternColor(long /*int*/ pattern, int offset, Color c, int alpha) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA rgba = c.handleRGBA;
 		Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, rgba.red, rgba.green, rgba.blue, alpha / 255f);
 	} else {
@@ -2850,7 +2850,7 @@ static void setCairoPatternColor(long /*int*/ pattern, int offset, Color c, int
 
 void setCairoClip(long /*int*/ damageRgn, long /*int*/ clipRgn) {
 	long /*int*/ cairo = data.cairo;
-	if (data.drawable != 0 && !OS.GTK3) {
+	if (data.drawable != 0 && !GTK.GTK3) {
 		OS.gdk_cairo_reset_clip(cairo, data.drawable);
 	} else {
 		Cairo.cairo_reset_clip(cairo);
@@ -2987,7 +2987,7 @@ public void setClipping(Rectangle rect) {
 	setClippingInPixels(DPIUtil.autoScaleUp(drawable, rect));
 }
 void setClippingInPixels(Rectangle rect) {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 9, 0) && (drawable instanceof Tree || drawable instanceof Table)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 9, 0) && (drawable instanceof Tree || drawable instanceof Table)) {
 		return; //FIXME: This is an atrocious hack for bug 446075
 	}
 	if (rect == null) {
@@ -3090,7 +3090,7 @@ public void setForeground(Color color) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	if (color == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	if (color.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		data.foregroundRGBA = color.handleRGBA;
 	} else {
 		data.foreground = color.handle;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
index ee212f88b1..b64516bccf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
@@ -906,7 +906,7 @@ void createMask() {
 void createSurface() {
 	if (surface != 0) return;
 	/* There is no pixmaps in GTK 3. */
-	if (OS.GTK3) return;
+	if (GTK.GTK3) return;
 	/* Generate the mask if necessary. */
 	if (transparentPixel != -1) createMask();
 	int[] w = new int[1], h = new int[1];
@@ -1313,7 +1313,7 @@ public ImageData getImageData (int zoom) {
 public static Image gtk_new(Device device, int type, long /*int*/ imageHandle, long /*int*/ mask) {
 	Image image = new Image(device);
 	image.type = type;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		image.surface = imageHandle;
 	} else {
 		image.pixmap = imageHandle;
@@ -1556,7 +1556,7 @@ public long /*int*/ internal_new_GC (GCData data) {
 		}
 		data.device = device;
 		data.drawable = pixmap;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			data.foregroundRGBA = device.COLOR_BLACK.handleRGBA;
 			data.backgroundRGBA = device.COLOR_WHITE.handleRGBA;
 		} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
index 4b6e668f93..f2a15a1ba8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
@@ -92,7 +92,7 @@ Region(Device device, long /*int*/ handle) {
 }
 
 static long /*int*/ gdk_region_polygon(int[] pointArray, int npoints, int fill_rule) {
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		return OS.gdk_region_polygon(pointArray, npoints, fill_rule);
 	}
 	//TODO this does not perform well and could fail if the polygon is too big
@@ -130,7 +130,7 @@ static long /*int*/ gdk_region_polygon(int[] pointArray, int npoints, int fill_r
 }
 
 static void gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles) {
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		OS.gdk_region_get_rectangles (region, rectangles, n_rectangles);
 		return;
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
index b790a26176..1f081ef238 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
@@ -80,7 +80,7 @@ public TextLayout (Device device) {
 	device = this.device;
 	context = OS.gdk_pango_context_get();
 	if (context == 0) SWT.error(SWT.ERROR_NO_HANDLES);
-	OS.pango_context_set_language(context, OS.gtk_get_default_language());
+	OS.pango_context_set_language(context, GTK.gtk_get_default_language());
 	OS.pango_context_set_base_dir(context, OS.PANGO_DIRECTION_LTR);
 	layout = OS.pango_layout_new(context);
 	if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -218,7 +218,7 @@ void computeRuns () {
 					if (style.foreground == null) {
 						// Bug 497071: use COLOR_LINK_FOREGROUND for StyledText links
 						long /*int*/ attr;
-						if (OS.GTK3) {
+						if (GTK.GTK3) {
 							GdkRGBA linkRGBA = device.getSystemColor(SWT.COLOR_LINK_FOREGROUND).handleRGBA;
 							// Manual conversion since PangoAttrColor is a special case.
 							// It uses GdkColor style colors but is supported on GTK3.
@@ -246,7 +246,7 @@ void computeRuns () {
 			OS.pango_attr_list_insert(attrList, attr);
 			OS.pango_attr_list_insert(selAttrList, OS.pango_attribute_copy(attr));
 			if (style.underlineColor != null) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					GdkRGBA rgba = style.underlineColor.handleRGBA;
 					attr = OS.pango_attr_underline_color_new((short)(rgba.red * 0xFFFF),
 							(short)(rgba.green * 0xFFFF), (short)(rgba.blue * 0xFFFF));
@@ -273,7 +273,7 @@ void computeRuns () {
 			OS.pango_attr_list_insert(attrList, attr);
 			OS.pango_attr_list_insert(selAttrList, OS.pango_attribute_copy(attr));
 			if (style.strikeoutColor != null) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					GdkRGBA rgba = style.strikeoutColor.handleRGBA;
 					attr = OS.pango_attr_strikethrough_color_new((short)(rgba.red * 0xFFFF),
 							(short)(rgba.green * 0xFFFF), (short)(rgba.blue * 0xFFFF));
@@ -294,7 +294,7 @@ void computeRuns () {
 		Color foreground = style.foreground;
 		if (foreground != null && !foreground.isDisposed()) {
 			long /*int*/ attr;
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				GdkRGBA rgba = foreground.handleRGBA;
 				attr = OS.pango_attr_foreground_new((short)(rgba.red * 0xFFFF),
 						(short)(rgba.green * 0xFFFF), (short)(rgba.blue * 0xFFFF));
@@ -311,7 +311,7 @@ void computeRuns () {
 		Color background = style.background;
 		if (background != null && !background.isDisposed()) {
 			long /*int*/ attr;
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				GdkRGBA rgba = background.handleRGBA;
 				attr = OS.pango_attr_background_new((short)(rgba.red * 0xFFFF),
 						(short)(rgba.green * 0xFFFF), (short)(rgba.blue * 0xFFFF));
@@ -500,7 +500,7 @@ void drawInPixels(GC gc, int x, int y, int selectionStart, int selectionEnd, Col
 		long /*int*/ iter = OS.pango_layout_get_iter(layout);
 		if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);
 		Cairo.cairo_save(cairo);
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			GdkRGBA rgba = selectionBackground.handleRGBA;
 			Cairo.cairo_set_source_rgba(cairo, rgba.red, rgba.green, rgba.blue, rgba.alpha);
 		} else {
@@ -618,7 +618,7 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
 	if (rgn != 0) {
 		OS.gdk_cairo_region(cairo, rgn);
 		Cairo.cairo_clip(cairo);
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			Cairo.cairo_set_source_rgba(cairo, bg.handleRGBA.red, bg.handleRGBA.green, bg.handleRGBA.blue, bg.handleRGBA.alpha);
 		} else {
 			Cairo.cairo_set_source_rgba(cairo, (bg.handle.red & 0xFFFF) / (float)0xFFFF, (bg.handle.green & 0xFFFF) / (float)0xFFFF, (bg.handle.blue & 0xFFFF) / (float)0xFFFF, data.alpha / (float)0xFF);
@@ -626,7 +626,7 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
 		Cairo.cairo_paint(cairo);
 		OS.gdk_region_destroy(rgn);
 	}
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		Cairo.cairo_set_source_rgba(cairo, fg.handleRGBA.red, fg.handleRGBA.green, fg.handleRGBA.blue, fg.handleRGBA.alpha);
 	} else {
 		Cairo.cairo_set_source_rgba(cairo, (fg.handle.red & 0xFFFF) / (float)0xFFFF, (fg.handle.green & 0xFFFF) / (float)0xFFFF, (fg.handle.blue & 0xFFFF) / (float)0xFFFF, data.alpha / (float)0xFF);
@@ -669,7 +669,7 @@ void drawBorder(GC gc, int x, int y, Color selectionColor) {
 				GdkRectangle rect = new GdkRectangle();
 				GdkRGBA colorRGBA = null;
 				GdkColor color = null;
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					if (colorRGBA == null && style.borderColor != null) colorRGBA = style.borderColor.handleRGBA;
 					if (colorRGBA == null && selectionColor != null) colorRGBA = selectionColor.handleRGBA;
 					if (colorRGBA == null && style.foreground != null) colorRGBA = style.foreground.handleRGBA;
@@ -687,7 +687,7 @@ void drawBorder(GC gc, int x, int y, Color selectionColor) {
 					case SWT.BORDER_DASH: dashes = width != 0 ? GC.LINE_DASH : GC.LINE_DASH_ZERO; break;
 					case SWT.BORDER_DOT: dashes = width != 0 ? GC.LINE_DOT : GC.LINE_DOT_ZERO; break;
 				}
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					Cairo.cairo_set_source_rgba(cairo, colorRGBA.red, colorRGBA.green, colorRGBA.blue, colorRGBA.alpha);
 				} else {
 					Cairo.cairo_set_source_rgba(cairo, (color.red & 0xFFFF) / (float)0xFFFF, (color.green & 0xFFFF) / (float)0xFFFF, (color.blue & 0xFFFF) / (float)0xFFFF, data.alpha / (float)0xFF);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
index 267b3730d8..54c75f285f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
@@ -115,10 +115,10 @@ static int checkStyle (int style) {
 static GtkBorder getBorder (byte[] border, long /*int*/ handle, int defaultBorder) {
     GtkBorder gtkBorder = new GtkBorder();
     long /*int*/ []  borderPtr = new long /*int*/ [1];
-    OS.gtk_widget_style_get (handle, border, borderPtr,0);
+    GTK.gtk_widget_style_get (handle, border, borderPtr,0);
     if (borderPtr[0] != 0) {
         OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
-        OS.gtk_border_free(borderPtr[0]);
+        GTK.gtk_border_free(borderPtr[0]);
         return gtkBorder;
     }
     gtkBorder.left = defaultBorder;
@@ -130,7 +130,7 @@ static GtkBorder getBorder (byte[] border, long /*int*/ handle, int defaultBorde
 
 @Override
 GdkRGBA getContextBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (background != null && (state & BACKGROUND) != 0) {
 		return background;
 	}
@@ -183,9 +183,9 @@ void connectPaint () {
 	 * This causes issues when setting a background color, as whatever
 	 * is drawn on the Button is not re-drawn. See bug 483791.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION (3, 9, 0) && boxHandle != 0) {
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 9, 0) && boxHandle != 0) {
 		int paintMask = OS.GDK_EXPOSURE_MASK;
-		OS.gtk_widget_add_events (boxHandle, paintMask);
+		GTK.gtk_widget_add_events (boxHandle, paintMask);
 
 		OS.g_signal_connect_closure_by_id (boxHandle, display.signalIds [DRAW], 0, display.getClosure (EXPOSE_EVENT_INVERSE), false);
 		OS.g_signal_connect_closure_by_id (boxHandle, display.signalIds [DRAW], 0, display.getClosure (DRAW), true);
@@ -210,24 +210,24 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	if ((style & (SWT.CHECK | SWT.RADIO)) != 0) {
 		reqWidth = new int [1];
 		reqHeight = new int [1];
-		OS.gtk_widget_get_size_request (boxHandle, reqWidth, reqHeight);
-		OS.gtk_widget_set_size_request (boxHandle, -1, -1);
+		GTK.gtk_widget_get_size_request (boxHandle, reqWidth, reqHeight);
+		GTK.gtk_widget_set_size_request (boxHandle, -1, -1);
 	}
 	Point size;
-	boolean wrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && OS.gtk_widget_get_visible (labelHandle);
+	boolean wrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && GTK.gtk_widget_get_visible (labelHandle);
 	if (wrap) {
-		int borderWidth = OS.gtk_container_get_border_width (handle);
+		int borderWidth = GTK.gtk_container_get_border_width (handle);
 		int[] focusWidth = new int[1];
-		OS.gtk_widget_style_get (handle, OS.focus_line_width, focusWidth, 0);
+		GTK.gtk_widget_style_get (handle, OS.focus_line_width, focusWidth, 0);
 		int[] focusPadding = new int[1];
-		OS.gtk_widget_style_get (handle, OS.focus_padding, focusPadding, 0);
+		GTK.gtk_widget_style_get (handle, OS.focus_padding, focusPadding, 0);
 		int trimWidth = 2 * (borderWidth + focusWidth [0] + focusPadding [0]), trimHeight = trimWidth;
 		int indicatorHeight = 0;
 		if ((style & (SWT.CHECK | SWT.RADIO)) != 0) {
 			int[] indicatorSize = new int[1];
-			OS.gtk_widget_style_get (handle, OS.indicator_size, indicatorSize, 0);
+			GTK.gtk_widget_style_get (handle, OS.indicator_size, indicatorSize, 0);
 			int[] indicatorSpacing = new int[1];
-			OS.gtk_widget_style_get (handle, OS.indicator_spacing, indicatorSpacing, 0);
+			GTK.gtk_widget_style_get (handle, OS.indicator_spacing, indicatorSpacing, 0);
 			indicatorHeight = indicatorSize [0] + 2 * indicatorSpacing [0];
 			trimWidth += indicatorHeight + indicatorSpacing [0];
 		} else {
@@ -237,14 +237,14 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 			GtkBorder innerBorder = getBorder (OS.inner_border, handle, INNER_BORDER);
 			trimWidth += innerBorder.left + innerBorder.right;
 			trimHeight += innerBorder.top + innerBorder.bottom;
-			if (OS.gtk_widget_get_can_default (handle)) {
+			if (GTK.gtk_widget_get_can_default (handle)) {
 				GtkBorder defaultBorder = getBorder (OS.default_border, handle, DEFAULT_BORDER);
 				trimWidth += defaultBorder.left + defaultBorder.right;
 				trimHeight += defaultBorder.top + defaultBorder.bottom;
 			}
 		}
 		int imageWidth = 0, imageHeight = 0;
-		if (OS.gtk_widget_get_visible (imageHandle)) {
+		if (GTK.gtk_widget_get_visible (imageHandle)) {
 			GtkRequisition requisition = new GtkRequisition ();
 			gtk_widget_get_preferred_size (imageHandle, requisition);
 			imageWidth = requisition.width;
@@ -253,7 +253,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 			OS.g_object_get (boxHandle, OS.spacing, spacing, 0);
 			imageWidth += spacing [0];
 		}
-		long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
+		long /*int*/ labelLayout = GTK.gtk_label_get_layout (labelHandle);
 		int pangoWidth = OS.pango_layout_get_width (labelLayout);
 		if (wHint != SWT.DEFAULT) {
 			OS.pango_layout_set_width (labelLayout, Math.max (1, (wHint - imageWidth - trimWidth)) * OS.PANGO_SCALE);
@@ -270,10 +270,10 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 		size = computeNativeSize (handle, wHint, hHint, changed);
 	}
 	if ((style & (SWT.CHECK | SWT.RADIO)) != 0) {
-		OS.gtk_widget_set_size_request (boxHandle, reqWidth [0], reqHeight [0]);
+		GTK.gtk_widget_set_size_request (boxHandle, reqWidth [0], reqHeight [0]);
 	}
 	if (wHint != SWT.DEFAULT || hHint != SWT.DEFAULT) {
-		if (OS.gtk_widget_get_can_default (handle)) {
+		if (GTK.gtk_widget_get_can_default (handle)) {
 			GtkBorder border = getBorder (OS.default_border, handle, DEFAULT_BORDER);
 			if (wHint != SWT.DEFAULT) size.x += border.left + border.right;
 			if (hHint != SWT.DEFAULT) size.y += border.top + border.bottom;
@@ -289,35 +289,35 @@ void createHandle (int index) {
 	int bits = SWT.ARROW | SWT.TOGGLE | SWT.CHECK | SWT.RADIO | SWT.PUSH;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
 	switch (style & bits) {
 		case SWT.ARROW:
-			if (OS.GTK3) {
-				byte arrowType [] = OS.GTK_NAMED_ICON_GO_UP;
-				if ((style & SWT.UP) != 0) arrowType = OS.GTK_NAMED_ICON_GO_UP;
-				if ((style & SWT.DOWN) != 0) arrowType = OS.GTK_NAMED_ICON_GO_DOWN;
-				if ((style & SWT.LEFT) != 0) arrowType = OS.GTK_NAMED_ICON_GO_PREVIOUS;
-				if ((style & SWT.RIGHT) != 0) arrowType = OS.GTK_NAMED_ICON_GO_NEXT;
-				arrowHandle = OS.gtk_image_new_from_icon_name (arrowType, OS.GTK_ICON_SIZE_MENU);
+			if (GTK.GTK3) {
+				byte arrowType [] = GTK.GTK_NAMED_ICON_GO_UP;
+				if ((style & SWT.UP) != 0) arrowType = GTK.GTK_NAMED_ICON_GO_UP;
+				if ((style & SWT.DOWN) != 0) arrowType = GTK.GTK_NAMED_ICON_GO_DOWN;
+				if ((style & SWT.LEFT) != 0) arrowType = GTK.GTK_NAMED_ICON_GO_PREVIOUS;
+				if ((style & SWT.RIGHT) != 0) arrowType = GTK.GTK_NAMED_ICON_GO_NEXT;
+				arrowHandle = GTK.gtk_image_new_from_icon_name (arrowType, GTK.GTK_ICON_SIZE_MENU);
 			} else { //GTK2
-				int arrowType = OS.GTK_ARROW_UP;
-				if ((style & SWT.UP) != 0) arrowType = OS.GTK_ARROW_UP;
-				if ((style & SWT.DOWN) != 0) arrowType = OS.GTK_ARROW_DOWN;
-	            if ((style & SWT.LEFT) != 0) arrowType = OS.GTK_ARROW_LEFT;
-	            if ((style & SWT.RIGHT) != 0) arrowType = OS.GTK_ARROW_RIGHT;
-	            arrowHandle = OS.gtk_arrow_new (arrowType, OS.GTK_SHADOW_OUT);
+				int arrowType = GTK.GTK_ARROW_UP;
+				if ((style & SWT.UP) != 0) arrowType = GTK.GTK_ARROW_UP;
+				if ((style & SWT.DOWN) != 0) arrowType = GTK.GTK_ARROW_DOWN;
+	            if ((style & SWT.LEFT) != 0) arrowType = GTK.GTK_ARROW_LEFT;
+	            if ((style & SWT.RIGHT) != 0) arrowType = GTK.GTK_ARROW_RIGHT;
+	            arrowHandle = GTK.gtk_arrow_new (arrowType, GTK.GTK_SHADOW_OUT);
 			}
 			if (arrowHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
-			handle = OS.gtk_button_new ();
+			handle = GTK.gtk_button_new ();
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			break;
 		case SWT.TOGGLE:
-			handle = OS.gtk_toggle_button_new ();
+			handle = GTK.gtk_toggle_button_new ();
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			break;
 		case SWT.CHECK:
-			handle = OS.gtk_check_button_new ();
+			handle = GTK.gtk_check_button_new ();
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			break;
 		case SWT.RADIO:
@@ -332,49 +332,49 @@ void createHandle (int index) {
 			* to the same group.  This allows the visible button to be
 			* unselected.
 			*/
-			groupHandle = OS.gtk_radio_button_new (0);
+			groupHandle = GTK.gtk_radio_button_new (0);
 			if (groupHandle == 0) error (SWT.ERROR_NO_HANDLES);
 			OS.g_object_ref (groupHandle);
 			OS.g_object_ref_sink (groupHandle);
-			handle = OS.gtk_radio_button_new (OS.gtk_radio_button_get_group (groupHandle));
+			handle = GTK.gtk_radio_button_new (GTK.gtk_radio_button_get_group (groupHandle));
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			break;
 		case SWT.PUSH:
 		default:
-			handle = OS.gtk_button_new ();
+			handle = GTK.gtk_button_new ();
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-			OS.gtk_widget_set_can_default (handle, true);
+			GTK.gtk_widget_set_can_default (handle, true);
 			break;
 	}
 	if ((style & SWT.ARROW) != 0) {
 		// Use gtk_button_set_image() on GTK3 to prevent icons from being
 		// trimmed with smaller sized buttons; see bug 528284.
-		if (OS.GTK3) {
-			OS.gtk_button_set_image(handle, arrowHandle);
+		if (GTK.GTK3) {
+			GTK.gtk_button_set_image(handle, arrowHandle);
 		} else {
-			OS.gtk_container_add (handle, arrowHandle);
+			GTK.gtk_container_add (handle, arrowHandle);
 		}
 	} else {
-		boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 4);
+		boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 4);
 		if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		labelHandle = OS.gtk_label_new_with_mnemonic (null);
+		labelHandle = GTK.gtk_label_new_with_mnemonic (null);
 		if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		imageHandle = OS.gtk_image_new ();
+		imageHandle = GTK.gtk_image_new ();
 		if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (handle, boxHandle);
-		OS.gtk_container_add (boxHandle, imageHandle);
-		OS.gtk_container_add (boxHandle, labelHandle);
+		GTK.gtk_container_add (handle, boxHandle);
+		GTK.gtk_container_add (boxHandle, imageHandle);
+		GTK.gtk_container_add (boxHandle, labelHandle);
 		if ((style & SWT.WRAP) != 0) {
-			OS.gtk_label_set_line_wrap (labelHandle, true);
-			OS.gtk_label_set_line_wrap_mode (labelHandle, OS.PANGO_WRAP_WORD_CHAR);
+			GTK.gtk_label_set_line_wrap (labelHandle, true);
+			GTK.gtk_label_set_line_wrap_mode (labelHandle, OS.PANGO_WRAP_WORD_CHAR);
 		}
 	}
-	OS.gtk_container_add (fixedHandle, handle);
+	GTK.gtk_container_add (fixedHandle, handle);
 
 	if ((style & SWT.ARROW) != 0) return;
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont().handle);
 	}
 	_setAlignment (style & (SWT.LEFT | SWT.CENTER | SWT.RIGHT));
@@ -492,7 +492,7 @@ String getNameText () {
 public boolean getSelection () {
 	checkWidget ();
 	if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) == 0) return false;
-	return OS.gtk_toggle_button_get_active (handle);
+	return GTK.gtk_toggle_button_get_active (handle);
 }
 
 /**
@@ -532,10 +532,10 @@ long /*int*/ gtk_clicked (long /*int*/ widget) {
 	} else {
 		if ((style & SWT.CHECK) != 0) {
 			if (grayed) {
-				if (OS.gtk_toggle_button_get_active (handle)) {
-					OS.gtk_toggle_button_set_inconsistent (handle, true);
+				if (GTK.gtk_toggle_button_get_active (handle)) {
+					GTK.gtk_toggle_button_set_inconsistent (handle, true);
 				} else {
-					OS.gtk_toggle_button_set_inconsistent (handle, false);
+					GTK.gtk_toggle_button_set_inconsistent (handle, false);
 				}
 			}
 		}
@@ -549,7 +549,7 @@ long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
 	long /*int*/ result = super.gtk_focus_in_event (widget, event);
 	// widget could be disposed at this point
 	if (handle == 0) return 0;
-	if ((style & SWT.PUSH) != 0 && OS.gtk_widget_has_default (handle)) {
+	if ((style & SWT.PUSH) != 0 && GTK.gtk_widget_has_default (handle)) {
 		Decorations menuShell = menuShell ();
 		menuShell.defaultButton = this;
 	}
@@ -666,9 +666,9 @@ void resizeHandle (int width, int height) {
 	* alignment to fail. The fix is to set the child size to the size
 	* of the button.
 	*/
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		if ((style & (SWT.CHECK | SWT.RADIO)) != 0) {
-			OS.gtk_widget_set_size_request (boxHandle, width, -1);
+			GTK.gtk_widget_set_size_request (boxHandle, width, -1);
 		}
 	}
 }
@@ -725,24 +725,24 @@ void _setAlignment (int alignment) {
 		style &= ~(SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT);
 		style |= alignment & (SWT.UP | SWT.DOWN | SWT.LEFT | SWT.RIGHT);
 		boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
-		if (OS.GTK3) {
-			byte arrowType [] = OS.GTK_NAMED_ICON_GO_UP;
+		if (GTK.GTK3) {
+			byte arrowType [] = GTK.GTK_NAMED_ICON_GO_UP;
 			switch (alignment) {
-				case SWT.UP: arrowType = OS.GTK_NAMED_ICON_GO_UP; break;
-				case SWT.DOWN: arrowType = OS.GTK_NAMED_ICON_GO_DOWN; break;
-				case SWT.LEFT: arrowType = isRTL ? OS.GTK_NAMED_ICON_GO_NEXT : OS.GTK_NAMED_ICON_GO_PREVIOUS; break;
-				case SWT.RIGHT: arrowType = isRTL ? OS.GTK_NAMED_ICON_GO_PREVIOUS : OS.GTK_NAMED_ICON_GO_NEXT; break;
+				case SWT.UP: arrowType = GTK.GTK_NAMED_ICON_GO_UP; break;
+				case SWT.DOWN: arrowType = GTK.GTK_NAMED_ICON_GO_DOWN; break;
+				case SWT.LEFT: arrowType = isRTL ? GTK.GTK_NAMED_ICON_GO_NEXT : GTK.GTK_NAMED_ICON_GO_PREVIOUS; break;
+				case SWT.RIGHT: arrowType = isRTL ? GTK.GTK_NAMED_ICON_GO_PREVIOUS : GTK.GTK_NAMED_ICON_GO_NEXT; break;
 			}
-			OS.gtk_image_set_from_icon_name (arrowHandle, arrowType, OS.GTK_ICON_SIZE_MENU);
+			GTK.gtk_image_set_from_icon_name (arrowHandle, arrowType, GTK.GTK_ICON_SIZE_MENU);
 		} else { //GTK2
-			int arrowType = OS.GTK_ARROW_UP;
+			int arrowType = GTK.GTK_ARROW_UP;
 			switch (alignment) {
-				case SWT.UP: arrowType = OS.GTK_ARROW_UP; break;
-				case SWT.DOWN: arrowType = OS.GTK_ARROW_DOWN; break;
-				case SWT.LEFT: arrowType = isRTL ? OS.GTK_ARROW_RIGHT : OS.GTK_ARROW_LEFT; break;
-				case SWT.RIGHT: arrowType = isRTL ? OS.GTK_ARROW_LEFT : OS.GTK_ARROW_RIGHT; break;
+				case SWT.UP: arrowType = GTK.GTK_ARROW_UP; break;
+				case SWT.DOWN: arrowType = GTK.GTK_ARROW_DOWN; break;
+				case SWT.LEFT: arrowType = isRTL ? GTK.GTK_ARROW_RIGHT : GTK.GTK_ARROW_LEFT; break;
+				case SWT.RIGHT: arrowType = isRTL ? GTK.GTK_ARROW_LEFT : GTK.GTK_ARROW_RIGHT; break;
 			}
-			OS.gtk_arrow_set (arrowHandle, arrowType, OS.GTK_SHADOW_OUT);
+			GTK.gtk_arrow_set (arrowHandle, arrowType, GTK.GTK_SHADOW_OUT);
 		}
 		return;
 	}
@@ -750,94 +750,94 @@ void _setAlignment (int alignment) {
 	style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER);
 	style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER);
 	/* Alignment not honoured when image and text are visible */
-	boolean bothVisible = OS.gtk_widget_get_visible (labelHandle) && OS.gtk_widget_get_visible (imageHandle);
+	boolean bothVisible = GTK.gtk_widget_get_visible (labelHandle) && GTK.gtk_widget_get_visible (imageHandle);
 	if (bothVisible) {
 		if ((style & (SWT.RADIO | SWT.CHECK)) != 0) alignment = SWT.LEFT;
 		if ((style & (SWT.PUSH | SWT.TOGGLE)) != 0) alignment = SWT.CENTER;
 	}
 	if ((alignment & SWT.LEFT) != 0) {
 		if (bothVisible) {
-			OS.gtk_box_set_child_packing (boxHandle, labelHandle, false, false, 0, OS.GTK_PACK_START);
-			OS.gtk_box_set_child_packing (boxHandle, imageHandle, false, false, 0, OS.GTK_PACK_START);
+			GTK.gtk_box_set_child_packing (boxHandle, labelHandle, false, false, 0, GTK.GTK_PACK_START);
+			GTK.gtk_box_set_child_packing (boxHandle, imageHandle, false, false, 0, GTK.GTK_PACK_START);
 		} else {
-			if (OS.GTK3) {
-				OS.gtk_box_set_child_packing (boxHandle, labelHandle, true, true, 0, OS.GTK_PACK_END);
-				OS.gtk_box_set_child_packing (boxHandle, imageHandle, true, true, 0, OS.GTK_PACK_START);
+			if (GTK.GTK3) {
+				GTK.gtk_box_set_child_packing (boxHandle, labelHandle, true, true, 0, GTK.GTK_PACK_END);
+				GTK.gtk_box_set_child_packing (boxHandle, imageHandle, true, true, 0, GTK.GTK_PACK_START);
 			}
 		}
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
 			gtk_label_set_align(labelHandle,0.0f,0.5f);
-			gtk_widget_set_align(imageHandle,OS.GTK_ALIGN_START, OS.GTK_ALIGN_CENTER);
+			gtk_widget_set_align(imageHandle,GTK.GTK_ALIGN_START, GTK.GTK_ALIGN_CENTER);
 		} else {
-			OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.5f);
-			OS.gtk_misc_set_alignment (imageHandle, 0.0f, 0.5f);
+			GTK.gtk_misc_set_alignment (labelHandle, 0.0f, 0.5f);
+			GTK.gtk_misc_set_alignment (imageHandle, 0.0f, 0.5f);
 		}
 
-		OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_LEFT);
+		GTK.gtk_label_set_justify (labelHandle, GTK.GTK_JUSTIFY_LEFT);
 		return;
 	}
 	if ((alignment & SWT.CENTER) != 0) {
 		if (bothVisible) {
-			OS.gtk_box_set_child_packing (boxHandle, labelHandle, true, true, 0, OS.GTK_PACK_END);
-			OS.gtk_box_set_child_packing (boxHandle, imageHandle, true, true, 0, OS.GTK_PACK_START);
+			GTK.gtk_box_set_child_packing (boxHandle, labelHandle, true, true, 0, GTK.GTK_PACK_END);
+			GTK.gtk_box_set_child_packing (boxHandle, imageHandle, true, true, 0, GTK.GTK_PACK_START);
 
-			if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0))  {
+			if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0))  {
 				gtk_label_set_align(labelHandle,0.0f,0.5f);
-				gtk_widget_set_align(imageHandle,OS.GTK_ALIGN_END, OS.GTK_ALIGN_CENTER);
+				gtk_widget_set_align(imageHandle,GTK.GTK_ALIGN_END, GTK.GTK_ALIGN_CENTER);
 			} else  {
-				OS.gtk_misc_set_alignment (labelHandle, 0f, 0.5f);
-				OS.gtk_misc_set_alignment (imageHandle, 1f, 0.5f);
+				GTK.gtk_misc_set_alignment (labelHandle, 0f, 0.5f);
+				GTK.gtk_misc_set_alignment (imageHandle, 1f, 0.5f);
 			}
 
 		} else {
-			if (OS.GTK3) {
-				OS.gtk_box_set_child_packing (boxHandle, labelHandle, true, true, 0, OS.GTK_PACK_END);
-				OS.gtk_box_set_child_packing (boxHandle, imageHandle, true, true, 0, OS.GTK_PACK_START);
+			if (GTK.GTK3) {
+				GTK.gtk_box_set_child_packing (boxHandle, labelHandle, true, true, 0, GTK.GTK_PACK_END);
+				GTK.gtk_box_set_child_packing (boxHandle, imageHandle, true, true, 0, GTK.GTK_PACK_START);
 			}
 
-			if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0))  {
+			if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0))  {
 				gtk_label_set_align(labelHandle,0.5f,0.5f);
-				gtk_widget_set_align(imageHandle,OS.GTK_ALIGN_CENTER, OS.GTK_ALIGN_CENTER);
+				gtk_widget_set_align(imageHandle,GTK.GTK_ALIGN_CENTER, GTK.GTK_ALIGN_CENTER);
 			} else {
-				OS.gtk_misc_set_alignment (labelHandle, 0.5f, 0.5f);
-				OS.gtk_misc_set_alignment (imageHandle, 0.5f, 0.5f);
+				GTK.gtk_misc_set_alignment (labelHandle, 0.5f, 0.5f);
+				GTK.gtk_misc_set_alignment (imageHandle, 0.5f, 0.5f);
 			}
-			OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_CENTER);
+			GTK.gtk_label_set_justify (labelHandle, GTK.GTK_JUSTIFY_CENTER);
 		}
 		return;
 	}
 	if ((alignment & SWT.RIGHT) != 0) {
 		if (bothVisible) {
-			OS.gtk_box_set_child_packing (boxHandle, labelHandle, false, false, 0, OS.GTK_PACK_END);
-			OS.gtk_box_set_child_packing (boxHandle, imageHandle, false, false, 0, OS.GTK_PACK_END);
+			GTK.gtk_box_set_child_packing (boxHandle, labelHandle, false, false, 0, GTK.GTK_PACK_END);
+			GTK.gtk_box_set_child_packing (boxHandle, imageHandle, false, false, 0, GTK.GTK_PACK_END);
 		} else {
-			if (OS.GTK3) {
-				OS.gtk_box_set_child_packing (boxHandle, labelHandle, true, true, 0, OS.GTK_PACK_END);
-				OS.gtk_box_set_child_packing (boxHandle, imageHandle, true, true, 0, OS.GTK_PACK_START);
+			if (GTK.GTK3) {
+				GTK.gtk_box_set_child_packing (boxHandle, labelHandle, true, true, 0, GTK.GTK_PACK_END);
+				GTK.gtk_box_set_child_packing (boxHandle, imageHandle, true, true, 0, GTK.GTK_PACK_START);
 			}
 		}
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0))  {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0))  {
 			gtk_label_set_align(labelHandle,1.0f,0.5f);
-			gtk_widget_set_align(imageHandle,OS.GTK_ALIGN_END, OS.GTK_ALIGN_CENTER);
+			gtk_widget_set_align(imageHandle,GTK.GTK_ALIGN_END, GTK.GTK_ALIGN_CENTER);
 		} else {
-			OS.gtk_misc_set_alignment (labelHandle, 1.0f, 0.5f);
-			OS.gtk_misc_set_alignment (imageHandle, 1.0f, 0.5f);
+			GTK.gtk_misc_set_alignment (labelHandle, 1.0f, 0.5f);
+			GTK.gtk_misc_set_alignment (imageHandle, 1.0f, 0.5f);
 		}
-		OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_RIGHT);
+		GTK.gtk_label_set_justify (labelHandle, GTK.GTK_JUSTIFY_RIGHT);
 		return;
 	}
 }
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 
 	background = rgba;
 	//Pre GTK 3.10 doesn't handle CSS background color very well for GTK Check/Radio button.
 	// 3.10.3 as it was the latest to affect theming in button.
-	if (OS.GTK_VERSION < OS.VERSION(3, 10, 3) && (style & (SWT.CHECK | SWT.RADIO)) != 0) {
+	if (GTK.GTK_VERSION < OS.VERSION(3, 10, 3) && (style & (SWT.CHECK | SWT.RADIO)) != 0) {
 		super.setBackgroundGdkRGBA (context, handle, rgba);
 		return;
 	}
@@ -856,7 +856,7 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
 	setBackgroundGdkColor(fixedHandle, color);
 	if (labelHandle != 0) setBackgroundGdkColor(labelHandle, color);
@@ -877,8 +877,8 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	* resized to the preferred size but it still
 	* won't draw properly.
 	*/
-	boolean wrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && OS.gtk_widget_get_visible (labelHandle);
-	if (wrap) OS.gtk_widget_set_size_request (boxHandle, -1, -1);
+	boolean wrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && GTK.gtk_widget_get_visible (labelHandle);
+	if (wrap) GTK.gtk_widget_set_size_request (boxHandle, -1, -1);
 	int result = super.setBounds (x, y, width, height, move, resize);
 	/*
 	* Bug in GTK.  For some reason, when the label is
@@ -893,17 +893,17 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	*/
 	if (wrap) {
 		GtkAllocation allocation = new GtkAllocation();
-		OS.gtk_widget_get_allocation (boxHandle, allocation);
+		GTK.gtk_widget_get_allocation (boxHandle, allocation);
 		int boxWidth = allocation.width;
 		int boxHeight = allocation.height;
-		long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
+		long /*int*/ labelLayout = GTK.gtk_label_get_layout (labelHandle);
 		int pangoWidth = OS.pango_layout_get_width (labelLayout);
 		OS.pango_layout_set_width (labelLayout, -1);
 		int [] w = new int [1], h = new int [1];
 		OS.pango_layout_get_pixel_size (labelLayout, w, h);
 		OS.pango_layout_set_width (labelLayout, pangoWidth);
 		int imageWidth = 0;
-		if (OS.gtk_widget_get_visible (imageHandle)) {
+		if (GTK.gtk_widget_get_visible (imageHandle)) {
 			GtkRequisition requisition = new GtkRequisition ();
 			gtk_widget_get_preferred_size (imageHandle, requisition);
 			imageWidth = requisition.width;
@@ -911,7 +911,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 			OS.g_object_get (boxHandle, OS.spacing, spacing, 0);
 			imageWidth += spacing [0];
 		}
-		OS.gtk_widget_set_size_request (labelHandle, Math.min(w [0], boxWidth - imageWidth), -1);
+		GTK.gtk_widget_set_size_request (labelHandle, Math.min(w [0], boxWidth - imageWidth), -1);
 		/*
 		* Bug in GTK.  Setting the size request should invalidate the label's
 		* layout, but it does not.  The fix is to resize the label directly.
@@ -923,7 +923,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 		Point sizes = resizeCalculationsGTK3(boxHandle, boxWidth, boxHeight);
 		allocation.width = sizes.x;
 		allocation.height = sizes.y;
-		OS.gtk_widget_size_allocate (boxHandle, allocation);
+		GTK.gtk_widget_size_allocate (boxHandle, allocation);
 	}
 	return result;
 }
@@ -947,7 +947,7 @@ boolean setRadioSelection (boolean value) {
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setForegroundGdkRGBA(rgba);
 	setForegroundGdkRGBA (fixedHandle, rgba);
 	if (labelHandle != 0) setForegroundGdkRGBA (labelHandle, rgba);
@@ -959,7 +959,7 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 	 * Giving them a border color that matches the text color ensures consistent visibility
 	 * across most themes. See bug 463733.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION(3, 10, 0) && OS.GTK_VERSION < OS.VERSION (3, 16, 0) &&
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 10, 0) && GTK.GTK_VERSION < OS.VERSION (3, 16, 0) &&
 			(style & (SWT.CHECK | SWT.RADIO)) != 0) {
 		gtk_swt_set_border_color (rgba);
 	}
@@ -967,7 +967,7 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setForegroundGdkColor (color);
 	setForegroundColor (fixedHandle, color);
 	if (labelHandle != 0) setForegroundColor (labelHandle, color);
@@ -976,17 +976,17 @@ void setForegroundGdkColor (GdkColor color) {
 
 @Override
 void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION < OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) {
 		super.setForegroundGdkRGBA(handle, rgba);
 		return;
 	}
 	GdkRGBA toSet = rgba == null ? display.COLOR_WIDGET_FOREGROUND_RGBA : rgba;
-	long /*int*/ context = OS.gtk_widget_get_style_context (handle);
+	long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
 
 	// Form foreground string
 	String color = display.gtk_rgba_to_css_string(toSet);
-	String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
+	String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
 	String css = name + " {color: " + color + ";}";
 
 	// Cache foreground color
@@ -998,7 +998,7 @@ void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
 }
 
 private void gtk_swt_set_border_color (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	String css_string = "* {\n";
 	if (rgba != null) {
 		String css_color = display.gtk_rgba_to_css_string (rgba);
@@ -1007,7 +1007,7 @@ private void gtk_swt_set_border_color (GdkRGBA rgba) {
 	css_string += "}\n";
 
 	String finalCss;
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		// Cache foreground color
 		cssForeground += "\n" + css_string;
 		finalCss = display.gtk_css_create_css_color_string (cssBackground, cssForeground, SWT.FOREGROUND);
@@ -1016,7 +1016,7 @@ private void gtk_swt_set_border_color (GdkRGBA rgba) {
 	}
 
 	// Apply the CSS
-	long /*int*/context = OS.gtk_widget_get_style_context (handle);
+	long /*int*/context = GTK.gtk_widget_get_style_context (handle);
 	gtk_css_provider_load_from_css (context, finalCss);
 }
 
@@ -1038,10 +1038,10 @@ public void setGrayed (boolean grayed) {
 	checkWidget();
 	if ((style & SWT.CHECK) == 0) return;
 	this.grayed = grayed;
-	if (grayed && OS.gtk_toggle_button_get_active (handle)) {
-		OS.gtk_toggle_button_set_inconsistent (handle, true);
+	if (grayed && GTK.gtk_toggle_button_get_active (handle)) {
+		GTK.gtk_toggle_button_set_inconsistent (handle, true);
 	} else {
-		OS.gtk_toggle_button_set_inconsistent (handle, false);
+		GTK.gtk_toggle_button_set_inconsistent (handle, false);
 	}
 }
 
@@ -1087,22 +1087,22 @@ public void setImage (Image image) {
 void setOrientation (boolean create) {
 	super.setOrientation (create);
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		if (boxHandle != 0) OS.gtk_widget_set_direction (boxHandle, dir);
-		if (labelHandle != 0) OS.gtk_widget_set_direction (labelHandle, dir);
-		if (imageHandle != 0) OS.gtk_widget_set_direction (imageHandle, dir);
+		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		if (boxHandle != 0) GTK.gtk_widget_set_direction (boxHandle, dir);
+		if (labelHandle != 0) GTK.gtk_widget_set_direction (labelHandle, dir);
+		if (imageHandle != 0) GTK.gtk_widget_set_direction (imageHandle, dir);
 		if (arrowHandle != 0) {
-			if (OS.GTK3) {
-				byte arrowType [] = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_NAMED_ICON_GO_NEXT : OS.GTK_NAMED_ICON_GO_PREVIOUS;
+			if (GTK.GTK3) {
+				byte arrowType [] = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_NAMED_ICON_GO_NEXT : GTK.GTK_NAMED_ICON_GO_PREVIOUS;
 				switch (style & (SWT.LEFT | SWT.RIGHT)) {
-					case SWT.LEFT: OS.gtk_image_set_from_icon_name (arrowHandle, arrowType, OS.GTK_ICON_SIZE_MENU); break;
-					case SWT.RIGHT: OS.gtk_image_set_from_icon_name (arrowHandle, arrowType, OS.GTK_ICON_SIZE_MENU); break;
+					case SWT.LEFT: GTK.gtk_image_set_from_icon_name (arrowHandle, arrowType, GTK.GTK_ICON_SIZE_MENU); break;
+					case SWT.RIGHT: GTK.gtk_image_set_from_icon_name (arrowHandle, arrowType, GTK.GTK_ICON_SIZE_MENU); break;
 				}
 			} else { //GTK2
-				int arrowDir = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_ARROW_RIGHT : OS.GTK_ARROW_LEFT;
+				int arrowDir = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_ARROW_RIGHT : GTK.GTK_ARROW_LEFT;
 				switch (style & (SWT.LEFT | SWT.RIGHT)) {
-					case SWT.LEFT: OS.gtk_arrow_set (arrowHandle, arrowDir, OS.GTK_SHADOW_OUT); break;
-					case SWT.RIGHT: OS.gtk_arrow_set (arrowHandle, arrowDir, OS.GTK_SHADOW_OUT); break;
+					case SWT.LEFT: GTK.gtk_arrow_set (arrowHandle, arrowDir, GTK.GTK_SHADOW_OUT); break;
+					case SWT.RIGHT: GTK.gtk_arrow_set (arrowHandle, arrowDir, GTK.GTK_SHADOW_OUT); break;
 				}
 
 			}
@@ -1130,15 +1130,15 @@ public void setSelection (boolean selected) {
 	checkWidget();
 	if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) == 0) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CLICKED);
-	OS.gtk_toggle_button_set_active (handle, selected);
+	GTK.gtk_toggle_button_set_active (handle, selected);
 	if ((style & SWT.CHECK) != 0) {
 		if (selected && grayed) {
-			OS.gtk_toggle_button_set_inconsistent (handle, true);
+			GTK.gtk_toggle_button_set_inconsistent (handle, true);
 		} else {
-			OS.gtk_toggle_button_set_inconsistent (handle, false);
+			GTK.gtk_toggle_button_set_inconsistent (handle, false);
 		}
 	}
-	if ((style & SWT.RADIO) != 0) OS.gtk_toggle_button_set_active (groupHandle, !selected);
+	if ((style & SWT.RADIO) != 0) GTK.gtk_toggle_button_set_active (groupHandle, !selected);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CLICKED);
 }
 
@@ -1183,35 +1183,35 @@ public void setText (String string) {
 	text = string;
 	char [] chars = fixMnemonic (string);
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+	GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	updateWidgetsVisibility();
 	_setAlignment (style);
 }
 
 private void updateWidgetsVisibility() {
 	if (text.length() == 0 && image == null) {
-		OS.gtk_widget_hide (boxHandle);
-		OS.gtk_widget_hide (labelHandle);
-		OS.gtk_widget_hide (imageHandle);
+		GTK.gtk_widget_hide (boxHandle);
+		GTK.gtk_widget_hide (labelHandle);
+		GTK.gtk_widget_hide (imageHandle);
 	} else {
-		OS.gtk_widget_show (boxHandle);
+		GTK.gtk_widget_show (boxHandle);
 		if (text.length() == 0)
-			OS.gtk_widget_hide (labelHandle);
+			GTK.gtk_widget_hide (labelHandle);
 		else
-			OS.gtk_widget_show (labelHandle);
+			GTK.gtk_widget_show (labelHandle);
 		if (image == null)
-			OS.gtk_widget_hide (imageHandle);
+			GTK.gtk_widget_hide (imageHandle);
 		else
-			OS.gtk_widget_show (imageHandle);
+			GTK.gtk_widget_show (imageHandle);
 	}
 }
 
 @Override
 void showWidget () {
 	super.showWidget ();
-	if (boxHandle != 0 && ((text != null && text.length() != 0) || image != null)) OS.gtk_widget_show (boxHandle);
-	if (labelHandle != 0  && text != null && text.length() != 0) OS.gtk_widget_show (labelHandle);
-	if (arrowHandle != 0) OS.gtk_widget_show (arrowHandle);
+	if (boxHandle != 0 && ((text != null && text.length() != 0) || image != null)) GTK.gtk_widget_show (boxHandle);
+	if (labelHandle != 0  && text != null && text.length() != 0) GTK.gtk_widget_show (labelHandle);
+	if (arrowHandle != 0) GTK.gtk_widget_show (arrowHandle);
 }
 
 @Override
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
index 2e799db8bb..d65a08e66b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
@@ -169,7 +169,7 @@ long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) {
 long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) {
 	if ((state & OBSCURED) != 0) return 0;
 	long /*int*/ result;
-	if ( OS.GTK_VERSION < OS.VERSION(3, 22, 0)) {
+	if ( GTK.GTK_VERSION < OS.VERSION(3, 22, 0)) {
 		boolean isFocus = caret != null && caret.isFocusCaret ();
 		if (isFocus) caret.killFocus ();
 		 result = super.gtk_draw (widget, cairo);
@@ -334,7 +334,7 @@ void scrollInPixels (int destX, int destY, int x, int y, int width, int height,
 	if (isFocus) caret.killFocus ();
 	long /*int*/ window = paintWindow ();
 	long /*int*/ visibleRegion;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		visibleRegion = OS.gdk_window_get_visible_region (window);
 	} else {
 		visibleRegion = OS.gdk_drawable_get_visible_region (window);
@@ -348,12 +348,12 @@ void scrollInPixels (int destX, int destY, int x, int y, int width, int height,
 	 * location the scrollbars are re-painted when scrolling, causing the
 	 * hopping effect. See bug 480458.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
 		long /*int*/ hBarHandle = 0;
 		long /*int*/ vBarHandle = 0;
-		if (OS.GTK_IS_SCROLLED_WINDOW(scrolledHandle)) {
-			hBarHandle = OS.gtk_scrolled_window_get_hscrollbar (scrolledHandle);
-			vBarHandle = OS.gtk_scrolled_window_get_vscrollbar (scrolledHandle);
+		if (GTK.GTK_IS_SCROLLED_WINDOW(scrolledHandle)) {
+			hBarHandle = GTK.gtk_scrolled_window_get_hscrollbar (scrolledHandle);
+			vBarHandle = GTK.gtk_scrolled_window_get_vscrollbar (scrolledHandle);
 		}
 		GtkRequisition requisition = new GtkRequisition();
 		if (hBarHandle != 0) {
@@ -452,7 +452,7 @@ void scrollInPixels (int destX, int destY, int x, int y, int width, int height,
 	 * Due to overlay drawing of scrollbars current method of scrolling leaves scrollbar and notifiers for them inside the canvas
 	 * after scroll. Fix is to redraw once done.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
 		redraw(false);
 	}
 }
@@ -536,7 +536,7 @@ void updateCaret () {
 	rect.y = caret.y;
 	rect.width = caret.width;
 	rect.height = caret.height;
-	OS.gtk_im_context_set_cursor_location (imHandle, rect);
+	GTK.gtk_im_context_set_cursor_location (imHandle, rect);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
index 406c607e0d..8a699e4947 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
@@ -99,7 +99,7 @@ void createWidget (int index) {
 boolean drawCaret () {
 	if (parent == null) return false;
 	if (parent.isDisposed ()) return false;
-	if (OS.GTK_VERSION < OS.VERSION (3, 22, 0)) {
+	if (GTK.GTK_VERSION < OS.VERSION (3, 22, 0)) {
 		long /*int*/ window = parent.paintWindow ();
 		long /*int*/ cairo = OS.gdk_cairo_create(window);
 		if (cairo == 0) error(SWT.ERROR_NO_HANDLES);
@@ -132,7 +132,7 @@ boolean drawCaret () {
 		Cairo.cairo_destroy(cairo);
 		return true;
 	} else {
-		OS.gtk_widget_queue_draw(parent.handle);
+		GTK.gtk_widget_queue_draw(parent.handle);
 		return true;
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
index 88101b5b67..cd4655d1b1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
@@ -127,38 +127,38 @@ public RGB[] getRGBs() {
 public RGB open () {
 	byte [] buffer = Converter.wcsToMbcs (title, true);
 	long /*int*/ handle = 0;
-	if (OS.GTK_VERSION >= OS.VERSION (3, 4, 0)) {
-		handle = OS.gtk_color_chooser_dialog_new (buffer, parent.topHandle ());
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 4, 0)) {
+		handle = GTK.gtk_color_chooser_dialog_new (buffer, parent.topHandle ());
 	} else {
-		handle = OS.gtk_color_selection_dialog_new (buffer);
+		handle = GTK.gtk_color_selection_dialog_new (buffer);
 	}
 	Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
 	long /*int*/ colorsel = 0;
 	GdkRGBA rgba;
 	GdkColor color;
-	if (OS.GTK_VERSION <= OS.VERSION (3, 4, 0)) {
+	if (GTK.GTK_VERSION <= OS.VERSION (3, 4, 0)) {
 		if (parent != null) {
 			long /*int*/ shellHandle = parent.topHandle ();
-			OS.gtk_window_set_transient_for (handle, shellHandle);
-			long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+			GTK.gtk_window_set_transient_for (handle, shellHandle);
+			long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (shellHandle);
 			if (pixbufs != 0) {
-				OS.gtk_window_set_icon_list (handle, pixbufs);
+				GTK.gtk_window_set_icon_list (handle, pixbufs);
 				OS.g_list_free (pixbufs);
 			}
 		}
-		long /*int*/ group = OS.gtk_window_get_group (0);
-		OS.gtk_window_group_add_window (group, handle);
-		OS.gtk_window_set_modal (handle, true);
+		long /*int*/ group = GTK.gtk_window_get_group (0);
+		GTK.gtk_window_group_add_window (group, handle);
+		GTK.gtk_window_set_modal (handle, true);
 
-		colorsel = OS.gtk_color_selection_dialog_get_color_selection (handle);
+		colorsel = GTK.gtk_color_selection_dialog_get_color_selection (handle);
 		if (rgb != null) {
 			color = new GdkColor ();
 			color.red = (short)((rgb.red & 0xFF) | ((rgb.red & 0xFF) << 8));
 			color.green = (short)((rgb.green & 0xFF) | ((rgb.green & 0xFF) << 8));
 			color.blue = (short)((rgb.blue & 0xFF) | ((rgb.blue & 0xFF) << 8));
-			OS.gtk_color_selection_set_current_color (colorsel, color);
+			GTK.gtk_color_selection_set_current_color (colorsel, color);
 		}
-		OS.gtk_color_selection_set_has_palette (colorsel, true);
+		GTK.gtk_color_selection_set_has_palette (colorsel, true);
 	} else {
 		rgba = new GdkRGBA ();
 		if (rgb != null) {
@@ -167,10 +167,10 @@ public RGB open () {
 			rgba.blue = (double) rgb.blue / 255;
 			rgba.alpha = 1;
 		}
-		OS.gtk_color_chooser_set_rgba (handle, rgba);
+		GTK.gtk_color_chooser_set_rgba (handle, rgba);
 	}
 	if (rgbs != null) {
-		if (OS.GTK_VERSION >= OS.VERSION (3, 4, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION (3, 4, 0)) {
 			int colorsPerRow = 9;
 			long /*int*/ gdkRGBAS = OS.g_malloc(GdkRGBA.sizeof * rgbs.length);
 			rgba = new GdkRGBA ();
@@ -183,13 +183,13 @@ public RGB open () {
 					OS.memmove (gdkRGBAS + i * GdkRGBA.sizeof, rgba, GdkRGBA.sizeof);
 				}
 			}
-			OS.gtk_color_chooser_add_palette(handle, OS.GTK_ORIENTATION_HORIZONTAL, colorsPerRow,
+			GTK.gtk_color_chooser_add_palette(handle, GTK.GTK_ORIENTATION_HORIZONTAL, colorsPerRow,
 					rgbs.length, gdkRGBAS);
-			OS.gtk_color_chooser_set_rgba (handle, rgba);
+			GTK.gtk_color_chooser_set_rgba (handle, rgba);
 
 
-			if (OS.gtk_color_chooser_get_use_alpha(handle)) {
-				OS.gtk_color_chooser_set_use_alpha (handle, false);
+			if (GTK.gtk_color_chooser_get_use_alpha(handle)) {
+				GTK.gtk_color_chooser_set_use_alpha (handle, false);
 			}
 			OS.g_free (gdkRGBAS);
 		} else {
@@ -204,7 +204,7 @@ public RGB open () {
 					OS.memmove (gdkColors + i * GdkColor.sizeof, color, GdkColor.sizeof);
 				}
 			}
-			long /*int*/ strPtr = OS.gtk_color_selection_palette_to_string(gdkColors, rgbs.length);
+			long /*int*/ strPtr = GTK.gtk_color_selection_palette_to_string(gdkColors, rgbs.length);
 			int length = C.strlen (strPtr);
 
 			buffer = new byte [length];
@@ -212,9 +212,9 @@ public RGB open () {
 			String paletteString = new String (Converter.mbcsToWcs (buffer));
 			buffer = Converter.wcsToMbcs (paletteString, true);
 			OS.g_free (gdkColors);
-			long /*int*/ settings = OS.gtk_settings_get_default ();
+			long /*int*/ settings = GTK.gtk_settings_get_default ();
 			if (settings != 0) {
-				OS.gtk_settings_set_string_property(settings, OS.gtk_color_palette, buffer, Converter.wcsToMbcs ("gtk_color_selection_palette_to_string", true));
+				GTK.gtk_settings_set_string_property(settings, GTK.gtk_color_palette, buffer, Converter.wcsToMbcs ("gtk_color_selection_palette_to_string", true));
 
 			}
 		}
@@ -222,18 +222,18 @@ public RGB open () {
 
 	display.addIdleProc ();
 	Dialog oldModal = null;
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		oldModal = display.getModalDialog ();
 		display.setModalDialog (this);
 	}
 	int signalId = 0;
 	long /*int*/ hookId = 0;
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
-		signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
+		signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
 		hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
 	}
 	display.sendPreExternalEventDispatchEvent ();
-	int response = OS.gtk_dialog_run (handle);
+	int response = GTK.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -245,32 +245,32 @@ public RGB open () {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
 		OS.g_signal_remove_emission_hook (signalId, hookId);
 	}
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		display.setModalDialog (oldModal);
 	}
-	boolean success = response == OS.GTK_RESPONSE_OK;
+	boolean success = response == GTK.GTK_RESPONSE_OK;
 	if (success) {
 		int red = 0;
 		int green = 0;
 		int blue = 0;
-		if (OS.GTK_VERSION >= OS.VERSION (3, 4, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION (3, 4, 0)) {
 			rgba = new GdkRGBA ();
-			OS.gtk_color_chooser_get_rgba (handle, rgba);
+			GTK.gtk_color_chooser_get_rgba (handle, rgba);
 			red =  (int) (rgba.red * 255);
 			green = (int) (rgba.green * 255);
 			blue =  (int) (rgba.blue *  255);
 		} else {
 			color = new GdkColor ();
-			OS.gtk_color_selection_get_current_color (colorsel, color);
+			GTK.gtk_color_selection_get_current_color (colorsel, color);
 			red = (color.red >> 8) & 0xFF;
 			green = (color.green >> 8) & 0xFF;
 			blue = (color.blue >> 8) & 0xFF;
 
-			long /*int*/ settings = OS.gtk_settings_get_default ();
+			long /*int*/ settings = GTK.gtk_settings_get_default ();
 			if (settings != 0) {
 
 				long /*int*/ [] ptr = new long /*int*/ [1];
-				OS.g_object_get (settings, OS.gtk_color_palette, ptr, 0);
+				OS.g_object_get (settings, GTK.gtk_color_palette, ptr, 0);
 				if (ptr [0] != 0) {
 					int length = C.strlen (ptr [0]);
 					buffer = new byte [length];
@@ -299,7 +299,7 @@ public RGB open () {
 	}
 
 	display.removeIdleProc ();
-	OS.gtk_widget_destroy (handle);
+	GTK.gtk_widget_destroy (handle);
 	if (!success) return null;
 
 	return rgb;
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 876a41969e..1b3f181536 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
@@ -178,13 +178,13 @@ public void add (String string, int index) {
 	System.arraycopy (items, index, newItems, index + 1, items.length - index);
 	items = newItems;
 	byte [] buffer = Converter.wcsToMbcs (string, true);
-	if (OS.GTK3) {
-		if (handle != 0) OS.gtk_combo_box_text_insert (handle, index, null, buffer);
+	if (GTK.GTK3) {
+		if (handle != 0) GTK.gtk_combo_box_text_insert (handle, index, null, buffer);
 	} else {
-		if (handle != 0) OS.gtk_combo_box_text_insert_text (handle, index, buffer);
+		if (handle != 0) GTK.gtk_combo_box_text_insert_text (handle, index, buffer);
 	}
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
-		OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
+		GTK.gtk_container_forall (popupHandle, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL);
 	}
 }
 
@@ -367,52 +367,52 @@ protected void checkSubclass () {
 public void clearSelection () {
 	checkWidget();
 	if (entryHandle != 0) {
-		int position = OS.gtk_editable_get_position (entryHandle);
-		OS.gtk_editable_select_region (entryHandle, position, position);
+		int position = GTK.gtk_editable_get_position (entryHandle);
+		GTK.gtk_editable_select_region (entryHandle, position, position);
 	}
 }
 
 void clearText () {
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if ((style & SWT.READ_ONLY) != 0) {
-		int index = OS.gtk_combo_box_get_active (handle);
+		int index = GTK.gtk_combo_box_get_active (handle);
 		if (index != -1) {
-			long /*int*/ modelHandle = OS.gtk_combo_box_get_model (handle);
+			long /*int*/ modelHandle = GTK.gtk_combo_box_get_model (handle);
 			long /*int*/ [] ptr = new long /*int*/ [1];
-			long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-			OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-			OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
+			long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+			GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+			GTK.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
 			OS.g_free (iter);
 			if (ptr [0] != 0 && C.strlen (ptr [0]) > 0) postEvent (SWT.Modify);
 			OS.g_free (ptr [0]);
 		}
 	} else {
-		OS.gtk_entry_set_text (entryHandle, new byte[1]);
+		GTK.gtk_entry_set_text (entryHandle, new byte[1]);
 	}
-	OS.gtk_combo_box_set_active (handle, -1);
+	GTK.gtk_combo_box_set_active (handle, -1);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 }
 
 @Override
 Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	checkWidget ();
-	if ((style & SWT.READ_ONLY) != 0 || OS.GTK3) {
+	if ((style & SWT.READ_ONLY) != 0 || GTK.GTK3) {
 		return computeNativeSize (handle, wHint, hHint, changed);
 	}
 	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
 	int[] w = new int [1], h = new int [1];
-	OS.gtk_widget_realize (entryHandle);
-	long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle);
+	GTK.gtk_widget_realize (entryHandle);
+	long /*int*/ layout = GTK.gtk_entry_get_layout (entryHandle);
 	OS.pango_layout_get_pixel_size (layout, w, h);
 	int xborder = Display.INNER_BORDER, yborder = Display.INNER_BORDER;
 	Point thickness = getThickness (entryHandle);
 	xborder += thickness.x;
 	yborder += thickness.y;
 	int [] property = new int [1];
-	OS.gtk_widget_style_get (entryHandle, OS.interior_focus, property, 0);
+	GTK.gtk_widget_style_get (entryHandle, OS.interior_focus, property, 0);
 	if (property [0] == 0) {
-		OS.gtk_widget_style_get (entryHandle, OS.focus_line_width, property, 0);
+		GTK.gtk_widget_style_get (entryHandle, OS.focus_line_width, property, 0);
 		xborder += property [0];
 		yborder += property [0];
 	}
@@ -421,7 +421,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	GtkRequisition arrowRequesition = new GtkRequisition ();
 	gtk_widget_get_preferred_size (buttonHandle, arrowRequesition);
 	GtkRequisition listRequesition = new GtkRequisition ();
-	long /*int*/ listParent = OS.gtk_bin_get_child(popupHandle);
+	long /*int*/ listParent = GTK.gtk_bin_get_child(popupHandle);
 	gtk_widget_get_preferred_size (listParent, listRequesition);
 	width = Math.max (listRequesition.width, width) + arrowRequesition.width;
 	width = wHint == SWT.DEFAULT ? width : wHint;
@@ -444,7 +444,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
  */
 public void copy () {
 	checkWidget ();
-	if (entryHandle != 0) OS.gtk_editable_copy_clipboard (entryHandle);
+	if (entryHandle != 0) GTK.gtk_editable_copy_clipboard (entryHandle);
 }
 
 @Override
@@ -452,27 +452,27 @@ void createHandle (int index) {
 	state |= HANDLE | MENU;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	long /*int*/ oldList = OS.gtk_window_list_toplevels ();
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	long /*int*/ oldList = GTK.gtk_window_list_toplevels ();
 	if ((style & SWT.READ_ONLY) != 0) {
-		handle = OS.gtk_combo_box_text_new ();
+		handle = GTK.gtk_combo_box_text_new ();
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-		cellHandle = OS.gtk_bin_get_child (handle);
+		cellHandle = GTK.gtk_bin_get_child (handle);
 		if (cellHandle == 0) error (SWT.ERROR_NO_HANDLES);
 		// Setting wrap width has the side effect of removing the whitespace on top in popup bug#438992
-		OS.gtk_combo_box_set_wrap_width(handle, 1);
+		GTK.gtk_combo_box_set_wrap_width(handle, 1);
 	} else {
-		handle = OS.gtk_combo_box_text_new_with_entry();
+		handle = GTK.gtk_combo_box_text_new_with_entry();
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-		entryHandle = OS.gtk_bin_get_child (handle);
+		entryHandle = GTK.gtk_bin_get_child (handle);
 		if (entryHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			imContext = OS.imContextLast();
 		}
 	}
 	popupHandle = findPopupHandle (oldList);
-	OS.gtk_container_add (fixedHandle, handle);
-	textRenderer = OS.gtk_cell_renderer_text_new ();
+	GTK.gtk_container_add (fixedHandle, handle);
+	textRenderer = GTK.gtk_cell_renderer_text_new ();
 	if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
 	/*
 	* Feature in GTK. In order to make a read only combo box the same
@@ -489,10 +489,10 @@ void createHandle (int index) {
 	*/
 	boolean warnings = display.getWarnings ();
 	display.setWarnings (false);
-	OS.gtk_cell_layout_clear (handle);
+	GTK.gtk_cell_layout_clear (handle);
 	display.setWarnings (warnings);
-	OS.gtk_cell_layout_pack_start (handle, textRenderer, true);
-	OS.gtk_cell_layout_set_attributes (handle, textRenderer, OS.text, 0, 0);
+	GTK.gtk_cell_layout_pack_start (handle, textRenderer, true);
+	GTK.gtk_cell_layout_set_attributes (handle, textRenderer, OS.text, 0, 0);
 	/*
 	* Feature in GTK. Toggle button creation differs between GTK versions. The
 	* fix is to call size_request() to force the creation of the button
@@ -509,11 +509,11 @@ void createHandle (int index) {
 	* clear the GTK_RECEIVES_DEFAULT flag.
 	*/
 	if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) {
-		OS.gtk_widget_set_receives_default (buttonHandle, false);
+		GTK.gtk_widget_set_receives_default (buttonHandle, false);
 	}
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont().handle);
 	}
 }
@@ -534,7 +534,7 @@ void createHandle (int index) {
  */
 public void cut () {
 	checkWidget ();
-	if (entryHandle != 0) OS.gtk_editable_cut_clipboard (entryHandle);
+	if (entryHandle != 0) GTK.gtk_editable_cut_clipboard (entryHandle);
 }
 
 @Override
@@ -560,7 +560,7 @@ boolean filterKey (int keyval, long /*int*/ event) {
 		lastEventTime = time;
 		long /*int*/ imContext = imContext ();
 		if (imContext != 0) {
-			return OS.gtk_im_context_filter_keypress (imContext, event);
+			return GTK.gtk_im_context_filter_keypress (imContext, event);
 		}
 	}
 	gdkEventKey = event;
@@ -569,7 +569,7 @@ boolean filterKey (int keyval, long /*int*/ event) {
 
 long /*int*/ findPopupHandle (long /*int*/ oldList) {
 	long /*int*/ result = 0;
-	long /*int*/ currentList = OS.gtk_window_list_toplevels();
+	long /*int*/ currentList = GTK.gtk_window_list_toplevels();
 	long /*int*/ oldFromList = oldList;
 	long /*int*/ newFromList = OS.g_list_last(currentList);
 	boolean isFound;
@@ -613,8 +613,8 @@ long /*int*/ findButtonHandle() {
 	 * GtkBox has to be retrieved first.
 	 * As it's internal child one can't get it in other way.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
-		OS.gtk_container_forall(handle, display.allChildrenProc, 0);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+		GTK.gtk_container_forall(handle, display.allChildrenProc, 0);
 		if (display.allChildren != 0) {
 			long /*int*/ list = display.allChildren;
 			while (list != 0) {
@@ -630,12 +630,12 @@ long /*int*/ findButtonHandle() {
 		}
 	}
 
-	OS.gtk_container_forall (childHandle, display.allChildrenProc, 0);
+	GTK.gtk_container_forall (childHandle, display.allChildrenProc, 0);
 	if (display.allChildren != 0) {
 		long /*int*/ list = display.allChildren;
 		while (list != 0) {
 			long /*int*/ widget = OS.g_list_data (list);
-			if (OS.GTK_IS_BUTTON (widget)) {
+			if (GTK.GTK_IS_BUTTON (widget)) {
 				result = widget;
 				break;
 			}
@@ -650,12 +650,12 @@ long /*int*/ findButtonHandle() {
 long /*int*/ findMenuHandle() {
 	if (popupHandle == 0) return 0;
 	long /*int*/ result = 0;
-	OS.gtk_container_forall (popupHandle, display.allChildrenProc, 0);
+	GTK.gtk_container_forall (popupHandle, display.allChildrenProc, 0);
 	if (display.allChildren != 0) {
 	    long /*int*/ list = display.allChildren;
 		while (list != 0) {
 			long /*int*/ widget = OS.g_list_data (list);
-			if (OS.G_OBJECT_TYPE (widget) == OS.GTK_TYPE_MENU ()) {
+			if (OS.G_OBJECT_TYPE (widget) == GTK.GTK_TYPE_MENU ()) {
 				result = widget;
 				break;
 			}
@@ -671,10 +671,10 @@ long /*int*/ findMenuHandle() {
 void fixModal (long /*int*/ group, long /*int*/ modalGroup) {
 	if (popupHandle != 0) {
 		if (group != 0) {
-			OS.gtk_window_group_add_window (group, popupHandle);
+			GTK.gtk_window_group_add_window (group, popupHandle);
 		} else {
 			if (modalGroup != 0) {
-				OS.gtk_window_group_remove_window (modalGroup, popupHandle);
+				GTK.gtk_window_group_remove_window (modalGroup, popupHandle);
 			}
 		}
 	}
@@ -692,7 +692,7 @@ void fixIM () {
 	if (gdkEventKey != 0 && gdkEventKey != -1) {
 		long /*int*/ imContext = imContext ();
 		if (imContext != 0) {
-			OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
+			GTK.gtk_im_context_filter_keypress (imContext, gdkEventKey);
 			gdkEventKey = -1;
 			return;
 		}
@@ -715,7 +715,7 @@ long /*int*/ focusHandle () {
 @Override
 boolean hasFocus () {
 	if (super.hasFocus ()) return true;
-	if (entryHandle != 0 && OS.gtk_widget_has_focus (entryHandle)) return true;
+	if (entryHandle != 0 && GTK.gtk_widget_has_focus (entryHandle)) return true;
 	return false;
 }
 
@@ -737,7 +737,7 @@ void hookEvents () {
 	long /*int*/ imContext = imContext ();
 	if (imContext != 0) {
 		OS.g_signal_connect_closure (imContext, OS.commit, display.getClosure (COMMIT), false);
-		int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
+		int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ());
 		int blockMask =  OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
 		OS.g_signal_handlers_block_matched (imContext, blockMask, id, 0, 0, 0, entryHandle);
 	}
@@ -749,7 +749,7 @@ void hookEvents(long /*int*/ [] handles) {
 		long /*int*/ eventHandle = handles [i];
 		if (eventHandle != 0) {
 			/* Connect the mouse signals */
-			OS.gtk_widget_add_events (eventHandle, eventMask);
+			GTK.gtk_widget_add_events (eventHandle, eventMask);
 			OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.getClosure (BUTTON_PRESS_EVENT), false);
 			OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.getClosure (BUTTON_RELEASE_EVENT), false);
 			OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.getClosure (MOTION_NOTIFY_EVENT), false);
@@ -768,7 +768,7 @@ void hookEvents(long /*int*/ [] handles) {
 			if (eventHandle != focusHandle ()) {
 				OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [EVENT_AFTER], 0, display.getClosure (EVENT_AFTER), false);
 			}
-			if (OS.G_OBJECT_TYPE (eventHandle) == OS.GTK_TYPE_MENU ()) {
+			if (OS.G_OBJECT_TYPE (eventHandle) == GTK.GTK_TYPE_MENU ()) {
 				OS.g_signal_connect_closure(eventHandle, OS.selection_done, display.getClosure (SELECTION_DONE), true);
 			}
 		}
@@ -777,7 +777,7 @@ void hookEvents(long /*int*/ [] handles) {
 
 long /*int*/ imContext () {
 	if (imContext != 0) return imContext;
-	return entryHandle != 0 ? OS.GTK_ENTRY_IM_CONTEXT (entryHandle) : 0;
+	return entryHandle != 0 ? GTK.GTK_ENTRY_IM_CONTEXT (entryHandle) : 0;
 }
 
 /**
@@ -795,7 +795,7 @@ long /*int*/ imContext () {
 public void deselect (int index) {
 	checkWidget();
 	if (index < 0 || index >= items.length) return;
-		if (OS.gtk_combo_box_get_active (handle) == index) {
+		if (GTK.gtk_combo_box_get_active (handle) == index) {
 			clearText ();
 		}
 }
@@ -824,13 +824,13 @@ boolean dragDetect(int x, int y, boolean filter, boolean dragOnTimeout, boolean[
 	if (filter && entryHandle != 0) {
 		int [] index = new int [1];
 		int [] trailing = new int [1];
-		long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle);
+		long /*int*/ layout = GTK.gtk_entry_get_layout (entryHandle);
 		OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing);
 		long /*int*/ ptr = OS.pango_layout_get_text (layout);
 		int position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
 		int [] start = new int [1];
 		int [] end = new int [1];
-		OS.gtk_editable_get_selection_bounds (entryHandle, start, end);
+		GTK.gtk_editable_get_selection_bounds (entryHandle, start, end);
 		if (start [0] <= position && position < end [0]) {
 			if (super.dragDetect (x, y, filter, dragOnTimeout, consume)) {
 				if (consume != null) consume [0] = true;
@@ -854,7 +854,7 @@ long /*int*/ eventWindow () {
 
 @Override
 GdkColor getBackgroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getBaseGdkColor ();
 }
 
@@ -882,11 +882,11 @@ Point getCaretLocationInPixels () {
 	if ((style & SWT.READ_ONLY) != 0) {
 		return new Point (0, 0);
 	}
-	int index = OS.gtk_editable_get_position (entryHandle);
-	index = OS.gtk_entry_text_index_to_layout_index (entryHandle, index);
+	int index = GTK.gtk_editable_get_position (entryHandle);
+	index = GTK.gtk_entry_text_index_to_layout_index (entryHandle, index);
 	int [] offset_x = new int [1], offset_y = new int [1];
-	OS.gtk_entry_get_layout_offsets (entryHandle, offset_x, offset_y);
-	long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle);
+	GTK.gtk_entry_get_layout_offsets (entryHandle, offset_x, offset_y);
+	long /*int*/ layout = GTK.gtk_entry_get_layout (entryHandle);
 	PangoRectangle pos = new PangoRectangle ();
 	OS.pango_layout_index_to_pos (layout, index, pos);
 	int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidthInPixels ();
@@ -914,13 +914,13 @@ public int getCaretPosition () {
 	if ((style & SWT.READ_ONLY) != 0) {
 		return 0;
 	}
-	long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);
-	return (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_editable_get_position (entryHandle));
+	long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle);
+	return (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_editable_get_position (entryHandle));
 }
 
 @Override
 GdkRGBA getContextBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (background != null && (state & BACKGROUND) != 0) {
 		return background;
 	}
@@ -929,7 +929,7 @@ GdkRGBA getContextBackgroundGdkRGBA () {
 
 @Override
 GdkColor getForegroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getTextColor ();
 }
 
@@ -1032,7 +1032,7 @@ public String [] getItems () {
  */
 public boolean getListVisible () {
 	checkWidget ();
-	return popupHandle != 0 && OS.gtk_widget_get_visible (popupHandle);
+	return popupHandle != 0 && GTK.gtk_widget_get_visible (popupHandle);
 }
 
 @Override
@@ -1080,15 +1080,15 @@ public Point getSelection () {
 	checkWidget ();
 	if ((style & SWT.READ_ONLY) != 0) {
 		int length = 0;
-		int index = OS.gtk_combo_box_get_active (handle);
+		int index = GTK.gtk_combo_box_get_active (handle);
 		if (index != -1) length = getItem (index).length ();
 		return new Point (0, length);
 	}
 	int [] start = new int [1];
 	int [] end = new int [1];
 	if (entryHandle != 0) {
-		OS.gtk_editable_get_selection_bounds (entryHandle, start, end);
-		long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);
+		GTK.gtk_editable_get_selection_bounds (entryHandle, start, end);
+		long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle);
 		start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]);
 		end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]);
 	}
@@ -1108,7 +1108,7 @@ public Point getSelection () {
  */
 public int getSelectionIndex () {
 	checkWidget();
-	return OS.gtk_combo_box_get_active (handle);
+	return GTK.gtk_combo_box_get_active (handle);
 }
 
 /**
@@ -1126,14 +1126,14 @@ public int getSelectionIndex () {
 public String getText () {
 	checkWidget();
 	if (entryHandle != 0) {
-		long /*int*/ str = OS.gtk_entry_get_text (entryHandle);
+		long /*int*/ str = GTK.gtk_entry_get_text (entryHandle);
 		if (str == 0) return "";
 		int length = C.strlen (str);
 		byte [] buffer = new byte [length];
 		C.memmove (buffer, str, length);
 		return new String (Converter.mbcsToWcs (buffer));
 	} else {
-		int index = OS.gtk_combo_box_get_active (handle);
+		int index = GTK.gtk_combo_box_get_active (handle);
 		return index != -1 ? getItem (index) : "";
 	}
 }
@@ -1167,10 +1167,10 @@ int getTextHeightInPixels () {
 	checkWidget();
 	GtkRequisition requisition = new GtkRequisition ();
 	gtk_widget_size_request (handle, requisition);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return requisition.height;
 	} else {
-		return OS.GTK_WIDGET_REQUISITION_HEIGHT (handle);
+		return GTK.GTK_WIDGET_REQUISITION_HEIGHT (handle);
 	}
 }
 
@@ -1191,7 +1191,7 @@ int getTextHeightInPixels () {
  */
 public int getTextLimit () {
 	checkWidget();
-	int limit = entryHandle != 0 ? OS.gtk_entry_get_max_length (entryHandle) : 0;
+	int limit = entryHandle != 0 ? GTK.gtk_entry_get_max_length (entryHandle) : 0;
 	return limit == 0 ? LIMIT : limit;
 }
 
@@ -1256,7 +1256,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) {
 		* NOTE: This code relies on GTK clearing the selected
 		* item and not matching the item as the user types.
 		*/
-		int index = OS.gtk_combo_box_get_active (handle);
+		int index = GTK.gtk_combo_box_get_active (handle);
 		if (index != -1) sendSelectionEvent (SWT.Selection);
 		indexSelected = -1;
 		return 0;
@@ -1269,7 +1269,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) {
 	* is to post the modify event when the user is typing.
 	*/
 	boolean keyPress = false;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventKey gdkEvent = new GdkEventKey ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -1291,7 +1291,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) {
 @Override
 long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	if (text == 0) return 0;
-	if (!OS.gtk_editable_get_editable (entryHandle)) return 0;
+	if (!GTK.gtk_editable_get_editable (entryHandle)) return 0;
 	int length = C.strlen (text);
 	if (length == 0) return 0;
 	byte [] buffer = new byte [length];
@@ -1308,7 +1308,7 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	*/
 	fixStart = fixEnd = -1;
 	OS.g_signal_handlers_block_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, COMMIT);
-	int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
+	int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ());
 	int mask =  OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
 	OS.g_signal_handlers_unblock_matched (imContext, mask, id, 0, 0, 0, entryHandle);
 	if (newChars == chars) {
@@ -1320,8 +1320,8 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	OS.g_signal_handlers_unblock_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, COMMIT);
 	OS.g_signal_handlers_block_matched (imContext, mask, id, 0, 0, 0, entryHandle);
 	if (fixStart != -1 && fixEnd != -1) {
-		OS.gtk_editable_set_position (entryHandle, fixStart);
-		OS.gtk_editable_select_region (entryHandle, fixStart, fixEnd);
+		GTK.gtk_editable_set_position (entryHandle, fixStart);
+		GTK.gtk_editable_select_region (entryHandle, fixStart, fixEnd);
 	}
 	fixStart = fixEnd = -1;
 	return 0;
@@ -1330,7 +1330,7 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 @Override
 long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {
 	if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
-	long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);
+	long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle);
 	if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1);
 	int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos);
 	int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos);
@@ -1344,10 +1344,10 @@ long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long
 			byte [] buffer = Converter.wcsToMbcs (newText, false);
 			OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-			OS.gtk_editable_insert_text (entryHandle, buffer, buffer.length, pos);
+			GTK.gtk_editable_insert_text (entryHandle, buffer, buffer.length, pos);
 			OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
 			OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-			OS.gtk_editable_set_position (entryHandle, pos [0]);
+			GTK.gtk_editable_set_position (entryHandle, pos [0]);
 		}
 	}
 	return 0;
@@ -1379,7 +1379,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent)  {
 					return 1;
 				}
 				if ((style & SWT.READ_ONLY) == 0 && widget == buttonHandle) {
-					OS.gtk_widget_grab_focus (entryHandle);
+					GTK.gtk_widget_grab_focus (entryHandle);
 				}
 			}
 			break;
@@ -1389,16 +1389,16 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent)  {
 				GdkEventFocus gdkEventFocus = new GdkEventFocus ();
 				OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);
 				if (gdkEventFocus.in != 0) {
-					if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
-						OS.gtk_widget_set_focus_on_click(handle, false);
+					if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+						GTK.gtk_widget_set_focus_on_click(handle, false);
 					} else {
-						OS.gtk_combo_box_set_focus_on_click (handle, false);
+						GTK.gtk_combo_box_set_focus_on_click (handle, false);
 					}
 				} else {
-					if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
-						OS.gtk_widget_set_focus_on_click(handle, true);
+					if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+						GTK.gtk_widget_set_focus_on_click(handle, true);
 					} else {
-						OS.gtk_combo_box_set_focus_on_click (handle, true);
+						GTK.gtk_combo_box_set_focus_on_click (handle, true);
 					}
 				}
 			}
@@ -1423,24 +1423,24 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /
 	String oldText = new String (Converter.mbcsToWcs (buffer));
 	int [] pos = new int [1];
 	C.memmove (pos, position, 4);
-	long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);
+	long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle);
 	if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
 	int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, pos [0]);
 	String newText = verifyText (oldText, start, start);
 	if (newText != oldText) {
 		int [] newStart = new int [1], newEnd = new int [1];
-		OS.gtk_editable_get_selection_bounds (entryHandle, newStart, newEnd);
+		GTK.gtk_editable_get_selection_bounds (entryHandle, newStart, newEnd);
 		if (newText != null) {
 			if (newStart [0] != newEnd [0]) {
 				OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 				OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_editable_delete_selection (entryHandle);
+				GTK.gtk_editable_delete_selection (entryHandle);
 				OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 				OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			}
 			byte [] buffer3 = Converter.wcsToMbcs (newText, false);
 			OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-			OS.gtk_editable_insert_text (entryHandle, buffer3, buffer3.length, pos);
+			GTK.gtk_editable_insert_text (entryHandle, buffer3, buffer3.length, pos);
 			OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
 			newStart [0] = newEnd [0] = pos [0];
 		}
@@ -1468,7 +1468,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
 	if ((style & SWT.READ_ONLY) == 0) {
 		GdkEventKey keyEvent = new GdkEventKey ();
 		OS.memmove (keyEvent, event, GdkEventKey.sizeof);
-		int oldIndex = OS.gtk_combo_box_get_active (handle);
+		int oldIndex = GTK.gtk_combo_box_get_active (handle);
 		int newIndex = oldIndex;
 		int key = keyEvent.keyval;
 		switch (key) {
@@ -1500,7 +1500,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
 		    	break;
 		}
 		if (newIndex != oldIndex) {
-			OS.gtk_combo_box_set_active (handle, newIndex);
+			GTK.gtk_combo_box_set_active (handle, newIndex);
 			return 1;
 		}
 	}
@@ -1510,15 +1510,15 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
 @Override
 long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
-		OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
-		OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
+		GTK.gtk_widget_set_direction (menu, GTK.GTK_TEXT_DIR_RTL);
+		GTK.gtk_container_forall (menu, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL);
 	}
 	return 0;
 }
 
 @Override
 long /*int*/ gtk_selection_done(long /*int*/ menushell) {
-	int index = OS.gtk_combo_box_get_active (handle);
+	int index = GTK.gtk_combo_box_get_active (handle);
 	if (indexSelected == -1){
 		indexSelected = index;
 	}
@@ -1596,7 +1596,7 @@ boolean isFocusHandle(long /*int*/ widget) {
 @Override
 long /*int*/ paintWindow () {
 	long /*int*/ childHandle =  entryHandle != 0 ? entryHandle : handle;
-	OS.gtk_widget_realize (childHandle);
+	GTK.gtk_widget_realize (childHandle);
 	long /*int*/ window = gtk_widget_get_window (childHandle);
 	if ((style & SWT.READ_ONLY) != 0) return window;
 	long /*int*/ children = OS.gdk_window_get_children (window);
@@ -1605,7 +1605,7 @@ long /*int*/ paintWindow () {
 		 * The only direct child of GtkComboBox since 3.20 is GtkBox thus the children
 		 * have to be traversed to get to the entry one.
 		 */
-		if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 				do {
 					window = OS.g_list_data (children);
 				} while ((children = OS.g_list_next (children)) != 0);
@@ -1634,7 +1634,7 @@ long /*int*/ paintWindow () {
  */
 public void paste () {
 	checkWidget ();
-	if (entryHandle != 0) OS.gtk_editable_paste_clipboard (entryHandle);
+	if (entryHandle != 0) GTK.gtk_editable_paste_clipboard (entryHandle);
 }
 
 @Override
@@ -1696,8 +1696,8 @@ public void remove (int index) {
 	System.arraycopy (oldItems, 0, newItems, 0, index);
 	System.arraycopy (oldItems, index + 1, newItems, index, oldItems.length - index - 1);
 	items = newItems;
-	if (OS.gtk_combo_box_get_active (handle) == index) clearText ();
-	if (handle != 0) OS.gtk_combo_box_text_remove(handle, index);
+	if (GTK.gtk_combo_box_get_active (handle) == index) clearText ();
+	if (handle != 0) GTK.gtk_combo_box_text_remove(handle, index);
 }
 
 /**
@@ -1727,10 +1727,10 @@ public void remove (int start, int end) {
 	System.arraycopy (oldItems, 0, newItems, 0, start);
 	System.arraycopy (oldItems, end + 1, newItems, start, oldItems.length - end - 1);
 	items = newItems;
-	int index = OS.gtk_combo_box_get_active (handle);
+	int index = GTK.gtk_combo_box_get_active (handle);
 	if (start <= index && index <= end) clearText();
 	for (int i = end; i >= start; i--) {
-		if (handle != 0) OS.gtk_combo_box_text_remove(handle, i);
+		if (handle != 0) GTK.gtk_combo_box_text_remove(handle, i);
 	}
 }
 
@@ -1772,11 +1772,11 @@ public void removeAll () {
 	int count = items.length;
 	items = new String[0];
 	clearText ();
-	if (OS.GTK3) {
-		if (handle != 0) OS.gtk_combo_box_text_remove_all(handle);
+	if (GTK.GTK3) {
+		if (handle != 0) GTK.gtk_combo_box_text_remove_all(handle);
 	} else {
 		for (int i = count - 1; i >= 0; i--) {
-			if (handle != 0) OS.gtk_combo_box_text_remove (handle, i);
+			if (handle != 0) GTK.gtk_combo_box_text_remove (handle, i);
 		}
 	}
 }
@@ -1897,9 +1897,9 @@ public void removeVerifyListener (VerifyListener listener) {
 public void select (int index) {
 	checkWidget();
 	if (index < 0 || index >= items.length) return;
-	int selected = OS.gtk_combo_box_get_active (handle);
+	int selected = GTK.gtk_combo_box_get_active (handle);
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_combo_box_set_active (handle, index);
+	GTK.gtk_combo_box_set_active (handle, index);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if ((style & SWT.READ_ONLY) != 0 && selected != index) {
 		/*
@@ -1914,7 +1914,7 @@ public void select (int index) {
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	// CSS to be parsed for various widgets within Combo
 	background = rgba;
 	String css = "* {\n";
@@ -1935,15 +1935,15 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 	String finalCss = display.gtk_css_create_css_color_string (cssBackground, cssForeground, SWT.BACKGROUND);
 	if (entryHandle == 0 || (style & SWT.READ_ONLY) != 0) {
 		// For read only Combos, we can just apply the background CSS to the GtkToggleButton.
-		gtk_css_provider_load_from_css (OS.gtk_widget_get_style_context(buttonHandle), finalCss);
+		gtk_css_provider_load_from_css (GTK.gtk_widget_get_style_context(buttonHandle), finalCss);
 	} else {
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			// For GTK3.14+, only the GtkEntry needs to be themed.
-			gtk_css_provider_load_from_css (OS.gtk_widget_get_style_context(entryHandle), finalCss);
+			gtk_css_provider_load_from_css (GTK.gtk_widget_get_style_context(entryHandle), finalCss);
 		} else {
 			// Maintain GTK3.12- functionality
-			setBackgroundGradientGdkRGBA (OS.gtk_widget_get_style_context (entryHandle), handle, rgba);
-			super.setBackgroundGdkRGBA (OS.gtk_widget_get_style_context (entryHandle), entryHandle, rgba);
+			setBackgroundGradientGdkRGBA (GTK.gtk_widget_get_style_context (entryHandle), handle, rgba);
+			super.setBackgroundGdkRGBA (GTK.gtk_widget_get_style_context (entryHandle), entryHandle, rgba);
 		}
 	}
 	// Set the background color of the text of the drop down menu.
@@ -1952,7 +1952,7 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 
 @Override
 void setBackgroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setBackgroundGdkRGBA(rgba);
 	if (entryHandle != 0) setBackgroundGdkRGBA (entryHandle, rgba);
 	setBackgroundGdkRGBA (fixedHandle, rgba);
@@ -1960,9 +1960,9 @@ void setBackgroundGdkRGBA (GdkRGBA rgba) {
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
-	if (entryHandle != 0) OS.gtk_widget_modify_base (entryHandle, 0, color);
+	if (entryHandle != 0) GTK.gtk_widget_modify_base (entryHandle, 0, color);
 	if (cellHandle != 0) OS.g_object_set (cellHandle, OS.background_gdk, color, 0);
 	OS.g_object_set (textRenderer, OS.background_gdk, color, 0);
 
@@ -2016,17 +2016,17 @@ void setFontDescription (long /*int*/ font) {
 		* invalid minimum size.  The fix is to temporarily change the
 		* selected item to force the combo box to resize.
 		*/
-		int index = OS.gtk_combo_box_get_active (handle);
+		int index = GTK.gtk_combo_box_get_active (handle);
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-		OS.gtk_combo_box_set_active (handle, -1);
-		OS.gtk_combo_box_set_active (handle, index);
+		GTK.gtk_combo_box_set_active (handle, -1);
+		GTK.gtk_combo_box_set_active (handle, index);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	}
 }
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setForegroundColor (handle, color, false);
 	if (entryHandle != 0) {
 		setForegroundColor (entryHandle, color, false);
@@ -2036,7 +2036,7 @@ void setForegroundGdkColor (GdkColor color) {
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (entryHandle != 0) {
 		setForegroundGdkRGBA (entryHandle, rgba);
 	}
@@ -2069,15 +2069,15 @@ public void setItem (int index, String string) {
 	}
 	items [index] = string;
 	byte [] buffer = Converter.wcsToMbcs (string, true);
-	if (OS.GTK3) {
-		if (handle != 0) OS.gtk_combo_box_text_remove (handle, index);
-		if (handle != 0) OS.gtk_combo_box_text_insert (handle, index, null, buffer);
+	if (GTK.GTK3) {
+		if (handle != 0) GTK.gtk_combo_box_text_remove (handle, index);
+		if (handle != 0) GTK.gtk_combo_box_text_insert (handle, index, null, buffer);
 	} else {
-		if (handle != 0) OS.gtk_combo_box_text_remove (handle, index);
-		if (handle != 0) OS.gtk_combo_box_text_insert_text (handle, index, buffer);
+		if (handle != 0) GTK.gtk_combo_box_text_remove (handle, index);
+		if (handle != 0) GTK.gtk_combo_box_text_insert_text (handle, index, buffer);
 	}
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
-		OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
+		GTK.gtk_container_forall (popupHandle, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL);
 	}
 }
 
@@ -2105,23 +2105,23 @@ public void setItems (String... items) {
 	this.items = new String [items.length];
 	System.arraycopy (items, 0, this.items, 0, items.length);
 	clearText ();
-	if (OS.GTK3) {
-		if (handle != 0) OS.gtk_combo_box_text_remove_all(handle);
+	if (GTK.GTK3) {
+		if (handle != 0) GTK.gtk_combo_box_text_remove_all(handle);
 	} else {
 		for (int i = count - 1; i >= 0; i--) {
-			if (handle != 0) OS.gtk_combo_box_text_remove (handle, i);
+			if (handle != 0) GTK.gtk_combo_box_text_remove (handle, i);
 		}
 	}
 	for (int i = 0; i < items.length; i++) {
 		String string = items [i];
 		byte [] buffer = Converter.wcsToMbcs (string, true);
-		if (OS.GTK3) {
-			if (handle != 0) OS.gtk_combo_box_text_insert (handle, i, null, buffer);
+		if (GTK.GTK3) {
+			if (handle != 0) GTK.gtk_combo_box_text_insert (handle, i, null, buffer);
 		} else {
-			if (handle != 0) OS.gtk_combo_box_text_insert_text (handle, i, buffer);
+			if (handle != 0) GTK.gtk_combo_box_text_insert_text (handle, i, buffer);
 		}
 		if ((style & SWT.RIGHT_TO_LEFT) != 0 && popupHandle != 0) {
-			OS.gtk_container_forall (popupHandle, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
+			GTK.gtk_container_forall (popupHandle, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL);
 		}
 	}
 }
@@ -2147,9 +2147,9 @@ public void setItems (String... items) {
 public void setListVisible (boolean visible) {
 	checkWidget ();
 	if (visible) {
-		OS.gtk_combo_box_popup (handle);
+		GTK.gtk_combo_box_popup (handle);
 	} else {
-		OS.gtk_combo_box_popdown (handle);
+		GTK.gtk_combo_box_popdown (handle);
 	}
 }
 
@@ -2157,11 +2157,11 @@ public void setListVisible (boolean visible) {
 void setOrientation (boolean create) {
 	super.setOrientation (create);
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		if (entryHandle != 0) OS.gtk_widget_set_direction (entryHandle, dir);
-		if (cellHandle != 0) OS.gtk_widget_set_direction (cellHandle, dir);
+		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		if (entryHandle != 0) GTK.gtk_widget_set_direction (entryHandle, dir);
+		if (cellHandle != 0) GTK.gtk_widget_set_direction (cellHandle, dir);
 		if (!create) {
-			if (popupHandle != 0) OS.gtk_container_forall (popupHandle, display.setDirectionProc, dir);
+			if (popupHandle != 0) GTK.gtk_container_forall (popupHandle, display.setDirectionProc, dir);
 		}
 	}
 }
@@ -2206,11 +2206,11 @@ public void setSelection (Point selection) {
 	if (selection == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if ((style & SWT.READ_ONLY) != 0) return;
 	if (entryHandle != 0) {
-		long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);
+		long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle);
 		int start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, selection.x);
 		int end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, selection.y);
-		OS.gtk_editable_set_position (entryHandle, start);
-		OS.gtk_editable_select_region (entryHandle, start, end);
+		GTK.gtk_editable_set_position (entryHandle, start);
+		GTK.gtk_editable_select_region (entryHandle, start, end);
 	}
 }
 
@@ -2257,7 +2257,7 @@ public void setText (String string) {
 	* fix is to block the firing of these events and fire them ourselves in a consistent manner.
 	*/
 	if (hooks (SWT.Verify) || filters (SWT.Verify)) {
-		long /*int*/ ptr = OS.gtk_entry_get_text (entryHandle);
+		long /*int*/ ptr = GTK.gtk_entry_get_text (entryHandle);
 		string = verifyText (string, 0, (int)/*64*/OS.g_utf16_strlen (ptr, -1));
 		if (string == null) return;
 	}
@@ -2266,7 +2266,7 @@ public void setText (String string) {
 	OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 	OS.g_signal_handlers_block_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-	OS.gtk_entry_set_text (entryHandle, buffer);
+	GTK.gtk_entry_set_text (entryHandle, buffer);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_signal_handlers_unblock_matched (entryHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
@@ -2297,7 +2297,7 @@ public void setText (String string) {
 public void setTextLimit (int limit) {
 	checkWidget();
 	if (limit == 0) error (SWT.ERROR_CANNOT_BE_ZERO);
-	if (entryHandle != 0) OS.gtk_entry_set_max_length (entryHandle, limit);
+	if (entryHandle != 0) GTK.gtk_entry_set_max_length (entryHandle, limit);
 }
 
 @Override
@@ -2343,7 +2343,7 @@ boolean translateTraversal (GdkEventKey keyEvent) {
 			long /*int*/ imContext = imContext ();
 			if (imContext != 0) {
 				long /*int*/ [] preeditString = new long /*int*/ [1];
-				OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
+				GTK.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
 				if (preeditString [0] != 0) {
 					int length = C.strlen (preeditString [0]);
 					OS.g_free (preeditString [0]);
@@ -2361,7 +2361,7 @@ String verifyText (String string, int start, int end) {
 	event.text = string;
 	event.start = start;
 	event.end = end;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventKey gdkEvent = new GdkEventKey ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index cd141d50e9..e88356b997 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -116,7 +116,7 @@ static int checkStyle (int style) {
 
 Control [] _getChildren () {
 	long /*int*/ parentHandle = parentingHandle ();
-	long /*int*/ list = OS.gtk_container_get_children (parentHandle);
+	long /*int*/ list = GTK.gtk_container_get_children (parentHandle);
 	if (list == 0) return new Control [0];
 	int count = OS.g_list_length (list);
 	Control [] children = new Control [count];
@@ -264,30 +264,30 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
 		if (fixed) {
 			fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 			if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-			OS.gtk_widget_set_has_window (fixedHandle, true);
+			GTK.gtk_widget_set_has_window (fixedHandle, true);
 		}
-		long /*int*/ vadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
+		long /*int*/ vadj = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
 		if (vadj == 0) error (SWT.ERROR_NO_HANDLES);
-		long /*int*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
+		long /*int*/ hadj = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
 		if (hadj == 0) error (SWT.ERROR_NO_HANDLES);
-		scrolledHandle = OS.gtk_scrolled_window_new (hadj, vadj);
+		scrolledHandle = GTK.gtk_scrolled_window_new (hadj, vadj);
 		if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	}
 	handle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (handle, true);
-	OS.gtk_widget_set_can_focus (handle, true);
+	GTK.gtk_widget_set_has_window (handle, true);
+	GTK.gtk_widget_set_can_focus (handle, true);
 	if ((style & SWT.EMBEDDED) == 0) {
 		if ((state & CANVAS) != 0) {
 			/* Prevent an input method context from being created for the Browser widget */
 			if (display.getData (NO_INPUT_METHOD) == null) {
-				imHandle = OS.gtk_im_multicontext_new ();
+				imHandle = GTK.gtk_im_multicontext_new ();
 				if (imHandle == 0) error (SWT.ERROR_NO_HANDLES);
 			}
 		}
 	}
 	if (scrolled) {
-		if (fixed) OS.gtk_container_add (fixedHandle, scrolledHandle);
+		if (fixed) GTK.gtk_container_add (fixedHandle, scrolledHandle);
 		/*
 		* Force the scrolledWindow to have a single child that is
 		* not scrolled automatically.  Calling gtk_container_add()
@@ -295,14 +295,14 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
 		*/
 		boolean warnings = display.getWarnings ();
 		display.setWarnings (false);
-		OS.gtk_container_add (scrolledHandle, handle);
+		GTK.gtk_container_add (scrolledHandle, handle);
 		display.setWarnings (warnings);
 
-		int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-		int vsp = (style & SWT.V_SCROLL) != 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-		OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
+		int hsp = (style & SWT.H_SCROLL) != 0 ? GTK.GTK_POLICY_ALWAYS : GTK.GTK_POLICY_NEVER;
+		int vsp = (style & SWT.V_SCROLL) != 0 ? GTK.GTK_POLICY_ALWAYS : GTK.GTK_POLICY_NEVER;
+		GTK.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
 		if (hasBorder ()) {
-			OS.gtk_scrolled_window_set_shadow_type (scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
+			GTK.gtk_scrolled_window_set_shadow_type (scrolledHandle, GTK.GTK_SHADOW_ETCHED_IN);
 		}
 	}
 	if ((style & SWT.EMBEDDED) != 0) {
@@ -312,13 +312,13 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
 					+ "refer to https://bugs.eclipse.org/bugs/show_bug.cgi?id=514487 for development status.").printStackTrace();
 			}
 		} else {
-			socketHandle = OS.gtk_socket_new ();
+			socketHandle = GTK.gtk_socket_new ();
 			if (socketHandle == 0) error (SWT.ERROR_NO_HANDLES);
-			OS.gtk_container_add (handle, socketHandle);
+			GTK.gtk_container_add (handle, socketHandle);
 		}
 	}
 	if ((style & SWT.NO_REDRAW_RESIZE) != 0 && (style & SWT.RIGHT_TO_LEFT) == 0) {
-		OS.gtk_widget_set_redraw_on_allocate (handle, false);
+		GTK.gtk_widget_set_redraw_on_allocate (handle, false);
 	}
 	/*
 	* Bug in GTK.  When a widget is double buffered and the back
@@ -330,21 +330,21 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
 	* is not explicitly set.
 	*/
 	if ((style & SWT.DOUBLE_BUFFERED) == 0 && (style & SWT.NO_BACKGROUND) != 0) {
-		OS.gtk_widget_set_double_buffered (handle, false);
+		GTK.gtk_widget_set_double_buffered (handle, false);
 	}
 }
 
 @Override
 long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
-		long /*int*/ context = OS.gtk_widget_get_style_context(widget);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		long /*int*/ context = GTK.gtk_widget_get_style_context(widget);
 		GtkAllocation allocation = new GtkAllocation();
-		OS.gtk_widget_get_allocation (widget, allocation);
+		GTK.gtk_widget_get_allocation (widget, allocation);
 		int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
 		int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height;
 		// We specify a 0 value for x & y as we want the whole widget to be
 		// colored, not some portion of it.
-		OS.gtk_render_background(context, cairo, 0, 0, width, height);
+		GTK.gtk_render_background(context, cairo, 0, 0, width, height);
 	}
 	return super.gtk_draw(widget, cairo);
 }
@@ -432,7 +432,7 @@ void drawBackgroundInPixels (GC gc, int x, int y, int width, int height, int off
 			Cairo.cairo_surface_destroy (surface);
 			Cairo.cairo_pattern_destroy (pattern);
 		} else {
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				GdkRGBA rgba = control.getBackgroundGdkRGBA ();
 				Cairo.cairo_set_source_rgba (cairo, rgba.red, rgba.green, rgba.blue, rgba.alpha);
 			} else {
@@ -556,9 +556,9 @@ long /*int*/ focusHandle () {
 
 @Override
 boolean forceFocus (long /*int*/ focusHandle) {
-	if (socketHandle != 0) OS.gtk_widget_set_can_focus (focusHandle, true);
+	if (socketHandle != 0) GTK.gtk_widget_set_can_focus (focusHandle, true);
 	boolean result = super.forceFocus (focusHandle);
-	if (socketHandle != 0) OS.gtk_widget_set_can_focus (focusHandle, false);
+	if (socketHandle != 0) GTK.gtk_widget_set_can_focus (focusHandle, false);
 	return result;
 }
 
@@ -616,7 +616,7 @@ int getChildrenCount () {
 	* NOTE: The current implementation will count
 	* non-registered children.
 	*/
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) return 0;
 	int count = OS.g_list_length (list);
 	OS.g_list_free (list);
@@ -633,7 +633,7 @@ Rectangle getClientAreaInPixels () {
 		forceResize ();
 		long /*int*/ clientHandle = clientHandle ();
 		GtkAllocation allocation = new GtkAllocation();
-		OS.gtk_widget_get_allocation (clientHandle, allocation);
+		GTK.gtk_widget_get_allocation (clientHandle, allocation);
 		int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
 		int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height;
 		return new Rectangle (0, 0, width, height);
@@ -813,7 +813,7 @@ long /*int*/ gtk_realize (long /*int*/ widget) {
 	if ((style & SWT.NO_BACKGROUND) != 0) {
 		long /*int*/ window = gtk_widget_get_window (paintHandle ());
 		if (window != 0) {
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				OS.gdk_window_set_background_pattern(window, 0);
 			} else {
 				OS.gdk_window_set_back_pixmap (window, 0, false);
@@ -821,7 +821,7 @@ long /*int*/ gtk_realize (long /*int*/ widget) {
 		}
 	}
 	if (socketHandle != 0) {
-		embeddedHandle = OS.gtk_socket_get_id (socketHandle);
+		embeddedHandle = GTK.gtk_socket_get_id (socketHandle);
 	}
 	return result;
 }
@@ -851,7 +851,7 @@ boolean hasBorder () {
 void hookEvents () {
 	super.hookEvents ();
 	if ((state & CANVAS) != 0) {
-		OS.gtk_widget_add_events (handle, OS.GDK_POINTER_MOTION_HINT_MASK);
+		GTK.gtk_widget_add_events (handle, OS.GDK_POINTER_MOTION_HINT_MASK);
 		if (scrolledHandle != 0) {
 			OS.g_signal_connect_closure (scrolledHandle, OS.scroll_child, display.getClosure (SCROLL_CHILD), false);
 		}
@@ -1195,7 +1195,7 @@ void markLayout (boolean changed, boolean all) {
 void moveAbove (long /*int*/ child, long /*int*/ sibling) {
 	if (child == sibling) return;
 	long /*int*/ parentHandle = parentingHandle ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		OS.swt_fixed_restack (parentHandle, child, sibling, true);
 		return;
 	}
@@ -1240,7 +1240,7 @@ void moveBelow (long /*int*/ child, long /*int*/ sibling) {
 		moveAbove (child, scrolledHandle != 0  ? scrolledHandle : handle);
 		return;
 	}
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		OS.swt_fixed_restack (parentHandle, child, sibling, false);
 		return;
 	}
@@ -1285,7 +1285,7 @@ void moveChildren(int oldWidth) {
 		Control child = children[i];
 		long /*int*/ topHandle = child.topHandle ();
 		GtkAllocation allocation = new GtkAllocation();
-		OS.gtk_widget_get_allocation (topHandle, allocation);
+		GTK.gtk_widget_get_allocation (topHandle, allocation);
 		int x = allocation.x;
 		int y = allocation.y;
 		int controlWidth = (child.state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -1305,7 +1305,7 @@ void moveChildren(int oldWidth) {
 		gtk_widget_size_request (topHandle, requisition);
 		allocation.x = x;
 		allocation.y = y;
-		OS.gtk_widget_size_allocate (topHandle, allocation);
+		GTK.gtk_widget_size_allocate (topHandle, allocation);
 		Control control = child.findBackgroundControl ();
 		if (control != null && control.backgroundImage != null) {
 			if (child.isVisible ()) child.redrawWidget (0, 0, 0, 0, true, true, true);
@@ -1428,10 +1428,10 @@ void reskinChildren (int flags) {
 void resizeHandle (int width, int height) {
 	super.resizeHandle (width, height);
 	if (socketHandle != 0) {
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			OS.swt_fixed_resize (handle, socketHandle, width, height);
 		} else {
-			OS.gtk_widget_set_size_request (socketHandle, width, height);
+			GTK.gtk_widget_set_size_request (socketHandle, width, height);
 		}
 	}
 }
@@ -1482,11 +1482,11 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	 * consider moving this fix higher into Control's setBound(...) method instead.
 	 */
 	long /*int*/ topHandle = topHandle ();
-	if (OS.GTK_VERSION >= OS.VERSION (3, 8, 0)
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 8, 0)
 			&& fixedHandle != 0 && handle != 0
-			&& getVisible() && !OS.gtk_widget_get_visible(topHandle) //if SWT State is not HIDDEN, but widget is hidden on GTK side.
+			&& getVisible() && !GTK.gtk_widget_get_visible(topHandle) //if SWT State is not HIDDEN, but widget is hidden on GTK side.
 			&& topHandle == fixedHandle && width > 0 && height > 0 && resize) {
-		OS.gtk_widget_show(topHandle);
+		GTK.gtk_widget_show(topHandle);
 	}
 
 	int result = super.setBounds (x, y, width, height, move, resize);
@@ -1604,10 +1604,10 @@ boolean setTabGroupFocus (boolean next) {
 boolean setTabItemFocus (boolean next) {
 	if (!super.setTabItemFocus (next)) return false;
 	if (socketHandle != 0) {
-		int direction = next ? OS.GTK_DIR_TAB_FORWARD : OS.GTK_DIR_TAB_BACKWARD;
-		OS.GTK_WIDGET_UNSET_FLAGS (socketHandle, OS.GTK_HAS_FOCUS);
-		OS.gtk_widget_child_focus (socketHandle, direction);
-		OS.GTK_WIDGET_SET_FLAGS (socketHandle, OS.GTK_HAS_FOCUS);
+		int direction = next ? GTK.GTK_DIR_TAB_FORWARD : GTK.GTK_DIR_TAB_BACKWARD;
+		GTK.GTK_WIDGET_UNSET_FLAGS (socketHandle, GTK.GTK_HAS_FOCUS);
+		GTK.gtk_widget_child_focus (socketHandle, direction);
+		GTK.GTK_WIDGET_SET_FLAGS (socketHandle, GTK.GTK_HAS_FOCUS);
 	}
 	return true;
 }
@@ -1647,8 +1647,8 @@ public void setTabList (Control [] tabList) {
 void showWidget () {
 	super.showWidget ();
 	if (socketHandle != 0) {
-		OS.gtk_widget_show (socketHandle);
-		embeddedHandle = OS.gtk_socket_get_id (socketHandle);
+		GTK.gtk_widget_show (socketHandle);
+		embeddedHandle = GTK.gtk_socket_get_id (socketHandle);
 	}
 	if (scrolledHandle == 0) fixStyle (handle);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 55e5904726..0bcce5b60c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -134,7 +134,7 @@ public Control (Composite parent, int style) {
 void connectPaint () {
 	long /*int*/ paintHandle = paintHandle ();
 	int paintMask = OS.GDK_EXPOSURE_MASK;
-	OS.gtk_widget_add_events (paintHandle, paintMask);
+	GTK.gtk_widget_add_events (paintHandle, paintMask);
 
 	OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [DRAW], 0, display.getClosure (EXPOSE_EVENT_INVERSE), false);
 
@@ -146,7 +146,7 @@ Font defaultFont () {
 }
 
 GdkRGBA defaultBackground () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	return display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND).handleRGBA;
 }
 
@@ -185,7 +185,7 @@ void drawBackground (Control control, long /*int*/ window, long /*int*/ cr, long
 		Cairo.cairo_pattern_destroy (pattern);
 	} else {
 		GdkRGBA rgba;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			rgba = control.getBackgroundGdkRGBA();
 			Cairo.cairo_set_source_rgba (cairo, rgba.red, rgba.green, rgba.blue, rgba.alpha);
 		} else {
@@ -202,17 +202,17 @@ boolean drawGripper (GC gc, int x, int y, int width, int height, boolean vertica
 	long /*int*/ paintHandle = paintHandle ();
 	long /*int*/ window = gtk_widget_get_window (paintHandle);
 	if (window == 0) return false;
-	int orientation = vertical ? OS.GTK_ORIENTATION_HORIZONTAL : OS.GTK_ORIENTATION_VERTICAL;
+	int orientation = vertical ? GTK.GTK_ORIENTATION_HORIZONTAL : GTK.GTK_ORIENTATION_VERTICAL;
 	if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x;
-	if (OS.GTK3) {
-		long /*int*/ context = OS.gtk_widget_get_style_context (paintHandle);
-		OS.gtk_style_context_save (context);
-		OS.gtk_style_context_add_class (context, OS.GTK_STYLE_CLASS_PANE_SEPARATOR);
-		OS.gtk_style_context_set_state (context, OS.GTK_STATE_FLAG_NORMAL);
-		OS.gtk_render_handle (context, gc.handle, x, y, width, height);
-		OS.gtk_style_context_restore (context);
+	if (GTK.GTK3) {
+		long /*int*/ context = GTK.gtk_widget_get_style_context (paintHandle);
+		GTK.gtk_style_context_save (context);
+		GTK.gtk_style_context_add_class (context, GTK.GTK_STYLE_CLASS_PANE_SEPARATOR);
+		GTK.gtk_style_context_set_state (context, GTK.GTK_STATE_FLAG_NORMAL);
+		GTK.gtk_render_handle (context, gc.handle, x, y, width, height);
+		GTK.gtk_style_context_restore (context);
 	} else {
-		OS.gtk_paint_handle (OS.gtk_widget_get_style (paintHandle), window, OS.GTK_STATE_NORMAL, OS.GTK_SHADOW_OUT, null, paintHandle, new byte [1], x, y, width, height, orientation);
+		GTK.gtk_paint_handle (GTK.gtk_widget_get_style (paintHandle), window, GTK.GTK_STATE_NORMAL, GTK.GTK_SHADOW_OUT, null, paintHandle, new byte [1], x, y, width, height, orientation);
 	}
 	return true;
 }
@@ -221,7 +221,7 @@ void drawWidget (GC gc) {
 }
 
 void enableWidget (boolean enabled) {
-	OS.gtk_widget_set_sensitive (handle, enabled);
+	GTK.gtk_widget_set_sensitive (handle, enabled);
 }
 
 long /*int*/ enterExitHandle () {
@@ -234,7 +234,7 @@ long /*int*/ eventHandle () {
 
 long /*int*/ eventWindow () {
 	long /*int*/ eventHandle = eventHandle ();
-	OS.gtk_widget_realize (eventHandle);
+	GTK.gtk_widget_realize (eventHandle);
 	return gtk_widget_get_window (eventHandle);
 }
 
@@ -246,11 +246,11 @@ void fixFocus (Control focusControl) {
 	}
 	shell.setSavedFocus (focusControl);
 	long /*int*/ focusHandle = shell.vboxHandle;
-	OS.gtk_widget_set_can_focus (focusHandle, true);
-	OS.gtk_widget_grab_focus (focusHandle);
+	GTK.gtk_widget_set_can_focus (focusHandle, true);
+	GTK.gtk_widget_grab_focus (focusHandle);
 	// widget could be disposed at this point
 	if (isDisposed ()) return;
-	OS.gtk_widget_set_can_focus (focusHandle, false);
+	GTK.gtk_widget_set_can_focus (focusHandle, false);
 }
 
 void fixStyle () {
@@ -271,11 +271,11 @@ void fixStyle (long /*int*/ handle) {
 	*/
 	if ((state & BACKGROUND) != 0) return;
 	if ((state & THEME_BACKGROUND) == 0) return;
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		long /*int*/ childStyle = parent.childStyle ();
 		if (childStyle != 0) {
 			GdkColor color = new GdkColor();
-			OS.gtk_style_get_bg (childStyle, 0, color);
+			GTK.gtk_style_get_bg (childStyle, 0, color);
 			setBackgroundGdkColor (color);
 		}
 	}
@@ -339,7 +339,7 @@ void hookEvents () {
 	/* Connect the keyboard signals */
 	long /*int*/ focusHandle = focusHandle ();
 	int focusMask = OS.GDK_KEY_PRESS_MASK | OS.GDK_KEY_RELEASE_MASK | OS.GDK_FOCUS_CHANGE_MASK;
-	OS.gtk_widget_add_events (focusHandle, focusMask);
+	GTK.gtk_widget_add_events (focusHandle, focusMask);
 	OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [POPUP_MENU], 0, display.getClosure (POPUP_MENU), false);
 	OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [SHOW_HELP], 0, display.getClosure (SHOW_HELP), false);
 	OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [KEY_PRESS_EVENT], 0, display.getClosure (KEY_PRESS_EVENT), false);
@@ -351,7 +351,7 @@ void hookEvents () {
 	/* Connect the mouse signals */
 	long /*int*/ eventHandle = eventHandle ();
 	int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK | OS.GDK_SCROLL_MASK | OS.GDK_SMOOTH_SCROLL_MASK;
-	OS.gtk_widget_add_events (eventHandle, eventMask);
+	GTK.gtk_widget_add_events (eventHandle, eventMask);
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.getClosure (BUTTON_PRESS_EVENT), false);
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.getClosure (BUTTON_RELEASE_EVENT), false);
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.getClosure (MOTION_NOTIFY_EVENT), false);
@@ -360,7 +360,7 @@ void hookEvents () {
 	/* Connect enter/exit signals */
 	long /*int*/ enterExitHandle = enterExitHandle ();
 	int enterExitMask = OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK;
-	OS.gtk_widget_add_events (enterExitHandle, enterExitMask);
+	GTK.gtk_widget_add_events (enterExitHandle, enterExitMask);
 	OS.g_signal_connect_closure_by_id (enterExitHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.getClosure (ENTER_NOTIFY_EVENT), false);
 	OS.g_signal_connect_closure_by_id (enterExitHandle, display.signalIds [LEAVE_NOTIFY_EVENT], 0, display.getClosure (LEAVE_NOTIFY_EVENT), false);
 
@@ -407,11 +407,11 @@ void hookEvents () {
 	long /*int*/ topHandle = topHandle ();
 	OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.getClosure (MAP), true);
 
-	if (enterNotifyEventFunc == null && OS.GTK3 && OS.GTK_VERSION < OS.VERSION (3, 11, 9)) {
+	if (enterNotifyEventFunc == null && GTK.GTK3 && GTK.GTK_VERSION < OS.VERSION (3, 11, 9)) {
 		enterNotifyEventFunc = new Callback (Control.class, "enterNotifyEventProc", 4);
 		if (enterNotifyEventFunc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 
-		enterNotifyEventSignalId = OS.g_signal_lookup (OS.enter_notify_event, OS.GTK_TYPE_WIDGET ());
+		enterNotifyEventSignalId = OS.g_signal_lookup (OS.enter_notify_event, GTK.GTK_TYPE_WIDGET ());
 
 		byte [] buffer = Converter.wcsToMbcs ("gtk-pointer-window", true);
 		GTK_POINTER_WINDOW = OS.g_quark_from_string (buffer);
@@ -443,8 +443,8 @@ long /*int*/ paintHandle () {
 	long /*int*/ topHandle = topHandle ();
 	long /*int*/ paintHandle = handle;
 	while (paintHandle != topHandle) {
-		if (OS.gtk_widget_get_has_window (paintHandle)) break;
-		paintHandle = OS.gtk_widget_get_parent (paintHandle);
+		if (GTK.gtk_widget_get_has_window (paintHandle)) break;
+		paintHandle = GTK.gtk_widget_get_parent (paintHandle);
 	}
 	return paintHandle;
 }
@@ -452,7 +452,7 @@ long /*int*/ paintHandle () {
 @Override
 long /*int*/ paintWindow () {
 	long /*int*/ paintHandle = paintHandle ();
-	OS.gtk_widget_realize (paintHandle);
+	GTK.gtk_widget_realize (paintHandle);
 	return gtk_widget_get_window (paintHandle);
 }
 
@@ -478,9 +478,9 @@ public boolean print (GC gc) {
 	if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	long /*int*/ topHandle = topHandle ();
-	OS.gtk_widget_realize (topHandle);
-	if (OS.GTK3) {
-		OS.gtk_widget_draw(topHandle, gc.handle);
+	GTK.gtk_widget_realize (topHandle);
+	if (GTK.GTK3) {
+		GTK.gtk_widget_draw(topHandle, gc.handle);
 		return true;
 	}
 	long /*int*/ window = gtk_widget_get_window (topHandle);
@@ -523,7 +523,7 @@ void printWindow (boolean first, Control control, GC gc, long /*int*/ drawable,
 		event.area_height = rect.height;
 		event.region = OS.gdk_region_rectangle (rect);
 		OS.memmove (eventPtr, event, GdkEventExpose.sizeof);
-		OS.gtk_widget_send_expose (userData [0], eventPtr);
+		GTK.gtk_widget_send_expose (userData [0], eventPtr);
 		OS.gdk_event_free (eventPtr);
 	}
 	int destX = x, destY = y, destWidth = width [0], destHeight = height [0];
@@ -686,7 +686,7 @@ void checkForeground () {
 	*
 	* This can be removed on GTK3.16+.
 	*/
-	if (OS.GTK_VERSION < OS.VERSION(3, 14, 0) && OS.GTK_VERSION >= OS.VERSION(3, 0, 0)) {
+	if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0) && GTK.GTK_VERSION >= OS.VERSION(3, 0, 0)) {
 		setForegroundGdkRGBA (topHandle (), display.COLOR_WIDGET_FOREGROUND_RGBA);
 	}
 }
@@ -772,19 +772,19 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 
 Point computeNativeSize (long /*int*/ h, int wHint, int hHint, boolean changed) {
 	int width = wHint, height = hHint;
-	if (OS.GTK3){
+	if (GTK.GTK3){
 		if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) {
 			GtkRequisition requisition = new GtkRequisition ();
-			OS.gtk_widget_get_preferred_size (h, null, requisition);
+			GTK.gtk_widget_get_preferred_size (h, null, requisition);
 			width = requisition.width;
 			height = requisition.height;
 		} else if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) {
 			int [] natural_size = new int [1];
 			if (wHint == SWT.DEFAULT) {
-				OS.gtk_widget_get_preferred_width_for_height (h, height, null, natural_size);
+				GTK.gtk_widget_get_preferred_width_for_height (h, height, null, natural_size);
 				width = natural_size [0];
 			} else {
-				OS.gtk_widget_get_preferred_height_for_width (h, width, null, natural_size);
+				GTK.gtk_widget_get_preferred_height_for_width (h, width, null, natural_size);
 				height = natural_size [0];
 			}
 		}
@@ -793,15 +793,15 @@ Point computeNativeSize (long /*int*/ h, int wHint, int hHint, boolean changed)
 	if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) {
 		GtkRequisition requisition = new GtkRequisition ();
 		gtk_widget_size_request (h, requisition);
-		width = OS.GTK_WIDGET_REQUISITION_WIDTH (h);
-		height = OS.GTK_WIDGET_REQUISITION_HEIGHT (h);
+		width = GTK.GTK_WIDGET_REQUISITION_WIDTH (h);
+		height = GTK.GTK_WIDGET_REQUISITION_HEIGHT (h);
 	} else if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) {
 		int [] reqWidth = new int [1], reqHeight = new int [1];
-		OS.gtk_widget_get_size_request (h, reqWidth, reqHeight);
-		OS.gtk_widget_set_size_request (h, wHint, hHint);
+		GTK.gtk_widget_get_size_request (h, reqWidth, reqHeight);
+		GTK.gtk_widget_set_size_request (h, wHint, hHint);
 		GtkRequisition requisition = new GtkRequisition ();
 		gtk_widget_size_request (h, requisition);
-		OS.gtk_widget_set_size_request (h, reqWidth [0], reqHeight [0]);
+		GTK.gtk_widget_set_size_request (h, reqWidth [0], reqHeight [0]);
 		width = wHint == SWT.DEFAULT ? requisition.width : wHint;
 		height = hHint == SWT.DEFAULT ? requisition.height : hHint;
 	}
@@ -818,8 +818,8 @@ void forceResize () {
 	GtkRequisition requisition = new GtkRequisition ();
 	gtk_widget_size_request (topHandle, requisition);
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation(topHandle, allocation);
-	OS.gtk_widget_size_allocate (topHandle, allocation);
+	GTK.gtk_widget_get_allocation(topHandle, allocation);
+	GTK.gtk_widget_size_allocate (topHandle, allocation);
 }
 
 /**
@@ -876,7 +876,7 @@ Rectangle getBoundsInPixels () {
 	checkWidget();
 	long /*int*/ topHandle = topHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (topHandle, allocation);
+	GTK.gtk_widget_get_allocation (topHandle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -978,7 +978,7 @@ void modifyStyle (long /*int*/ handle, long /*int*/ style) {
 void moveHandle (int x, int y) {
 	long /*int*/ topHandle = topHandle ();
 	long /*int*/ parentHandle = parent.parentingHandle ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		OS.swt_fixed_move (parentHandle, topHandle, x, y);
 	} else {
 		/*
@@ -991,26 +991,26 @@ void moveHandle (int x, int y) {
 		*
 		* NOTE: There is no API in GTK 3 to only set the GTK_VISIBLE bit.
 		*/
-		boolean reset = OS.gtk_widget_get_visible (parentHandle);
+		boolean reset = GTK.gtk_widget_get_visible (parentHandle);
 		gtk_widget_set_visible (parentHandle, false);
-		OS.gtk_fixed_move (parentHandle, topHandle, x, y);
+		GTK.gtk_fixed_move (parentHandle, topHandle, x, y);
 		gtk_widget_set_visible (parentHandle, reset);
 	}
 }
 
 void resizeHandle (int width, int height) {
 	long /*int*/ topHandle = topHandle ();
-	if (OS.GTK3) {
-		OS.swt_fixed_resize (OS.gtk_widget_get_parent (topHandle), topHandle, width, height);
+	if (GTK.GTK3) {
+		OS.swt_fixed_resize (GTK.gtk_widget_get_parent (topHandle), topHandle, width, height);
 		if (topHandle != handle) {
 			Point sizes = resizeCalculationsGTK3 (handle, width, height);
 			width = sizes.x;
 			height = sizes.y;
-			OS.swt_fixed_resize (OS.gtk_widget_get_parent (handle), handle, width, height);
+			OS.swt_fixed_resize (GTK.gtk_widget_get_parent (handle), handle, width, height);
 		}
 	} else {
-		OS.gtk_widget_set_size_request (topHandle, width, height);
-		if (topHandle != handle) OS.gtk_widget_set_size_request (handle, width, height);
+		GTK.gtk_widget_set_size_request (topHandle, width, height);
+		if (topHandle != handle) GTK.gtk_widget_set_size_request (handle, width, height);
 	}
 }
 
@@ -1021,9 +1021,9 @@ Point resizeCalculationsGTK3 (long /*int*/ widget, int width, int height) {
 	 * elements which we cannot access. If the to-be-allocated size minus
 	 * these elements is < 0, allocate the preferred size instead. See bug 486068.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 		GtkRequisition requisition = new GtkRequisition();
-		OS.gtk_widget_get_preferred_size(widget, requisition, null);
+		GTK.gtk_widget_get_preferred_size(widget, requisition, null);
 		sizes.x = (width - (requisition.width - width)) < 0 ? requisition.width : width;
 		sizes.y = (height - (requisition.height - height)) < 0 ? requisition.height : height;
 	}
@@ -1038,7 +1038,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	long /*int*/ topHandle = topHandle ();
 	boolean sendMove = move;
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (topHandle, allocation);
+	GTK.gtk_widget_get_allocation (topHandle, allocation);
 	if ((parent.style & SWT.MIRRORED) != 0) {
 		int clientWidth = parent.getClientWidth ();
 		int oldWidth = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -1103,13 +1103,13 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 		 * in GTK 3.8 otherwise its allocation return 0
                  * See org.eclipse.swt.tests.gtk.snippets.Bug497705_setBoundsAfterSetVisible
 		 */
-		if (OS.GTK_VERSION >= OS.VERSION (3, 8, 0) && !OS.gtk_widget_get_visible(topHandle))  {
-			OS.gtk_widget_show(topHandle);
+		if (GTK.GTK_VERSION >= OS.VERSION (3, 8, 0) && !GTK.gtk_widget_get_visible(topHandle))  {
+			GTK.gtk_widget_show(topHandle);
 			gtk_widget_get_preferred_size (topHandle, requisition);
-			OS.gtk_widget_size_allocate (topHandle, allocation);
-			OS.gtk_widget_hide(topHandle);
+			GTK.gtk_widget_size_allocate (topHandle, allocation);
+			GTK.gtk_widget_hide(topHandle);
 		} else {
-			OS.gtk_widget_size_allocate (topHandle, allocation);
+			GTK.gtk_widget_size_allocate (topHandle, allocation);
 		}
 	}
 	/*
@@ -1124,13 +1124,13 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 			if (enableWindow != 0) {
 				OS.gdk_window_hide (enableWindow);
 			}
-			OS.gtk_widget_hide (topHandle);
+			GTK.gtk_widget_hide (topHandle);
 		} else {
 			if ((state & HIDDEN) == 0) {
 				if (enableWindow != 0) {
 					OS.gdk_window_show_unraised (enableWindow);
 				}
-				OS.gtk_widget_show (topHandle);
+				GTK.gtk_widget_show (topHandle);
 			}
 		}
 		if ((style & SWT.MIRRORED) != 0) moveChildren (clientWidth);
@@ -1173,7 +1173,7 @@ Point getLocationInPixels () {
 	checkWidget();
 	long /*int*/ topHandle = topHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (topHandle, allocation);
+	GTK.gtk_widget_get_allocation (topHandle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	if ((parent.style & SWT.MIRRORED) != 0) {
@@ -1258,7 +1258,7 @@ Point getSizeInPixels () {
 	checkWidget();
 	long /*int*/ topHandle = topHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (topHandle, allocation);
+	GTK.gtk_widget_get_allocation (topHandle, allocation);
 	int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
 	int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height;
 	return new Point (width, height);
@@ -1328,7 +1328,7 @@ public void setRegion (Region region) {
 
 void setRelations () {
 	long /*int*/ parentHandle = parent.parentingHandle ();
-	long /*int*/ list = OS.gtk_container_get_children (parentHandle);
+	long /*int*/ list = GTK.gtk_container_get_children (parentHandle);
 	if (list == 0) return;
 	int count = OS.g_list_length (list);
 	if (count > 1) {
@@ -2528,9 +2528,9 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 		double [] offsetY = new double [1];
 		double [] startX = new double[1];
 		double [] startY = new double [1];
-		if (OS.gtk_gesture_drag_get_start_point(dragGesture, startX, startY)) {
-			OS.gtk_gesture_drag_get_offset(dragGesture, offsetX, offsetY);
-			if (OS.gtk_drag_check_threshold(handle, (int)startX[0], (int) startY[0], (int) startX[0]
+		if (GTK.gtk_gesture_drag_get_start_point(dragGesture, startX, startY)) {
+			GTK.gtk_gesture_drag_get_offset(dragGesture, offsetX, offsetY);
+			if (GTK.gtk_drag_check_threshold(handle, (int)startX[0], (int) startY[0], (int) startX[0]
 					+ (int) offsetX[0], (int) startY[0] + (int) offsetY[0])) {
 				dragging = true;
 			}
@@ -2546,7 +2546,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 		//Note, input params x/y are relative, the two points below are absolute coords.
 		Point startPos = null;
 		Point currPos = null;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			startPos = display.getCursorLocationInPixels();
 		}
 
@@ -2564,9 +2564,9 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 				if (eventPtr != 0) {
 					break;
 				} else {
-					if (OS.GTK3) { //428852
+					if (GTK.GTK3) { //428852
 						currPos = display.getCursorLocationInPixels();
-						dragging = OS.gtk_drag_check_threshold (handle,
+						dragging = GTK.gtk_drag_check_threshold (handle,
 									startPos.x, startPos.y, currPos.x, currPos.y);
 						if (dragging) break;
 					} else {
@@ -2583,7 +2583,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 					GdkEventMotion gdkMotionEvent = new GdkEventMotion ();
 					OS.memmove (gdkMotionEvent, eventPtr, GdkEventMotion.sizeof);
 					if ((gdkMotionEvent.state & OS.GDK_BUTTON1_MASK) != 0) {
-						if (OS.gtk_drag_check_threshold (handle, x, y, (int) gdkMotionEvent.x, (int) gdkMotionEvent.y)) {
+						if (GTK.gtk_drag_check_threshold (handle, x, y, (int) gdkMotionEvent.x, (int) gdkMotionEvent.y)) {
 							dragging = true;
 							quit = true;
 						}
@@ -2610,7 +2610,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 					break;
 				}
 				default:
-					OS.gtk_main_do_event (eventPtr);
+					GTK.gtk_main_do_event (eventPtr);
 			}
 			OS.gdk_event_free (eventPtr);
 		}
@@ -2621,7 +2621,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 boolean filterKey (int keyval, long /*int*/ event) {
 	long /*int*/ imHandle = imHandle ();
 	if (imHandle != 0) {
-		return OS.gtk_im_context_filter_keypress (imHandle, event);
+		return GTK.gtk_im_context_filter_keypress (imHandle, event);
 	}
 	return false;
 }
@@ -2643,20 +2643,20 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
 
 @Override
 long /*int*/ fixedMapProc (long /*int*/ widget) {
-	OS.gtk_widget_set_mapped (widget, true);
-	long /*int*/ widgetList = OS.gtk_container_get_children (widget);
+	GTK.gtk_widget_set_mapped (widget, true);
+	long /*int*/ widgetList = GTK.gtk_container_get_children (widget);
 	if (widgetList != 0) {
 		long /*int*/ widgets = widgetList;
 		while (widgets != 0) {
 			long /*int*/ child = OS.g_list_data (widgets);
-			if (OS.gtk_widget_get_visible (child) && OS.gtk_widget_get_child_visible (child) && !OS.gtk_widget_get_mapped (child)) {
-				OS.gtk_widget_map (child);
+			if (GTK.gtk_widget_get_visible (child) && GTK.gtk_widget_get_child_visible (child) && !GTK.gtk_widget_get_mapped (child)) {
+				GTK.gtk_widget_map (child);
 			}
 			widgets = OS.g_list_next (widgets);
 		}
 		OS.g_list_free (widgetList);
 	}
-	if (OS.gtk_widget_get_has_window (widget)) {
+	if (GTK.gtk_widget_get_has_window (widget)) {
 		OS.gdk_window_show_unraised (gtk_widget_get_window (widget));
 	}
 	return 0;
@@ -2689,15 +2689,15 @@ public boolean forceFocus () {
 }
 
 boolean forceFocus (long /*int*/ focusHandle) {
-	if (OS.gtk_widget_has_focus (focusHandle)) return true;
+	if (GTK.gtk_widget_has_focus (focusHandle)) return true;
 	/* When the control is zero sized it must be realized */
-	OS.gtk_widget_realize (focusHandle);
-	OS.gtk_widget_grab_focus (focusHandle);
+	GTK.gtk_widget_realize (focusHandle);
+	GTK.gtk_widget_grab_focus (focusHandle);
 	// widget could be disposed at this point
 	if (isDisposed ()) return false;
 	Shell shell = getShell ();
 	long /*int*/ shellHandle = shell.shellHandle;
-	long /*int*/ handle = OS.gtk_window_get_focus (shellHandle);
+	long /*int*/ handle = GTK.gtk_window_get_focus (shellHandle);
 	while (handle != 0) {
 		if (handle == focusHandle) {
 			/* Cancel any previous ignoreFocus requests */
@@ -2708,7 +2708,7 @@ boolean forceFocus (long /*int*/ focusHandle) {
 		if (widget != null && widget instanceof Control) {
 			return widget == this;
 		}
-		handle = OS.gtk_widget_get_parent (handle);
+		handle = GTK.gtk_widget_get_parent (handle);
 	}
 	return false;
 }
@@ -2730,7 +2730,7 @@ boolean forceFocus (long /*int*/ focusHandle) {
 public Color getBackground () {
 	checkWidget();
 	Color color;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		if (backgroundAlpha == 0) {
 			color = Color.gtk_new (display, this.getBackgroundGdkRGBA (), 0);
 			return color;
@@ -2754,12 +2754,12 @@ public Color getBackground () {
 }
 
 GdkRGBA getBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	return getBgGdkRGBA ();
 }
 
 GdkColor getBackgroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getBgGdkColor ();
 }
 
@@ -2783,67 +2783,67 @@ public Image getBackgroundImage () {
 }
 
 GdkRGBA getContextBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	long /*int*/ fontHandle = fontHandle ();
 	if ((state & BACKGROUND) == 0) {
 		return defaultBackground();
 	}
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		if (provider != 0) {
 			return display.gtk_css_parse_background (provider, null);
 		} else {
 			return defaultBackground();
 		}
 	} else {
-		long /*int*/ context = OS.gtk_widget_get_style_context (fontHandle);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (fontHandle);
 		GdkRGBA rgba = new GdkRGBA ();
-		OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
+		GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba);
 		return rgba;
 	}
 }
 
 GdkRGBA getContextColorGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	long /*int*/ fontHandle = fontHandle ();
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		return display.gtk_css_parse_foreground(provider, null);
 	} else {
-		long /*int*/ context = OS.gtk_widget_get_style_context (fontHandle);
-		GdkRGBA rgba = display.styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (fontHandle);
+		GdkRGBA rgba = display.styleContextGetColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 		return rgba;
 	}
 }
 
 GdkRGBA getBgGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	return getContextBackgroundGdkRGBA ();
 }
 
 GdkColor getBgGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	long /*int*/ fontHandle = fontHandle ();
-	OS.gtk_widget_realize (fontHandle);
+	GTK.gtk_widget_realize (fontHandle);
 	GdkColor color = new GdkColor ();
 
-	long /*int*/ style = OS.gtk_widget_get_style (fontHandle);
+	long /*int*/ style = GTK.gtk_widget_get_style (fontHandle);
 	if (style != 0){
-		OS.gtk_style_get_bg (style, OS.GTK_STATE_NORMAL, color);
+		GTK.gtk_style_get_bg (style, GTK.GTK_STATE_NORMAL, color);
 	}
 
 	return color;
 }
 
 GdkRGBA getBaseGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	return getContextBackgroundGdkRGBA ();
 }
 
 GdkColor getBaseGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	long /*int*/ fontHandle = fontHandle ();
-	OS.gtk_widget_realize (fontHandle);
+	GTK.gtk_widget_realize (fontHandle);
 	GdkColor color = new GdkColor ();
-	OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
+	GTK.gtk_style_get_base (GTK.gtk_widget_get_style (fontHandle), GTK.GTK_STATE_NORMAL, color);
 	return color;
 }
 
@@ -2869,7 +2869,7 @@ int getBorderWidthInPixels () {
 int getClientWidth () {
 	if (handle == 0 || (state & ZERO_WIDTH) != 0) return 0;
 	GtkAllocation allocation = new GtkAllocation();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	return allocation.width;
 }
 
@@ -2950,23 +2950,23 @@ public Font getFont () {
 long /*int*/ getFontDescription () {
 	long /*int*/ fontHandle = fontHandle ();
 	long /*int*/ [] fontDesc = new long /*int*/ [1];
-	if (OS.GTK3) {
-		long /*int*/ context = OS.gtk_widget_get_style_context (fontHandle);
-		if (OS.GTK_VERSION < OS.VERSION(3, 8, 0)) {
-			return OS.gtk_style_context_get_font(context, OS.GTK_STATE_FLAG_NORMAL);
-		} else if (OS.GTK_VERSION >= OS.VERSION(3, 18, 0)) {
-			OS.gtk_style_context_save(context);
-			OS.gtk_style_context_set_state(context, OS.GTK_STATE_FLAG_NORMAL);
-			OS.gtk_style_context_get(context, OS.GTK_STATE_FLAG_NORMAL, OS.gtk_style_property_font, fontDesc, 0);
-			OS.gtk_style_context_restore(context);
+	if (GTK.GTK3) {
+		long /*int*/ context = GTK.gtk_widget_get_style_context (fontHandle);
+		if (GTK.GTK_VERSION < OS.VERSION(3, 8, 0)) {
+			return GTK.gtk_style_context_get_font(context, GTK.GTK_STATE_FLAG_NORMAL);
+		} else if (GTK.GTK_VERSION >= OS.VERSION(3, 18, 0)) {
+			GTK.gtk_style_context_save(context);
+			GTK.gtk_style_context_set_state(context, GTK.GTK_STATE_FLAG_NORMAL);
+			GTK.gtk_style_context_get(context, GTK.GTK_STATE_FLAG_NORMAL, GTK.gtk_style_property_font, fontDesc, 0);
+			GTK.gtk_style_context_restore(context);
 			return fontDesc [0];
 		} else {
-			OS.gtk_style_context_get(context, OS.GTK_STATE_FLAG_NORMAL, OS.gtk_style_property_font, fontDesc, 0);
+			GTK.gtk_style_context_get(context, GTK.GTK_STATE_FLAG_NORMAL, GTK.gtk_style_property_font, fontDesc, 0);
 			return fontDesc [0];
 		}
 	}
-	OS.gtk_widget_realize (fontHandle);
-	return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));
+	GTK.gtk_widget_realize (fontHandle);
+	return GTK.gtk_style_get_font_desc (GTK.gtk_widget_get_style (fontHandle));
 }
 
 /**
@@ -2982,29 +2982,29 @@ long /*int*/ getFontDescription () {
 public Color getForeground () {
 	checkWidget();
 	Color color;
-	color = OS.GTK3? Color.gtk_new (display, getForegroundGdkRGBA ()) : Color.gtk_new (display, getForegroundGdkColor ());
+	color = GTK.GTK3? Color.gtk_new (display, getForegroundGdkRGBA ()) : Color.gtk_new (display, getForegroundGdkColor ());
 	return color;
 }
 
 GdkRGBA getForegroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	return getContextColorGdkRGBA();
 }
 
 GdkColor getForegroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getFgColor ();
 }
 
 GdkColor getFgColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	long /*int*/ fontHandle = fontHandle ();
-	OS.gtk_widget_realize (fontHandle);
+	GTK.gtk_widget_realize (fontHandle);
 	GdkColor color = new GdkColor ();
 
-	long /*int*/ style = OS.gtk_widget_get_style (fontHandle);
+	long /*int*/ style = GTK.gtk_widget_get_style (fontHandle);
 	if (style != 0){
-		OS.gtk_style_get_fg (style, OS.GTK_STATE_NORMAL, color);
+		GTK.gtk_style_get_fg (style, GTK.GTK_STATE_NORMAL, color);
 	}
 	return color;
 }
@@ -3014,11 +3014,11 @@ Point getIMCaretPos () {
 }
 
 GdkColor getTextColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	long /*int*/ fontHandle = fontHandle ();
-	OS.gtk_widget_realize (fontHandle);
+	GTK.gtk_widget_realize (fontHandle);
 	GdkColor color = new GdkColor ();
-	OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
+	GTK.gtk_style_get_text (GTK.gtk_widget_get_style (fontHandle), GTK.GTK_STATE_NORMAL, color);
 	return color;
 }
 
@@ -3223,32 +3223,32 @@ public boolean getVisible () {
 }
 
 Point getThickness (long /*int*/ widget) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		int xthickness = 0, ythickness = 0;
 		GtkBorder tmp = new GtkBorder();
-		long /*int*/ context = OS.gtk_widget_get_style_context (widget);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (widget);
 
-		if (OS.GTK_VERSION < OS.VERSION(3, 18, 0)) {
-			OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+		if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0)) {
+			GTK.gtk_style_context_get_padding (context, GTK.GTK_STATE_FLAG_NORMAL, tmp);
 		} else {
-			OS.gtk_style_context_get_padding (context, OS.gtk_widget_get_state_flags(widget), tmp);
+			GTK.gtk_style_context_get_padding (context, GTK.gtk_widget_get_state_flags(widget), tmp);
 		}
-		OS.gtk_style_context_save (context);
-		OS.gtk_style_context_add_class (context, OS.GTK_STYLE_CLASS_FRAME);
+		GTK.gtk_style_context_save (context);
+		GTK.gtk_style_context_add_class (context, GTK.GTK_STYLE_CLASS_FRAME);
 		xthickness += tmp.left;
 		ythickness += tmp.top;
-		if (OS.GTK_VERSION < OS.VERSION(3, 18, 0)) {
-			OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+		if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0)) {
+			GTK.gtk_style_context_get_border (context, GTK.GTK_STATE_FLAG_NORMAL, tmp);
 		} else {
-			OS.gtk_style_context_get_border (context, OS.gtk_widget_get_state_flags(widget), tmp);
+			GTK.gtk_style_context_get_border (context, GTK.gtk_widget_get_state_flags(widget), tmp);
 		}
 		xthickness += tmp.left;
 		ythickness += tmp.top;
-		OS.gtk_style_context_restore (context);
+		GTK.gtk_style_context_restore (context);
 		return new Point (xthickness, ythickness);
 	}
-	long /*int*/ style = OS.gtk_widget_get_style (widget);
-	return new Point (OS.gtk_style_get_xthickness (style), OS.gtk_style_get_ythickness (style));
+	long /*int*/ style = GTK.gtk_widget_get_style (widget);
+	return new Point (GTK.gtk_style_get_xthickness (style), GTK.gtk_style_get_ythickness (style));
 }
 
 @Override
@@ -3366,7 +3366,7 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
 		buffer = Converter.wcsToMbcs (chars, true);
 	}
 	long /*int*/ toolHandle = getShell().handle;
-	OS.gtk_widget_set_tooltip_text (toolHandle, buffer);
+	GTK.gtk_widget_set_tooltip_text (toolHandle, buffer);
 
 	if (display.currentControl == this) return 0;
 	GdkEventCrossing gdkEvent = new GdkEventCrossing ();
@@ -3438,9 +3438,9 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 				}
 			} else {
 				display.ignoreFocus = false;
-				long /*int*/ grabHandle = OS.gtk_grab_get_current ();
+				long /*int*/ grabHandle = GTK.gtk_grab_get_current ();
 				if (grabHandle != 0) {
-					if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
+					if (OS.G_OBJECT_TYPE (grabHandle) == GTK.GTK_TYPE_MENU ()) {
 						display.ignoreFocus = true;
 						break;
 					}
@@ -3467,7 +3467,7 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) {
 	event.setBounds (eventBounds);
 	GCData data = new GCData ();
 //	data.damageRgn = gdkEvent.region;
-	if (OS.GTK_VERSION <= OS.VERSION (3, 9, 0)) {
+	if (GTK.GTK_VERSION <= OS.VERSION (3, 9, 0)) {
 		data.cairo = cairo;
 	}
 	GC gc = event.gc = GC.gtk_new (this, data);
@@ -3515,12 +3515,12 @@ long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
 		if (oldControl != this)  {
 			if (oldControl != null && !oldControl.isDisposed ()) {
 				long /*int*/ oldIMHandle = oldControl.imHandle ();
-				if (oldIMHandle != 0) OS.gtk_im_context_reset (oldIMHandle);
+				if (oldIMHandle != 0) GTK.gtk_im_context_reset (oldIMHandle);
 			}
 		}
 		if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
 			long /*int*/ imHandle = imHandle ();
-			if (imHandle != 0) OS.gtk_im_context_focus_in (imHandle);
+			if (imHandle != 0) GTK.gtk_im_context_focus_in (imHandle);
 		}
 	}
 	return 0;
@@ -3533,7 +3533,7 @@ long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
 		if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
 			long /*int*/ imHandle = imHandle ();
 			if (imHandle != 0) {
-				OS.gtk_im_context_focus_out (imHandle);
+				GTK.gtk_im_context_focus_out (imHandle);
 			}
 		}
 	}
@@ -3578,7 +3578,7 @@ long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) {
 	if (!hasFocus ()) return 0;
 	long /*int*/ imHandle = imHandle ();
 	if (imHandle != 0) {
-		if (OS.gtk_im_context_filter_keypress (imHandle, event)) return 1;
+		if (GTK.gtk_im_context_filter_keypress (imHandle, event)) return 1;
 	}
 	return super.gtk_key_release_event (widget, event);
 }
@@ -3602,7 +3602,7 @@ long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {
 @Override
 long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
 	int result = 0;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventKey keyEvent = new GdkEventKey ();
 		OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);
@@ -3611,7 +3611,7 @@ long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
 			long /*int*/ focusHandle = focusControl != null ? focusControl.focusHandle () : 0;
 			if (focusHandle != 0) {
 				display.mnemonicControl = this;
-				OS.gtk_widget_event (focusHandle, eventPtr);
+				GTK.gtk_widget_event (focusHandle, eventPtr);
 				display.mnemonicControl = null;
 			}
 			result = 1;
@@ -3642,7 +3642,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
 			}
 		}
 		if (dragging) {
-			OS.gtk_event_controller_handle_event(dragGesture,event);
+			GTK.gtk_event_controller_handle_event(dragGesture,event);
 			GdkEventButton gdkEvent1 = new GdkEventButton ();
 			OS.memmove (gdkEvent1, event, GdkEventButton.sizeof);
 			if (gdkEvent1.type == OS.GDK_3BUTTON_PRESS) return 0;
@@ -3664,7 +3664,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
 		y = pointer_y [0];
 		state = mask [0];
 	}
-	if (OS.GTK3 && this != display.currentControl) {
+	if (GTK.GTK3 && this != display.currentControl) {
 		if (display.currentControl != null && !display.currentControl.isDisposed ()) {
 			display.removeMouseHoverTimeout (display.currentControl.handle);
 			Point pt = display.mapInPixels (this, display.currentControl, (int) x, (int) y);
@@ -3698,7 +3698,7 @@ long /*int*/ gtk_realize (long /*int*/ widget) {
 	long /*int*/ imHandle = imHandle ();
 	if (imHandle != 0) {
 		long /*int*/ window = gtk_widget_get_window (paintHandle ());
-		OS.gtk_im_context_set_client_window (imHandle, window);
+		GTK.gtk_im_context_set_client_window (imHandle, window);
 	}
 	if (backgroundImage != null) {
 		setBackgroundPixmap (backgroundImage);
@@ -3752,7 +3752,7 @@ long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) {
 @Override
 long /*int*/ gtk_unrealize (long /*int*/ widget) {
 	long /*int*/ imHandle = imHandle ();
-	if (imHandle != 0) OS.gtk_im_context_set_client_window (imHandle, 0);
+	if (imHandle != 0) GTK.gtk_im_context_set_client_window (imHandle, 0);
 	return 0;
 }
 
@@ -3802,7 +3802,7 @@ public long /*int*/ internal_new_GC (GCData data) {
 		Control control = findBackgroundControl ();
 		if (control == null) control = this;
 		data.font = font != null ? font : defaultFont ();
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			data.foregroundRGBA = getForegroundGdkRGBA ();
 			data.backgroundRGBA = control.getBackgroundGdkRGBA ();
 		} else {
@@ -4030,7 +4030,7 @@ public void redraw () {
 
 void redraw (boolean all) {
 //	checkWidget();
-	if (!OS.gtk_widget_get_visible (topHandle ())) return;
+	if (!GTK.gtk_widget_get_visible (topHandle ())) return;
 	redrawWidget (0, 0, 0, 0, true, all, false);
 }
 
@@ -4079,7 +4079,7 @@ public void redraw (int x, int y, int width, int height, boolean all) {
 
 void redrawInPixels (int x, int y, int width, int height, boolean all) {
 	checkWidget();
-	if (!OS.gtk_widget_get_visible (topHandle ())) return;
+	if (!GTK.gtk_widget_get_visible (topHandle ())) return;
 	if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x;
 	redrawWidget (x, y, width, height, false, all, false);
 }
@@ -4088,7 +4088,7 @@ void redrawChildren () {
 }
 
 void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boolean all, boolean trim) {
-	if (!OS.gtk_widget_get_realized(handle)) return;
+	if (!GTK.gtk_widget_get_realized(handle)) return;
 	long /*int*/ window = paintWindow ();
 	GdkRectangle rect = new GdkRectangle ();
 	if (redrawAll) {
@@ -4151,8 +4151,8 @@ void releaseWidget () {
 	display.removeMouseHoverTimeout (handle);
 	long /*int*/ imHandle = imHandle ();
 	if (imHandle != 0) {
-		OS.gtk_im_context_reset (imHandle);
-		OS.gtk_im_context_set_client_window (imHandle, 0);
+		GTK.gtk_im_context_reset (imHandle);
+		GTK.gtk_im_context_set_client_window (imHandle, 0);
 	}
 	if (enableWindow != 0) {
 		OS.gdk_window_set_user_data (enableWindow, 0);
@@ -4406,13 +4406,13 @@ private boolean sendOrPost(int type, Event event) {
  * @param vAlign is of type GTKAlign enum. See OS.java
  */
 void gtk_widget_set_align(long /*int*/ widget, int hAlign, int vAlign) {
-	OS.gtk_widget_set_halign (widget, hAlign);
-	OS.gtk_widget_set_valign (widget, vAlign);
+	GTK.gtk_widget_set_halign (widget, hAlign);
+	GTK.gtk_widget_set_valign (widget, vAlign);
 }
 
 void gtk_label_set_align(long /*int*/ label, float xAlign, float yAlign) {
-	OS.gtk_label_set_xalign(label, xAlign);
-	OS.gtk_label_set_yalign(label, yAlign);
+	GTK.gtk_label_set_xalign(label, xAlign);
+	GTK.gtk_label_set_yalign(label, yAlign);
 }
 
 void setBackground () {
@@ -4455,7 +4455,7 @@ public void setBackground (Color color) {
 private void _setBackground (Color color) {
 	if (((state & BACKGROUND) == 0) && color == null) return;
 	boolean set = false;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA rgba = null;
 		if (color != null) {
 			rgba = color.handleRGBA;
@@ -4478,8 +4478,8 @@ private void _setBackground (Color color) {
 			backgroundAlpha = color.getAlpha ();
 		}
 		if (gdkColor == null) {
-			long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
-			set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_BG) != 0;
+			long /*int*/ style = GTK.gtk_widget_get_modifier_style (handle);
+			set = (GTK.gtk_rc_style_get_color_flags (style, GTK.GTK_STATE_NORMAL) & GTK.GTK_RC_BG) != 0;
 		} else {
 			GdkColor oldColor = getBackgroundGdkColor ();
 			set = oldColor.pixel != gdkColor.pixel;
@@ -4498,13 +4498,13 @@ private void _setBackground (Color color) {
 }
 
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	GdkRGBA selectedBackground = display.getSystemColor(SWT.COLOR_LIST_SELECTION).handleRGBA;
-    if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+    if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
     	// Form background string
-        String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle)
+        String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle)
         		: display.gtk_widget_get_name(handle);
-        String selection = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? " selection" : ":selected";
+        String selection = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? " selection" : ":selected";
         String css = name + " {background-color: " + display.gtk_rgba_to_css_string(rgba) + ";}\n"
                 + name + selection + " {background-color: " + display.gtk_rgba_to_css_string(selectedBackground) + ";}";
 
@@ -4515,13 +4515,13 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
         String finalCss = display.gtk_css_create_css_color_string (cssBackground, cssForeground, SWT.BACKGROUND);
         gtk_css_provider_load_from_css (context, finalCss);
     } else {
-        OS.gtk_widget_override_background_color (handle, OS.GTK_STATE_FLAG_NORMAL, rgba);
-        OS.gtk_widget_override_background_color(handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground);
+        GTK.gtk_widget_override_background_color (handle, GTK.GTK_STATE_FLAG_NORMAL, rgba);
+        GTK.gtk_widget_override_background_color(handle, GTK.GTK_STATE_FLAG_SELECTED, selectedBackground);
     }
 }
 
 void setBackgroundGradientGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	String css ="* {\n";
 	if (rgba != null) {
 		String color = display.gtk_rgba_to_css_string (rgba);
@@ -4543,28 +4543,28 @@ void gtk_css_provider_load_from_css (long /*int*/ context, String css) {
 	//@param css : a 'css java' string like "{\nbackground: red;\n}".
 
 	if (provider == 0) {
-		provider = OS.gtk_css_provider_new ();
-		OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+		provider = GTK.gtk_css_provider_new ();
+		GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 		OS.g_object_unref (provider);
 	}
-	OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
+	GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
 }
 
 void setBackgroundGdkColor (long /*int*/ handle, GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
-	int index = OS.GTK_STATE_NORMAL;
-	long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
-	long /*int*/ ptr = OS.gtk_rc_style_get_bg_pixmap_name (style, index);
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
+	int index = GTK.GTK_STATE_NORMAL;
+	long /*int*/ style = GTK.gtk_widget_get_modifier_style (handle);
+	long /*int*/ ptr = GTK.gtk_rc_style_get_bg_pixmap_name (style, index);
 	if (ptr != 0) OS.g_free (ptr);
 	ptr = 0;
 
 	String pixmapName = null;
-	int flags = OS.gtk_rc_style_get_color_flags (style, index);
+	int flags = GTK.gtk_rc_style_get_color_flags (style, index);
 	if (color != null) {
-		flags |= OS.GTK_RC_BG;
+		flags |= GTK.GTK_RC_BG;
 		pixmapName = "<none>"; //$NON-NLS-1$
 	} else {
-		flags &= ~OS.GTK_RC_BG;
+		flags &= ~GTK.GTK_RC_BG;
 		if (backgroundImage == null && (state & PARENT_BACKGROUND) != 0) {
 			pixmapName = "<parent>"; //$NON-NLS-1$
 		}
@@ -4575,24 +4575,24 @@ void setBackgroundGdkColor (long /*int*/ handle, GdkColor color) {
 		C.memmove (ptr, buffer, buffer.length);
 	}
 
-	OS.gtk_rc_style_set_bg_pixmap_name (style, index, ptr);
-	OS.gtk_rc_style_set_bg (style, index, color);
-	OS.gtk_rc_style_set_color_flags (style, index, flags);
+	GTK.gtk_rc_style_set_bg_pixmap_name (style, index, ptr);
+	GTK.gtk_rc_style_set_bg (style, index, color);
+	GTK.gtk_rc_style_set_color_flags (style, index, flags);
 	modifyStyle (handle, style);
 }
 
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setBackgroundGdkColor (handle, color);
 }
 
 void setBackgroundGdkRGBA(GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	setBackgroundGdkRGBA (handle, rgba);
 }
 
 void setBackgroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	double alpha = 1.0;
 	if (rgba == null) {
 		if ((state & PARENT_BACKGROUND) != 0) {
@@ -4608,9 +4608,9 @@ void setBackgroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
 	if (rgba != null) {
 		rgba.alpha = alpha / (float)255;
 	}
-	long /*int*/ context = OS.gtk_widget_get_style_context (handle);
+	long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
 	setBackgroundGdkRGBA (context, handle, rgba);
-	OS.gtk_style_context_invalidate (context);
+	GTK.gtk_style_context_invalidate (context);
 	return;
 }
 /**
@@ -4656,7 +4656,7 @@ void setBackgroundPixmap (Image image) {
 		if (image.pixmap != 0) {
 			OS.gdk_window_set_back_pixmap (window, image.pixmap, false);
 		} else if (image.surface != 0) {
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(image.surface);
 				if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 				Cairo.cairo_pattern_set_extend(pattern, Cairo.CAIRO_EXTEND_REPEAT);
@@ -4828,13 +4828,13 @@ public void setEnabled (boolean enabled) {
 			cleanupEnableWindow();
 		}
 	} else {
-		OS.gtk_widget_realize (handle);
+		GTK.gtk_widget_realize (handle);
 		long /*int*/ parentHandle = parent.eventHandle ();
 		long /*int*/ window = parent.eventWindow ();
 		long /*int*/ topHandle = topHandle ();
 		GdkWindowAttr attributes = new GdkWindowAttr ();
 		GtkAllocation allocation = new GtkAllocation ();
-		OS.gtk_widget_get_allocation (topHandle, allocation);
+		GTK.gtk_widget_get_allocation (topHandle, allocation);
 		attributes.x = allocation.x;
 		attributes.y = allocation.y;
 		attributes.width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -4853,7 +4853,7 @@ public void setEnabled (boolean enabled) {
 
 			OS.gdk_window_set_user_data (enableWindow, parentHandle);
 			restackWindow (enableWindow, gtk_widget_get_window (topHandle), true);
-			if (OS.gtk_widget_get_visible (topHandle)) OS.gdk_window_show_unraised (enableWindow);
+			if (GTK.gtk_widget_get_visible (topHandle)) OS.gdk_window_show_unraised (enableWindow);
 		}
 	}
 	if (fixFocus) fixFocus (control);
@@ -4967,12 +4967,12 @@ public void setForeground (Color color) {
 		gdkColor = color.handle;
 	}
 	boolean set = false;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		set = !getForeground().equals(color);
 	} else {
 		if (gdkColor == null) {
-			long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
-			set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_FG) != 0;
+			long /*int*/ style = GTK.gtk_widget_get_modifier_style (handle);
+			set = (GTK.gtk_rc_style_get_color_flags (style, GTK.GTK_STATE_NORMAL) & GTK.GTK_RC_FG) != 0;
 		} else {
 			GdkColor oldColor = getForegroundGdkColor ();
 			set = oldColor.pixel != gdkColor.pixel;
@@ -4984,7 +4984,7 @@ public void setForeground (Color color) {
 		} else {
 			state |= FOREGROUND;
 		}
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			GdkRGBA rgba = color == null ? null : color.handleRGBA;
 			setForegroundGdkRGBA (rgba);
 		} else {
@@ -4994,31 +4994,31 @@ public void setForeground (Color color) {
 }
 
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	setForegroundGdkRGBA (handle, rgba);
 }
 
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (handle, color);
 }
 
 void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		GdkRGBA toSet;
 		if (rgba != null) {
 			toSet = rgba;
 		} else {
 			toSet = display.COLOR_WIDGET_FOREGROUND_RGBA;
 		}
-		long /*int*/ context = OS.gtk_widget_get_style_context (handle);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
 		// Form foreground string
 		String color = display.gtk_rgba_to_css_string(toSet);
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle)
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle)
 	    		: display.gtk_widget_get_name(handle);
 		GdkRGBA selectedForeground = display.COLOR_LIST_SELECTION_TEXT_RGBA;
-		String selection = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) &&
+		String selection = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) &&
 				!name.contains("treeview") ? " selection" : ":selected";
 		String css = "* {color: " + color + ";}\n"
 				+ name + selection + " {color: " + display.gtk_rgba_to_css_string(selectedForeground) + ";}";
@@ -5031,10 +5031,10 @@ void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
 		gtk_css_provider_load_from_css(context, finalCss);
 	} else {
 		GdkRGBA selectedForeground = display.COLOR_LIST_SELECTION_TEXT_RGBA;
-		OS.gtk_widget_override_color (handle, OS.GTK_STATE_FLAG_NORMAL, rgba);
-		OS.gtk_widget_override_color (handle, OS.GTK_STATE_FLAG_SELECTED, selectedForeground);
-		long /*int*/ context = OS.gtk_widget_get_style_context (handle);
-		OS.gtk_style_context_invalidate (context);
+		GTK.gtk_widget_override_color (handle, GTK.GTK_STATE_FLAG_NORMAL, rgba);
+		GTK.gtk_widget_override_color (handle, GTK.GTK_STATE_FLAG_SELECTED, selectedForeground);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
+		GTK.gtk_style_context_invalidate (context);
 		return;
 	}
 }
@@ -5055,10 +5055,10 @@ void setInitialBounds () {
 			allocation.x = 0;
 		}
 		allocation.y = 0;
-		if (OS.GTK3) {
-			OS.gtk_widget_set_visible(topHandle, true);
+		if (GTK.GTK3) {
+			GTK.gtk_widget_set_visible(topHandle, true);
 		}
-		OS.gtk_widget_set_allocation(topHandle, allocation);
+		GTK.gtk_widget_set_allocation(topHandle, allocation);
 	} else {
 		resizeHandle (1, 1);
 		forceResize ();
@@ -5071,11 +5071,11 @@ void setInitialBounds () {
  * TODO currently phase is set to BUBBLE = 2. Look into using groups perhaps.
  */
 private void setDragGesture () {
-        if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
-			dragGesture = OS.gtk_gesture_drag_new (handle);
-			OS.gtk_event_controller_set_propagation_phase (dragGesture,
+        if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+			dragGesture = GTK.gtk_gesture_drag_new (handle);
+			GTK.gtk_event_controller_set_propagation_phase (dragGesture,
 			        2);
-			OS.gtk_gesture_single_set_button (dragGesture, 0);
+			GTK.gtk_gesture_single_set_button (dragGesture, 0);
 			OS.g_signal_connect(dragGesture, OS.begin, gestureBegin.getAddress(), this.handle);
 			OS.g_signal_connect(dragGesture, OS.end, gestureEnd.getAddress(), this.handle);
 			return;
@@ -5087,9 +5087,9 @@ private void setDragGesture () {
 //}
 
 private void setRotateGesture () {
-    if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
-		rotateGesture = OS.gtk_gesture_rotate_new(handle);
-		OS.gtk_event_controller_set_propagation_phase (rotateGesture,
+    if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		rotateGesture = GTK.gtk_gesture_rotate_new(handle);
+		GTK.gtk_event_controller_set_propagation_phase (rotateGesture,
 		        2);
 		OS.g_signal_connect (rotateGesture, OS.angle_changed, gestureRotation.getAddress(), this.handle);
 		OS.g_signal_connect(rotateGesture, OS.begin, gestureBegin.getAddress(), this.handle);
@@ -5099,9 +5099,9 @@ private void setRotateGesture () {
 }
 
 private void setZoomGesture () {
-        if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
-			zoomGesture = OS.gtk_gesture_zoom_new(handle);
-			OS.gtk_event_controller_set_propagation_phase (zoomGesture,
+        if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+			zoomGesture = GTK.gtk_gesture_zoom_new(handle);
+			GTK.gtk_event_controller_set_propagation_phase (zoomGesture,
 			        2);
 			OS.g_signal_connect(zoomGesture, OS.scale_changed, gestureZoom.getAddress(), this.handle);
 			OS.g_signal_connect(zoomGesture, OS.begin, gestureBegin.getAddress(), this.handle);
@@ -5119,47 +5119,47 @@ static Control getControl(long /*int*/ handle) {
 }
 
 static void rotateProc(long /*int*/ gesture, double angle, double angle_delta, long /*int*/ user_data) {
-	if (OS.gtk_gesture_is_recognized(gesture)) {
+	if (GTK.gtk_gesture_is_recognized(gesture)) {
 		int [] state = new int[1];
 		double [] x = new double[1];
 		double [] y = new double[1];
-		OS.gtk_get_current_event_state(state);
-		OS.gtk_gesture_get_point(gesture, OS.gtk_gesture_get_last_updated_sequence(gesture), x, y);
+		GTK.gtk_get_current_event_state(state);
+		GTK.gtk_gesture_get_point(gesture, GTK.gtk_gesture_get_last_updated_sequence(gesture), x, y);
 		/*
 		 * Returning delta is off by two decimal points and is returning negative numbers on
 		 * counter clockwise rotations from GTK. From the java doc of GestureEvent.rotation,
 		 * we have to invert the rotation number so that positive/negative numbers are returned
 		 * correctly (inverted).
 		 */
-		double delta = -(OS.gtk_gesture_rotate_get_angle_delta(gesture)*100);
+		double delta = -(GTK.gtk_gesture_rotate_get_angle_delta(gesture)*100);
 		Control control = getControl(user_data);
 		control.sendGestureEvent(state[0], SWT.GESTURE_ROTATE, (int) x[0], (int) y[0], delta);
 	}
 }
 
 static void magnifyProc(long /*int*/ gesture, double zoom, long /*int*/ user_data) {
-	if (OS.gtk_gesture_is_recognized(gesture)) {
+	if (GTK.gtk_gesture_is_recognized(gesture)) {
 		int [] state = new int[1];
 		double [] x = new double[1];
 		double [] y = new double[1];
-		OS.gtk_get_current_event_state(state);
-		OS.gtk_gesture_get_point(gesture, OS.gtk_gesture_get_last_updated_sequence(gesture), x, y);
-		double delta = OS.gtk_gesture_zoom_get_scale_delta(gesture);
+		GTK.gtk_get_current_event_state(state);
+		GTK.gtk_gesture_get_point(gesture, GTK.gtk_gesture_get_last_updated_sequence(gesture), x, y);
+		double delta = GTK.gtk_gesture_zoom_get_scale_delta(gesture);
 		Control control = getControl(user_data);
 		control.sendGestureEvent(state[0], SWT.GESTURE_MAGNIFY, (int) x[0], (int) y[0], delta);
 	}
 }
 
 static void swipeProc(long /*int*/ gesture, double velocity_x, double velocity_y, long /*int*/ user_data) {
-	if (OS.gtk_gesture_is_recognized(gesture)) {
+	if (GTK.gtk_gesture_is_recognized(gesture)) {
 		double [] xVelocity = new double [1];
 		double [] yVelocity = new double [1];
-		if (OS.gtk_gesture_swipe_get_velocity(gesture, xVelocity, yVelocity)) {
+		if (GTK.gtk_gesture_swipe_get_velocity(gesture, xVelocity, yVelocity)) {
 			int [] state = new int[1];
 			double [] x = new double[1];
 			double [] y = new double[1];
-			OS.gtk_get_current_event_state(state);
-			OS.gtk_gesture_get_point(gesture, OS.gtk_gesture_get_last_updated_sequence(gesture), x, y);
+			GTK.gtk_get_current_event_state(state);
+			GTK.gtk_gesture_get_point(gesture, GTK.gtk_gesture_get_last_updated_sequence(gesture), x, y);
 			Control control = getControl(user_data);
 			control.sendGestureEvent(state[0], SWT.GESTURE_SWIPE, (int) x[0], (int) y[0], xVelocity[0], yVelocity[0]);
 		}
@@ -5167,24 +5167,24 @@ static void swipeProc(long /*int*/ gesture, double velocity_x, double velocity_y
 }
 
 static void gestureBeginProc(long /*int*/ gesture, long /*int*/ sequence, long /*int*/ user_data) {
-	if (OS.gtk_gesture_is_recognized(gesture)) {
+	if (GTK.gtk_gesture_is_recognized(gesture)) {
 		int [] state = new int[1];
 		double [] x = new double[1];
 		double [] y = new double[1];
-		OS.gtk_get_current_event_state(state);
-		OS.gtk_gesture_get_point(gesture, sequence, x, y);
+		GTK.gtk_get_current_event_state(state);
+		GTK.gtk_gesture_get_point(gesture, sequence, x, y);
 		Control control = getControl(user_data);
 		control.sendGestureEvent(state[0], SWT.GESTURE_BEGIN, (int) x[0], (int) y[0], 0);
 	}
 }
 
 static void gestureEndProc(long /*int*/ gesture, long /*int*/ sequence, long /*int*/ user_data) {
-	if (OS.gtk_gesture_is_recognized(gesture)) {
+	if (GTK.gtk_gesture_is_recognized(gesture)) {
 		int [] state = new int[1];
 		double [] x = new double[1];
 		double [] y = new double[1];
-		OS.gtk_get_current_event_state(state);
-		OS.gtk_gesture_get_point(gesture, OS.gtk_gesture_get_last_updated_sequence(gesture), x, y);
+		GTK.gtk_get_current_event_state(state);
+		GTK.gtk_gesture_get_point(gesture, GTK.gtk_gesture_get_last_updated_sequence(gesture), x, y);
 		Control control = getControl(user_data);
 		control.sendGestureEvent(state[0], SWT.GESTURE_END, (int) x[0], (int) y[0], 0);
 	}
@@ -5230,9 +5230,9 @@ public void setMenu (Menu menu) {
 @Override
 void setOrientation (boolean create) {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		if (handle != 0) OS.gtk_widget_set_direction (handle, dir);
-		if (fixedHandle != 0) OS.gtk_widget_set_direction (fixedHandle, dir);
+		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		if (handle != 0) GTK.gtk_widget_set_direction (handle, dir);
+		if (fixedHandle != 0) GTK.gtk_widget_set_direction (fixedHandle, dir);
 	}
 }
 
@@ -5283,10 +5283,10 @@ public boolean setParent (Composite parent) {
 	if (parent.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
 	if (this.parent == parent) return true;
 	if (!isReparentable ()) return false;
-	OS.gtk_widget_realize (parent.handle);
+	GTK.gtk_widget_realize (parent.handle);
 	long /*int*/ topHandle = topHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (topHandle, allocation);
+	GTK.gtk_widget_get_allocation (topHandle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -5307,11 +5307,11 @@ public boolean setParent (Composite parent) {
 		oldDecorations.fixAccelGroup ();
 	}
 	long /*int*/ newParent = parent.parentingHandle();
-	OS.gtk_widget_reparent(topHandle, newParent);
-	if (OS.GTK3) {
+	GTK.gtk_widget_reparent(topHandle, newParent);
+	if (GTK.GTK3) {
 		OS.swt_fixed_move (newParent, topHandle, x, y);
 	} else {
-		OS.gtk_fixed_move (newParent, topHandle, x, y);
+		GTK.gtk_fixed_move (newParent, topHandle, x, y);
 	}
 	/*
 	* Restore the original widget size since GTK does not keep it.
@@ -5328,7 +5328,7 @@ public boolean setParent (Composite parent) {
 	allocation.y = y;
 	allocation.width = width;
 	allocation.height = height;
-	OS.gtk_widget_size_allocate (topHandle, allocation);
+	GTK.gtk_widget_size_allocate (topHandle, allocation);
 	this.parent = parent;
 	setZOrder (null, false, true);
 	reskin (SWT.ALL);
@@ -5336,7 +5336,7 @@ public boolean setParent (Composite parent) {
 }
 
 void setParentBackground () {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setBackgroundGdkRGBA (handle, null);
 		if (fixedHandle != 0) setBackgroundGdkRGBA (fixedHandle, null);
 	} else {
@@ -5384,13 +5384,13 @@ public void setRedraw (boolean redraw) {
 				/* Explicitly hiding the window avoids flicker on GTK+ >= 2.6 */
 				OS.gdk_window_hide (redrawWindow);
 				OS.gdk_window_destroy (redrawWindow);
-				OS.gdk_window_set_events (window, OS.gtk_widget_get_events (paintHandle ()));
+				OS.gdk_window_set_events (window, GTK.gtk_widget_get_events (paintHandle ()));
 				redrawWindow = 0;
 			}
 		}
 	} else {
 		if (drawCount++ == 0) {
-			if (OS.gtk_widget_get_realized (handle)) {
+			if (GTK.gtk_widget_get_realized (handle)) {
 				long /*int*/ window = paintWindow ();
 				Rectangle rect = getBoundsInPixels ();
 				GdkWindowAttr attributes = new GdkWindowAttr ();
@@ -5406,7 +5406,7 @@ public void setRedraw (boolean redraw) {
 						OS.GDK_BUTTON_MOTION_MASK | OS.GDK_BUTTON1_MOTION_MASK |
 						OS.GDK_BUTTON2_MOTION_MASK | OS.GDK_BUTTON3_MOTION_MASK;
 					OS.gdk_window_set_events (window, OS.gdk_window_get_events (window) & ~mouseMask);
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						OS.gdk_window_set_background_pattern(redrawWindow, 0);
 					} else {
 						OS.gdk_window_set_back_pixmap (redrawWindow, 0, false);
@@ -5550,7 +5550,7 @@ public void setVisible (boolean visible) {
 		state &= ~HIDDEN;
 		if ((state & (ZERO_WIDTH | ZERO_HEIGHT)) == 0) {
 			if (enableWindow != 0) OS.gdk_window_show_unraised (enableWindow);
-			OS.gtk_widget_show (topHandle);
+			GTK.gtk_widget_show (topHandle);
 		}
 	} else {
 		/*
@@ -5570,20 +5570,20 @@ public void setVisible (boolean visible) {
 		}
 		state |= HIDDEN;
 		if (fixFocus) {
-			if (OS.GTK3) {
-				OS.gtk_widget_set_can_focus (topHandle, false);
+			if (GTK.GTK3) {
+				GTK.gtk_widget_set_can_focus (topHandle, false);
 			} else {
 				gtk_widget_set_visible (topHandle, false);
 			}
 			fixFocus (control);
 			if (isDisposed ()) return;
-			if (OS.GTK3) {
-				OS.gtk_widget_set_can_focus (topHandle, true);
+			if (GTK.GTK3) {
+				GTK.gtk_widget_set_can_focus (topHandle, true);
 			} else {
 				gtk_widget_set_visible (topHandle, true);
 			}
 		}
-		OS.gtk_widget_hide (topHandle);
+		GTK.gtk_widget_hide (topHandle);
 		if (isDisposed ()) return;
 		if (enableWindow != 0) OS.gdk_window_hide (enableWindow);
 		sendEvent (SWT.Hide);
@@ -5636,7 +5636,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
 			if (above && sibling.enableWindow != 0) {
 				siblingWindow = enableWindow;
 			} else {
-				siblingWindow = OS.gtk_widget_get_window (siblingHandle);
+				siblingWindow = GTK.gtk_widget_get_window (siblingHandle);
 			}
 		}
 		long /*int*/ redrawWindow = fixChildren ? parent.redrawWindow : 0;
@@ -5704,7 +5704,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
 }
 
 void setWidgetBackground  () {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA rgba = (state & BACKGROUND) != 0 ? getBackgroundGdkRGBA () : null;
 		if (fixedHandle != 0) setBackgroundGdkRGBA (fixedHandle, rgba);
 		setBackgroundGdkRGBA (handle, rgba);
@@ -5748,10 +5748,10 @@ void showWidget () {
 	long /*int*/ topHandle = topHandle ();
 	long /*int*/ parentHandle = parent.parentingHandle ();
 	parent.setParentWindow (topHandle);
-	OS.gtk_container_add (parentHandle, topHandle);
-	if (handle != 0 && handle != topHandle) OS.gtk_widget_show (handle);
+	GTK.gtk_container_add (parentHandle, topHandle);
+	if (handle != 0 && handle != topHandle) GTK.gtk_widget_show (handle);
 	if ((state & (ZERO_WIDTH | ZERO_HEIGHT)) == 0) {
-		if (fixedHandle != 0) OS.gtk_widget_show (fixedHandle);
+		if (fixedHandle != 0) GTK.gtk_widget_show (fixedHandle);
 	}
 	if (fixedHandle != 0) fixStyle (fixedHandle);
 }
@@ -5986,7 +5986,7 @@ boolean translateMnemonic (int keyval, GdkEventKey gdkEvent) {
 	} else {
 		Shell shell = _getShell ();
 		int mask = OS.GDK_CONTROL_MASK | OS.GDK_SHIFT_MASK | OS.GDK_MOD1_MASK;
-		if ((gdkEvent.state & mask) != OS.gtk_window_get_mnemonic_modifier (shell.shellHandle)) return false;
+		if ((gdkEvent.state & mask) != GTK.gtk_window_get_mnemonic_modifier (shell.shellHandle)) return false;
 	}
 	Decorations shell = menuShell ();
 	if (shell.isVisible () && shell.isEnabled ()) {
@@ -6186,15 +6186,15 @@ public void update () {
 
 void update (boolean all, boolean flush) {
 //	checkWidget();
-	if (!OS.gtk_widget_get_visible (topHandle ())) return;
-	if (!OS.gtk_widget_get_realized (handle)) return;
+	if (!GTK.gtk_widget_get_visible (topHandle ())) return;
+	if (!GTK.gtk_widget_get_realized (handle)) return;
 	long /*int*/ window = paintWindow ();
 	if (flush) display.flushExposes (window, all);
 	/*
 	 * Do not send expose events on GTK 3.16.0+
 	 * It's worth checking whether can be removed on all GTK 3 versions.
 	 */
-	if (OS.GTK_VERSION < OS.VERSION(3, 16, 0)) {
+	if (GTK.GTK_VERSION < OS.VERSION(3, 16, 0)) {
 		OS.gdk_window_process_updates (window, all);
 	}
 	OS.gdk_flush ();
@@ -6219,23 +6219,23 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us
 			if ((state & OBSCURED) != 0) break;
 			Control control = findBackgroundControl ();
 			boolean draw = control != null && control.backgroundImage != null;
-			if (OS.GTK3 && !draw && (state & CANVAS) != 0) {
-				if (OS.GTK_VERSION < OS.VERSION(3, 14, 0)) {
+			if (GTK.GTK3 && !draw && (state & CANVAS) != 0) {
+				if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) {
 					GdkRGBA rgba = new GdkRGBA();
-					long /*int*/ context = OS.gtk_widget_get_style_context (handle);
-					OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
+					long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
+					GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba);
 					draw = rgba.alpha == 0;
 				} else {
 					draw = (state & BACKGROUND) == 0;
 				}
 			}
 			if (draw) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					long /*int*/ cairo = arg0;
 					GdkRectangle rect = new GdkRectangle ();
 					OS.gdk_cairo_get_clip_rectangle (cairo, rect);
 					if (control == null) control = this;
-					long /*int*/ window = OS.gtk_widget_get_window (handle);
+					long /*int*/ window = GTK.gtk_widget_get_window (handle);
 					if (window != 0) {
 						drawBackground (control, window, 0, 0, rect.x, rect.y, rect.width, rect.height);
 					} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
index ac7a452681..d75635a303 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
@@ -141,7 +141,7 @@ public DateTime (Composite parent, int style) {
 	}
 
 	if (isCalendar ()) {
-		OS.gtk_calendar_mark_day (calendarHandle, Calendar.getInstance ().get (Calendar.DAY_OF_MONTH));
+		GTK.gtk_calendar_mark_day (calendarHandle, Calendar.getInstance ().get (Calendar.DAY_OF_MONTH));
 	}
 
 	if (isDateWithDropDownButton ()) {
@@ -184,7 +184,7 @@ static int checkStyle (int style) {
 	style &= ~(SWT.H_SCROLL | SWT.V_SCROLL);
 
 	//Workaround. Right_to_left is buggy on gtk2. Only allow on gtk3 onwards
-	if (!OS.GTK3 && isDateWithDropDownButton (style)) {
+	if (!GTK.GTK3 && isDateWithDropDownButton (style)) {
 		style &= ~(SWT.RIGHT_TO_LEFT);
 	}
 
@@ -236,7 +236,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 
 	int width = 0, height = 0;
 	//For Date and Time, we cache the preffered size as there is no need to recompute it.
-	if (!changed && (isDate () || isTime ()) && OS.GTK3 && prefferedSize != null) {
+	if (!changed && (isDate () || isTime ()) && GTK.GTK3 && prefferedSize != null) {
 		width = (wHint != SWT.DEFAULT) ? wHint : prefferedSize.x;
 		height= (hHint != SWT.DEFAULT) ? hHint : prefferedSize.y;
 		return new Point (width,height);
@@ -255,7 +255,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 				width = trim.width + buttonSize.x;
 				height = Math.max (trim.height, buttonSize.y);
 			} else if (isDate () || isTime ()) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					width = trim.width;
 					height = trim.height;
 				} else
@@ -272,7 +272,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	if (hHint != SWT.DEFAULT) height = hHint;
 	int borderWidth = getBorderWidthInPixels ();
 
-	if (prefferedSize == null && (isDateWithDropDownButton () && OS.GTK3)) {
+	if (prefferedSize == null && (isDateWithDropDownButton () && GTK.GTK3)) {
 		prefferedSize = new Point (width + 2*borderWidth, height+ 2*borderWidth);
 		return prefferedSize;
 	} else {
@@ -289,23 +289,23 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	checkWidget ();
 	Rectangle trim = super.computeTrimInPixels (x, y, width, height);
 	int xborder = 0, yborder = 0;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			GtkBorder tmp = new GtkBorder ();
-			long /*int*/ context = OS.gtk_widget_get_style_context (textEntryHandle);
-			if (OS.GTK_VERSION < OS.VERSION(3, 18, 0)) {
-				OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+			long /*int*/ context = GTK.gtk_widget_get_style_context (textEntryHandle);
+			if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0)) {
+				GTK.gtk_style_context_get_padding (context, GTK.GTK_STATE_FLAG_NORMAL, tmp);
 			} else {
-				OS.gtk_style_context_get_padding (context, OS.gtk_widget_get_state_flags(textEntryHandle), tmp);
+				GTK.gtk_style_context_get_padding (context, GTK.gtk_widget_get_state_flags(textEntryHandle), tmp);
 			}
 			trim.x -= tmp.left;
 			trim.y -= tmp.top;
 			trim.width += tmp.left + tmp.right;
 			trim.height += tmp.top + tmp.bottom;
 			if ((style & SWT.BORDER) != 0) {
-				if (OS.GTK_VERSION < OS.VERSION(3, 18, 0)) {
-					OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+				if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0)) {
+					GTK.gtk_style_context_get_border (context, GTK.GTK_STATE_FLAG_NORMAL, tmp);
 				} else {
-					OS.gtk_style_context_get_border (context, OS.gtk_widget_get_state_flags(textEntryHandle), tmp);
+					GTK.gtk_style_context_get_border (context, GTK.gtk_widget_get_state_flags(textEntryHandle), tmp);
 				}
 				trim.x -= tmp.left;
 				trim.y -= tmp.top;
@@ -357,9 +357,9 @@ void createHandle () {
 		} else {
 			createHandleForDateTime ();
 		}
-		OS.gtk_editable_set_editable (textEntryHandle, (style & SWT.READ_ONLY) == 0);
-		if (OS.GTK_VERSION <= OS.VERSION(3, 20, 0)) {
-			OS.gtk_entry_set_has_frame (textEntryHandle, (style & SWT.BORDER) != 0);
+		GTK.gtk_editable_set_editable (textEntryHandle, (style & SWT.READ_ONLY) == 0);
+		if (GTK.GTK_VERSION <= OS.VERSION(3, 20, 0)) {
+			GTK.gtk_entry_set_has_frame (textEntryHandle, (style & SWT.BORDER) != 0);
 		}
 	}
 }
@@ -367,63 +367,63 @@ void createHandle () {
 private void createHandleForFixed () {
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
 }
 
 private void createHandleForCalendar () {
-	calendarHandle = OS.gtk_calendar_new ();
+	calendarHandle = GTK.gtk_calendar_new ();
 	if (calendarHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
 	//Calenadar becomes container in this case.
 	handle = calendarHandle;
 	containerHandle = calendarHandle;
 
-	OS.gtk_container_add (fixedHandle, calendarHandle);
-	OS.gtk_calendar_set_display_options (calendarHandle, OS.GTK_CALENDAR_SHOW_HEADING | OS.GTK_CALENDAR_SHOW_DAY_NAMES);
-	OS.gtk_widget_show (calendarHandle);
+	GTK.gtk_container_add (fixedHandle, calendarHandle);
+	GTK.gtk_calendar_set_display_options (calendarHandle, GTK.GTK_CALENDAR_SHOW_HEADING | GTK.GTK_CALENDAR_SHOW_DAY_NAMES);
+	GTK.gtk_widget_show (calendarHandle);
 }
 
 private void createHandleForDateWithDropDown () {
 	//Create box to put entry and button into box.
-	containerHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 0);
+	containerHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 0);
 	if (containerHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (fixedHandle, containerHandle);
+	GTK.gtk_container_add (fixedHandle, containerHandle);
 
 	//Create entry
-	textEntryHandle = OS.gtk_entry_new ();
+	textEntryHandle = GTK.gtk_entry_new ();
 	if (textEntryHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (containerHandle, textEntryHandle);
+	GTK.gtk_container_add (containerHandle, textEntryHandle);
 
-	OS.gtk_widget_show (containerHandle);
-	OS.gtk_widget_show (textEntryHandle);
+	GTK.gtk_widget_show (containerHandle);
+	GTK.gtk_widget_show (textEntryHandle);
 
 	handle = containerHandle;
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription (defaultFont ().handle);
 	}
 }
 
 private void createHandleForDateTime () {
-	long /*int*/ adjusment = OS.gtk_adjustment_new (0, -9999, 9999, 1, 0, 0);
-	textEntryHandle = OS.gtk_spin_button_new (adjusment, 1, 0);
+	long /*int*/ adjusment = GTK.gtk_adjustment_new (0, -9999, 9999, 1, 0, 0);
+	textEntryHandle = GTK.gtk_spin_button_new (adjusment, 1, 0);
 	if (textEntryHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
 	//in this case,the Entry becomes the container.
 	handle = textEntryHandle;
 	containerHandle = textEntryHandle;
 
-	OS.gtk_spin_button_set_numeric (textEntryHandle, false);
-	OS.gtk_container_add (fixedHandle, textEntryHandle);
-	OS.gtk_spin_button_set_wrap (textEntryHandle, (style & SWT.WRAP) != 0);
+	GTK.gtk_spin_button_set_numeric (textEntryHandle, false);
+	GTK.gtk_container_add (fixedHandle, textEntryHandle);
+	GTK.gtk_spin_button_set_wrap (textEntryHandle, (style & SWT.WRAP) != 0);
 }
 
 void createDropDownButton () {
 	down = new Button (this, SWT.ARROW  | SWT.DOWN);
-	OS.gtk_widget_set_can_focus (down.handle, false);
+	GTK.gtk_widget_set_can_focus (down.handle, false);
 	down.addListener (SWT.Selection, event -> {
 		popupCalendar.calendarDisplayed = !isDropped ();
 		setFocus ();
@@ -606,7 +606,7 @@ private void focusDayOnPopupCalendar () {
 
 	if (savedYear == currentYear && savedMonth == currentMonth) {
 		int currentDay = Calendar.getInstance ().get (Calendar.DAY_OF_MONTH);
-		OS.gtk_calendar_mark_day (popupCalendar.handle, currentDay);
+		GTK.gtk_calendar_mark_day (popupCalendar.handle, currentDay);
 	}
 }
 
@@ -629,7 +629,7 @@ private void recreateCalendar () {
 
 private void hideDropDownCalendar () {
 	popupShell.setVisible (false);
-	OS.gtk_calendar_clear_marks (popupCalendar.handle);
+	GTK.gtk_calendar_clear_marks (popupCalendar.handle);
 	display.removeFilter (SWT.MouseDown, mouseEventListener);
 	return;
 }
@@ -652,7 +652,7 @@ String formattedStringValue (int fieldName, int value, boolean adjust) {
 
 @Override
 GdkColor getBackgroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	if (isCalendar ()) {
 		return getBaseGdkColor ();
 	} else {
@@ -709,7 +709,7 @@ void getDate () {
 	int [] y = new int [1];
 	int [] m = new int [1];
 	int [] d = new int [1];
-	OS.gtk_calendar_get_date (calendarHandle, y, m, d);
+	GTK.gtk_calendar_get_date (calendarHandle, y, m, d);
 	year = y[0];
 	month = m[0];
 	day = d[0];
@@ -958,13 +958,13 @@ void hookEvents () {
 		hookEventsForCalendar ();
 	} else {
 		int eventMask =	OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK;
-		OS.gtk_widget_add_events (textEntryHandle, eventMask);
+		GTK.gtk_widget_add_events (textEntryHandle, eventMask);
 
 
 		if ((style & SWT.DROP_DOWN) == 0 ) {
 			hookEventsForDateTimeSpinner ();
 		}
-		if (OS.G_OBJECT_TYPE (textEntryHandle) == OS.GTK_TYPE_MENU ()) {
+		if (OS.G_OBJECT_TYPE (textEntryHandle) == GTK.GTK_TYPE_MENU ()) {
 			hookEventsForMenu ();
 		}
 	}
@@ -1314,7 +1314,7 @@ void sendSelectionEvent () {
 	int [] y = new int [1];
 	int [] m = new int [1];
 	int [] d = new int [1];
-	OS.gtk_calendar_get_date (calendarHandle, y, m, d);
+	GTK.gtk_calendar_get_date (calendarHandle, y, m, d);
 	//TODO: hours, minutes, seconds?
 	if (d[0] != day ||
 		m[0] != month ||
@@ -1324,9 +1324,9 @@ void sendSelectionEvent () {
 		day = d[0];
 		/* Highlight the current (today) date */
 		if (year == Calendar.getInstance ().get (Calendar.YEAR) && month == Calendar.getInstance ().get (Calendar.MONTH)) {
-			OS.gtk_calendar_mark_day (calendarHandle, Calendar.getInstance ().get (Calendar.DAY_OF_MONTH));
+			GTK.gtk_calendar_mark_day (calendarHandle, Calendar.getInstance ().get (Calendar.DAY_OF_MONTH));
 		} else {
-			OS.gtk_calendar_clear_marks (calendarHandle);
+			GTK.gtk_calendar_clear_marks (calendarHandle);
 		}
 		sendSelectionEvent (SWT.Selection);
 	}
@@ -1335,9 +1335,9 @@ void sendSelectionEvent () {
 @Override
 public void setBackground (Color color) {
 	super.setBackground (color);
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		if ((isCalendar ()) && color == null) {
-			OS.gtk_widget_modify_base (containerHandle, 0, null);
+			GTK.gtk_widget_modify_base (containerHandle, 0, null);
 		}
 	}
 	bg = color;
@@ -1346,9 +1346,9 @@ public void setBackground (Color color) {
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	if (isCalendar ()) {
-		OS.gtk_widget_modify_base (containerHandle, 0, color);
+		GTK.gtk_widget_modify_base (containerHandle, 0, color);
 	} else {
 		super.setBackgroundGdkColor (color);
 	}
@@ -1356,7 +1356,7 @@ void setBackgroundGdkColor (GdkColor color) {
 
 @Override
 void setBackgroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setBackgroundGdkRGBA(rgba);
 	if (calendarHandle != 0) {
 		setBackgroundGdkRGBA (calendarHandle, rgba);
@@ -1367,15 +1367,15 @@ void setBackgroundGdkRGBA (GdkRGBA rgba) {
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 
 	// We need to override here because DateTime widgets use "background" instead of
 	// "background-color" as their CSS property.
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
     	// Form background string
-        String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle)
+        String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle)
         		: display.gtk_widget_get_name(handle);
-        String selection = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? " selection" : ":selected";
+        String selection = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? " selection" : ":selected";
         String css = name + " {background: " + display.gtk_rgba_to_css_string (rgba) + ";}\n" +
         		name + selection + " {background: " + display.gtk_rgba_to_css_string(display.COLOR_LIST_SELECTION_RGBA) + ";}";
 
@@ -1407,13 +1407,13 @@ public void setFont (Font font) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (containerHandle, color, false);
 }
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	setForegroundGdkRGBA (containerHandle, rgba);
 }
 
@@ -1501,8 +1501,8 @@ public void setDate (int year, int month, int day) {
 		this.year = year;
 		this.month = month;
 		this.day = day;
-		OS.gtk_calendar_select_month (calendarHandle, month, year);
-		OS.gtk_calendar_select_day (calendarHandle, day);
+		GTK.gtk_calendar_select_month (calendarHandle, month, year);
+		GTK.gtk_calendar_select_day (calendarHandle, day);
 	} else {
 		calendar.set (year, month, day);
 		updateControl ();
@@ -1530,7 +1530,7 @@ public void setDay (int day) {
 	if (!isValidDate (getYear (), getMonth (), day)) return;
 	if (isCalendar ()) {
 		this.day = day;
-		OS.gtk_calendar_select_day (calendarHandle, day);
+		GTK.gtk_calendar_select_day (calendarHandle, day);
 	} else {
 		calendar.set (Calendar.DAY_OF_MONTH, day);
 		updateControl ();
@@ -1612,7 +1612,7 @@ public void setMonth (int month) {
 	if (!isValidDate (getYear (), month, getDay ())) return;
 	if (isCalendar ()) {
 		this.month = month;
-		OS.gtk_calendar_select_month (calendarHandle, month, year);
+		GTK.gtk_calendar_select_month (calendarHandle, month, year);
 	} else {
 		calendar.set (Calendar.MONTH, month);
 		updateControl ();
@@ -1695,7 +1695,7 @@ public void setYear (int year) {
 	if (!isValidDate (year, getMonth (), getDay ())) return;
 	if (isCalendar ()) {
 		this.year = year;
-		OS.gtk_calendar_select_month (calendarHandle, month, year);
+		GTK.gtk_calendar_select_month (calendarHandle, month, year);
 	} else {
 		calendar.set (Calendar.YEAR, year);
 		updateControl ();
@@ -1706,13 +1706,13 @@ public void setYear (int year) {
 void setBoundsInPixels (int x, int y, int width, int height) {
 
 	//Date with Drop down is in container. Needs extra handling.
-	if (isDateWithDropDownButton () && OS.GTK3) {
+	if (isDateWithDropDownButton () && GTK.GTK3) {
 		GtkRequisition requisition = new GtkRequisition ();
-		OS.gtk_widget_get_preferred_size (textEntryHandle, null, requisition);
+		GTK.gtk_widget_get_preferred_size (textEntryHandle, null, requisition);
 		int oldHeight = requisition.height; //Entry should not expand vertically. It is single liner.
 
 		int newWidth = width - (down.getSizeInPixels ().x + getGtkBorderPadding ().right);
-		OS.gtk_widget_set_size_request (textEntryHandle, (newWidth >= 0) ? newWidth : 0, oldHeight);
+		GTK.gtk_widget_set_size_request (textEntryHandle, (newWidth >= 0) ? newWidth : 0, oldHeight);
 	}
 
 	/*
@@ -1729,7 +1729,7 @@ void setBoundsInPixels (int x, int y, int width, int height) {
 	 * native height.
 	 */
 	int fixedGtkVersion = OS.VERSION (3, 14, 2);
-	if (isCalendar () && OS.GTK3 && (OS.GTK_VERSION < fixedGtkVersion)) {
+	if (isCalendar () && GTK.GTK3 && (GTK.GTK_VERSION < fixedGtkVersion)) {
 			int calendarPrefferedVerticalSize = computeSizeInPixels (SWT.DEFAULT, SWT.DEFAULT, true).y;
 			if (height > calendarPrefferedVerticalSize) {
 				height = calendarPrefferedVerticalSize;
@@ -1766,14 +1766,14 @@ private void setDropDownButtonSize () {
  * @return GtkBorder object that holds the padding values.
  */
 GtkBorder getGtkBorderPadding () {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		//In Gtk3, acquire border.
 		GtkBorder gtkBorderPadding = new GtkBorder ();
-		long /*int*/ context = OS.gtk_widget_get_style_context (textEntryHandle);
-		if (OS.GTK_VERSION < OS.VERSION(3, 18 , 0)) {
-			OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, gtkBorderPadding);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (textEntryHandle);
+		if (GTK.GTK_VERSION < OS.VERSION(3, 18 , 0)) {
+			GTK.gtk_style_context_get_padding (context, GTK.GTK_STATE_FLAG_NORMAL, gtkBorderPadding);
 		} else {
-			OS.gtk_style_context_get_padding (context, OS.gtk_widget_get_state_flags(textEntryHandle), gtkBorderPadding);
+			GTK.gtk_style_context_get_padding (context, GTK.gtk_widget_get_state_flags(textEntryHandle), gtkBorderPadding);
 		}
 		return gtkBorderPadding;
 	} else {
@@ -1905,7 +1905,7 @@ void deregister () {
 
 
 int getArrow (long /*int*/ widget) {
-	int adj_value = (int) OS.gtk_adjustment_get_value (OS.gtk_spin_button_get_adjustment (widget));
+	int adj_value = (int) GTK.gtk_adjustment_get_value (GTK.gtk_spin_button_get_adjustment (widget));
 	int new_value = 0;
 		if (isDate ()) {
 			// getMonth () return 0 as first month and 11 as last one, whereas adjusment does not, so adding one makes them comaprable
@@ -1935,8 +1935,8 @@ void setText (String dateTimeText) {
 	if (dateTimeText != null){
 		byte [] dateTimeConverted = Converter.wcsToMbcs (dateTimeText, true);
 		//note, this is ignored if the control is in a fill-layout.
-		OS.gtk_entry_set_width_chars (textEntryHandle, dateTimeText.length ());
-		OS.gtk_entry_set_text (textEntryHandle, dateTimeConverted);
+		GTK.gtk_entry_set_width_chars (textEntryHandle, dateTimeText.length ());
+		GTK.gtk_entry_set_text (textEntryHandle, dateTimeConverted);
 	}
 }
 
@@ -2007,8 +2007,8 @@ Point getSelection () {
 	Point selection;
 	int [] start = new int [1];
 	int [] end = new int [1];
-	OS.gtk_editable_get_selection_bounds (textEntryHandle, start, end);
-	long /*int*/ ptr = OS.gtk_entry_get_text (textEntryHandle);
+	GTK.gtk_editable_get_selection_bounds (textEntryHandle, start, end);
+	long /*int*/ ptr = GTK.gtk_entry_get_text (textEntryHandle);
 	start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]);
 	end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]);
 	selection = new Point (start [0], end [0]);
@@ -2031,7 +2031,7 @@ Point getSelection () {
 String getText () {
 	checkWidget ();
 	if (textEntryHandle != 0) {
-		long /*int*/ str = OS.gtk_entry_get_text (textEntryHandle);
+		long /*int*/ str = GTK.gtk_entry_get_text (textEntryHandle);
 		if (str == 0) return "";
 		int length = C.strlen (str);
 		byte [] buffer = new byte [length];
@@ -2062,11 +2062,11 @@ String getText (String str,int start, int end) {
 
 void setSelection (int start, int end) {
 	checkWidget ();
-	long /*int*/ ptr = OS.gtk_entry_get_text (textEntryHandle);
+	long /*int*/ ptr = GTK.gtk_entry_get_text (textEntryHandle);
 	start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
 	end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end);
-	OS.gtk_editable_set_position (textEntryHandle, start);
-	OS.gtk_editable_select_region (textEntryHandle, start, end);
+	GTK.gtk_editable_set_position (textEntryHandle, start);
+	GTK.gtk_editable_select_region (textEntryHandle, start, end);
 }
 
 void setTextField (int fieldName, int value, boolean commitInternalDataStructure, boolean adjustDisplayedFormatting) {
@@ -2173,10 +2173,10 @@ void replaceCurrentlySelectedTextRegion (String string) {
 	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
 	byte [] buffer = Converter.wcsToMbcs (string, false);
 	int [] start = new int [1], end = new int [1];
-	OS.gtk_editable_get_selection_bounds (textEntryHandle, start, end);
-	OS.gtk_editable_delete_selection (textEntryHandle);
-	OS.gtk_editable_insert_text (textEntryHandle, buffer, buffer.length, start);
-	OS.gtk_editable_set_position (textEntryHandle, start [0]);
+	GTK.gtk_editable_get_selection_bounds (textEntryHandle, start, end);
+	GTK.gtk_editable_delete_selection (textEntryHandle);
+	GTK.gtk_editable_insert_text (textEntryHandle, buffer, buffer.length, start);
+	GTK.gtk_editable_set_position (textEntryHandle, start [0]);
 }
 
 void onTextMouseClick (GdkEventButton event) {
@@ -2209,13 +2209,13 @@ String getText (int start, int end) {
 void selectAll () {
 	checkWidget ();
 	if (textEntryHandle != 0)
-		OS.gtk_editable_select_region (textEntryHandle, 0, -1);
+		GTK.gtk_editable_select_region (textEntryHandle, 0, -1);
 }
 
 
 void hideDateTime () {
 	if (isDate () || isTime ()){
-		OS.gtk_widget_hide (fixedHandle);
+		GTK.gtk_widget_hide (fixedHandle);
 	}
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
index 7b1c55e45c..3e815f59cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
@@ -184,7 +184,7 @@ void _setImages (Image [] images) {
 			pixbufs = OS.g_list_append (pixbufs, pixbuf);
 		}
 	}
-	OS.gtk_window_set_icon_list (topHandle (), pixbufs);
+	GTK.gtk_window_set_icon_list (topHandle (), pixbufs);
 	long /*int*/ [] data = new long /*int*/ [1];
 	long /*int*/ temp = pixbufs;
 	while (temp != 0) {
@@ -236,11 +236,11 @@ Control computeTabRoot () {
 
 void createAccelGroup () {
 	if (accelGroup != 0) return;
-	accelGroup = OS.gtk_accel_group_new ();
+	accelGroup = GTK.gtk_accel_group_new ();
 	if (accelGroup == 0) error (SWT.ERROR_NO_HANDLES);
 	//FIXME - what should we do for Decorations
 	long /*int*/ shellHandle = topHandle ();
-	OS.gtk_window_add_accel_group (shellHandle, accelGroup);
+	GTK.gtk_window_add_accel_group (shellHandle, accelGroup);
 }
 
 @Override
@@ -252,7 +252,7 @@ void createWidget (int index) {
 void destroyAccelGroup () {
 	if (accelGroup == 0) return;
 	long /*int*/ shellHandle = topHandle ();
-	OS.gtk_window_remove_accel_group (shellHandle, accelGroup);
+	GTK.gtk_window_remove_accel_group (shellHandle, accelGroup);
 	//TEMPORARY CODE
 //	OS.g_object_unref (accelGroup);
 	accelGroup = 0;
@@ -560,7 +560,7 @@ public void setDefaultButton (Button button) {
 		buttonHandle = button.handle;
 	}
 	saveDefault = defaultButton = button;
-	OS.gtk_window_set_default (topHandle (), buttonHandle);
+	GTK.gtk_window_set_default (topHandle (), buttonHandle);
 }
 
 /**
@@ -783,7 +783,7 @@ boolean traverseReturn () {
 	*/
 	if (!button.isVisible () || !button.isEnabled ()) return true;
 	long /*int*/ shellHandle = _getShell ().topHandle ();
-	return OS.gtk_window_activate_default (shellHandle);
+	return GTK.gtk_window_activate_default (shellHandle);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
index 5e809650aa..1778beef6a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -124,25 +124,25 @@ String openChooserDialog () {
 	Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
 	long /*int*/ handle = 0;
 	if (display.getDismissalAlignment() == SWT.RIGHT) {
-		if (OS.GTK3) {
-			handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_NAMED_LABEL_CANCEL, OS.GTK_RESPONSE_CANCEL, OS.GTK_NAMED_LABEL_OK, OS.GTK_RESPONSE_OK, 0);
+		if (GTK.GTK3) {
+			handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, GTK.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK.GTK_NAMED_LABEL_CANCEL, GTK.GTK_RESPONSE_CANCEL, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_RESPONSE_OK, 0);
 		} else {
-			handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
+			handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, GTK.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK.GTK_STOCK_CANCEL (), GTK.GTK_RESPONSE_CANCEL, GTK.GTK_STOCK_OK (), GTK.GTK_RESPONSE_OK, 0);
 		}
 	} else {
-		if (OS.GTK3) {
-			handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_NAMED_LABEL_OK, OS.GTK_RESPONSE_OK, OS.GTK_NAMED_LABEL_CANCEL, OS.GTK_RESPONSE_CANCEL, 0);
+		if (GTK.GTK3) {
+			handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, GTK.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_RESPONSE_OK, GTK.GTK_NAMED_LABEL_CANCEL, GTK.GTK_RESPONSE_CANCEL, 0);
 		} else {
-			handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);
+			handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, GTK.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK.GTK_STOCK_OK (), GTK.GTK_RESPONSE_OK, GTK.GTK_STOCK_CANCEL (), GTK.GTK_RESPONSE_CANCEL, 0);
 		}
 	}
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ group = OS.gtk_window_get_group(0);
-	OS.gtk_window_group_add_window (group, handle);
-	OS.gtk_window_set_modal (handle, true);
-	long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+	long /*int*/ group = GTK.gtk_window_get_group(0);
+	GTK.gtk_window_group_add_window (group, handle);
+	GTK.gtk_window_set_modal (handle, true);
+	long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (shellHandle);
 	if (pixbufs != 0) {
-		OS.gtk_window_set_icon_list (handle, pixbufs);
+		GTK.gtk_window_set_icon_list (handle, pixbufs);
 		OS.g_list_free (pixbufs);
 	}
 	if (filterPath != null && filterPath.length () > 0) {
@@ -162,7 +162,7 @@ String openChooserDialog () {
 			byte [] outputBuffer = new byte [PATH_MAX];
 			long /*int*/ ptr = OS.realpath (buffer, outputBuffer);
 			if (ptr != 0) {
-				OS.gtk_file_chooser_set_current_folder (handle, ptr);
+				GTK.gtk_file_chooser_set_current_folder (handle, ptr);
 			}
 			/* We are not doing free here because realpath returns the address of outputBuffer
 			 * which is created in this code and we let the garbage collector to take care of this
@@ -170,7 +170,7 @@ String openChooserDialog () {
 		} else {
 			long /*int*/ ptr = OS.realpath (buffer, null);
 			if (ptr != 0) {
-				OS.gtk_file_chooser_set_current_folder (handle, ptr);
+				GTK.gtk_file_chooser_set_current_folder (handle, ptr);
 				OS.g_free (ptr);
 			}
 		}
@@ -178,36 +178,36 @@ String openChooserDialog () {
 	if (message.length () > 0) {
 		byte [] buffer = Converter.wcsToMbcs (message, true);
 		long /*int*/ box = 0;
-		if (OS.GTK3) {
-			box = OS.gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, 0);
-			OS.gtk_box_set_homogeneous (box, false);
+		if (GTK.GTK3) {
+			box = GTK.gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, 0);
+			GTK.gtk_box_set_homogeneous (box, false);
 		} else {
-			box = OS.gtk_hbox_new (false, 0);
+			box = GTK.gtk_hbox_new (false, 0);
 		}
 		if (box == 0) error (SWT.ERROR_NO_HANDLES);
-		long /*int*/ label = OS.gtk_label_new (buffer);
+		long /*int*/ label = GTK.gtk_label_new (buffer);
 		if (label == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (box, label);
-		OS.gtk_widget_show (label);
-		OS.gtk_label_set_line_wrap (label, true);
-		OS.gtk_label_set_justify (label, OS.GTK_JUSTIFY_CENTER);
-		OS.gtk_file_chooser_set_extra_widget (handle, box);
+		GTK.gtk_container_add (box, label);
+		GTK.gtk_widget_show (label);
+		GTK.gtk_label_set_line_wrap (label, true);
+		GTK.gtk_label_set_justify (label, GTK.GTK_JUSTIFY_CENTER);
+		GTK.gtk_file_chooser_set_extra_widget (handle, box);
 	}
 	String answer = null;
 	display.addIdleProc ();
 	Dialog oldModal = null;
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		oldModal = display.getModalDialog ();
 		display.setModalDialog (this);
 	}
 	int signalId = 0;
 	long /*int*/ hookId = 0;
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
-		signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
+		signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
 		hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
 	}
 	display.sendPreExternalEventDispatchEvent ();
-	int response = OS.gtk_dialog_run (handle);
+	int response = GTK.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -219,11 +219,11 @@ String openChooserDialog () {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
 		OS.g_signal_remove_emission_hook (signalId, hookId);
 	}
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		display.setModalDialog (oldModal);
 	}
-	if (response == OS.GTK_RESPONSE_OK) {
-		long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);
+	if (response == GTK.GTK_RESPONSE_OK) {
+		long /*int*/ path = GTK.gtk_file_chooser_get_filename (handle);
 		if (path != 0) {
 			long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
 			if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path);
@@ -244,7 +244,7 @@ String openChooserDialog () {
 		}
 	}
 	display.removeIdleProc ();
-	OS.gtk_widget_destroy (handle);
+	GTK.gtk_widget_destroy (handle);
 	return answer;
 }
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index c2e67213aa..c582293932 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -647,11 +647,11 @@ void addGdkEvent (long /*int*/ event) {
 		gdkEventWidgets = newWidgets;
 	}
 	Widget widget = null;
-	long /*int*/ handle = OS.gtk_get_event_widget (event);
+	long /*int*/ handle = GTK.gtk_get_event_widget (event);
 	if (handle != 0) {
 		do {
 			widget = getWidget (handle);
-		} while (widget == null && (handle = OS.gtk_widget_get_parent (handle)) != 0);
+		} while (widget == null && (handle = GTK.gtk_widget_get_parent (handle)) != 0);
 	}
 	gdkEvents [gdkEventCount] = event;
 	gdkEventWidgets [gdkEventCount] = widget;
@@ -746,8 +746,8 @@ private void gdbus_init_methods() {
 
 long /*int*/ allChildrenProc (long /*int*/ widget, long /*int*/ recurse) {
 	allChildren = OS.g_list_append (allChildren, widget);
-	if (recurse != 0 && OS.GTK_IS_CONTAINER (widget)) {
-		OS.gtk_container_forall (widget, allChildrenProc, recurse);
+	if (recurse != 0 && GTK.GTK_IS_CONTAINER (widget)) {
+		GTK.gtk_container_forall (widget, allChildrenProc, recurse);
 	}
 	return 0;
 }
@@ -1008,18 +1008,18 @@ void createDisplay (DeviceData data) {
 			OS.g_thread_init(0);
 		}
 	}
-	if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) {
+	if (!GTK.gtk_init_check (new long /*int*/ [] {0}, null)) {
 		SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]"); //$NON-NLS-1$
 	}
 	//set GTK+ Theme name as property for introspection purposes
 	System.setProperty("org.eclipse.swt.internal.gtk.theme", OS.getThemeName());
 	if (OS.isX11()) xDisplay = OS.gdk_x11_get_default_xdisplay();
-	int major = OS.gtk_major_version ();
+	int major = GTK.gtk_major_version ();
 	long /*int*/ ptr;
 	if (major == GTK3_MAJOR) {
-		ptr = OS.gtk_check_version (GTK3_MAJOR, GTK3_MINOR, GTK3_MICRO);
+		ptr = GTK.gtk_check_version (GTK3_MAJOR, GTK3_MINOR, GTK3_MICRO);
 	} else {
-		ptr = OS.gtk_check_version (GTK2_MAJOR, GTK2_MINOR, GTK2_MICRO);
+		ptr = GTK.gtk_check_version (GTK2_MAJOR, GTK2_MINOR, GTK2_MICRO);
 	}
 	if (ptr != 0) {
 		int length = C.strlen (ptr);
@@ -1027,10 +1027,10 @@ void createDisplay (DeviceData data) {
 		C.memmove (buffer, ptr, length);
 		System.out.println ("***WARNING: " + new String (Converter.mbcsToWcs (buffer))); //$NON-NLS-1$
 		System.out.println ("***WARNING: SWT requires GTK " + GTK2_MAJOR+ "." + GTK2_MINOR + "." + GTK2_MICRO); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		int minor = OS.gtk_minor_version (), micro = OS.gtk_micro_version ();
+		int minor = GTK.gtk_minor_version (), micro = GTK.gtk_micro_version ();
 		System.out.println ("***WARNING: Detected: " + major + "." + minor + "." + micro); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		fixed_type = OS.swt_fixed_get_type();
 	}
 	if (fixed_type == 0) {
@@ -1045,7 +1045,7 @@ void createDisplay (DeviceData data) {
 		fixedSizeAllocateProc = fixedSizeAllocateCallback.getAddress ();
 		if (fixedSizeAllocateProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 		long /*int*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof);
-		OS.g_type_query (OS.GTK_TYPE_FIXED(), queryPtr);
+		OS.g_type_query (GTK.GTK_TYPE_FIXED(), queryPtr);
 		GTypeQuery query = new GTypeQuery ();
 		OS.memmove (query, queryPtr, GTypeQuery.sizeof);
 		OS.g_free (queryPtr);
@@ -1055,7 +1055,7 @@ void createDisplay (DeviceData data) {
 		fixed_info.instance_size = (short) query.instance_size;
 		fixed_info_ptr = OS.g_malloc (GTypeInfo.sizeof);
 		OS.memmove (fixed_info_ptr, fixed_info, GTypeInfo.sizeof);
-		fixed_type = OS.g_type_register_static (OS.GTK_TYPE_FIXED (), type_name, fixed_info_ptr, 0);
+		fixed_type = OS.g_type_register_static (GTK.GTK_TYPE_FIXED (), type_name, fixed_info_ptr, 0);
 	}
 	if (rendererClassInitProc == 0) {
 		rendererClassInitCallback = new Callback (getClass (), "rendererClassInitProc", 2); //$NON-NLS-1$
@@ -1063,11 +1063,11 @@ void createDisplay (DeviceData data) {
 		if (rendererClassInitProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	}
 	if (rendererRenderProc == 0) {
-		rendererRenderCallback = new Callback (getClass (), "rendererRenderProc", OS.GTK3 ? 6 : 7); //$NON-NLS-1$
+		rendererRenderCallback = new Callback (getClass (), "rendererRenderProc", GTK.GTK3 ? 6 : 7); //$NON-NLS-1$
 		rendererRenderProc = rendererRenderCallback.getAddress ();
 		if (rendererRenderProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	}
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		if (rendererGetPreferredWidthProc == 0) {
 			rendererGetPreferredWidthCallback = new Callback (getClass (), "rendererGetPreferredWidthProc", 4); //$NON-NLS-1$
 			rendererGetPreferredWidthProc = rendererGetPreferredWidthCallback.getAddress ();
@@ -1082,48 +1082,48 @@ void createDisplay (DeviceData data) {
 	}
 	if (text_renderer_type == 0) {
 		GTypeInfo renderer_info = new GTypeInfo ();
-		renderer_info.class_size = (short) OS.GtkCellRendererTextClass_sizeof ();
+		renderer_info.class_size = (short) GTK.GtkCellRendererTextClass_sizeof ();
 		renderer_info.class_init = rendererClassInitProc;
-		renderer_info.instance_size = (short) OS.GtkCellRendererText_sizeof ();
+		renderer_info.instance_size = (short) GTK.GtkCellRendererText_sizeof ();
 		text_renderer_info_ptr = OS.g_malloc (GTypeInfo.sizeof);
 		OS.memmove (text_renderer_info_ptr, renderer_info, GTypeInfo.sizeof);
 		byte [] type_name = Converter.wcsToMbcs ("SwtTextRenderer", true); //$NON-NLS-1$
-		text_renderer_type = OS.g_type_register_static (OS.GTK_TYPE_CELL_RENDERER_TEXT (), type_name, text_renderer_info_ptr, 0);
+		text_renderer_type = OS.g_type_register_static (GTK.GTK_TYPE_CELL_RENDERER_TEXT (), type_name, text_renderer_info_ptr, 0);
 	}
 	if (pixbuf_renderer_type == 0) {
 		GTypeInfo renderer_info = new GTypeInfo ();
-		renderer_info.class_size = (short) OS.GtkCellRendererPixbufClass_sizeof ();
+		renderer_info.class_size = (short) GTK.GtkCellRendererPixbufClass_sizeof ();
 		renderer_info.class_init = rendererClassInitProc;
-		renderer_info.instance_size = (short) OS.GtkCellRendererPixbuf_sizeof ();
+		renderer_info.instance_size = (short) GTK.GtkCellRendererPixbuf_sizeof ();
 		pixbuf_renderer_info_ptr = OS.g_malloc (GTypeInfo.sizeof);
 		OS.memmove (pixbuf_renderer_info_ptr, renderer_info, GTypeInfo.sizeof);
 		byte [] type_name = Converter.wcsToMbcs ("SwtPixbufRenderer", true); //$NON-NLS-1$
-		pixbuf_renderer_type = OS.g_type_register_static (OS.GTK_TYPE_CELL_RENDERER_PIXBUF (), type_name, pixbuf_renderer_info_ptr, 0);
+		pixbuf_renderer_type = OS.g_type_register_static (GTK.GTK_TYPE_CELL_RENDERER_PIXBUF (), type_name, pixbuf_renderer_info_ptr, 0);
 	}
 	if (toggle_renderer_type == 0) {
 		GTypeInfo renderer_info = new GTypeInfo ();
-		renderer_info.class_size = (short) OS.GtkCellRendererToggleClass_sizeof ();
+		renderer_info.class_size = (short) GTK.GtkCellRendererToggleClass_sizeof ();
 		renderer_info.class_init = rendererClassInitProc;
-		renderer_info.instance_size = (short) OS.GtkCellRendererToggle_sizeof ();
+		renderer_info.instance_size = (short) GTK.GtkCellRendererToggle_sizeof ();
 		toggle_renderer_info_ptr = OS.g_malloc (GTypeInfo.sizeof);
 		OS.memmove (toggle_renderer_info_ptr, renderer_info, GTypeInfo.sizeof);
 		byte [] type_name = Converter.wcsToMbcs ("SwtToggleRenderer", true); //$NON-NLS-1$
-		toggle_renderer_type = OS.g_type_register_static (OS.GTK_TYPE_CELL_RENDERER_TOGGLE (), type_name, toggle_renderer_info_ptr, 0);
+		toggle_renderer_type = OS.g_type_register_static (GTK.GTK_TYPE_CELL_RENDERER_TOGGLE (), type_name, toggle_renderer_info_ptr, 0);
 	}
 
-	OS.gtk_widget_set_default_direction (OS.GTK_TEXT_DIR_LTR);
+	GTK.gtk_widget_set_default_direction (GTK.GTK_TEXT_DIR_LTR);
 	byte [] buffer = Converter.wcsToMbcs (APP_NAME, true);
 	OS.g_set_prgname (buffer);
 	OS.gdk_set_program_class (buffer);
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		byte [] flatStyle = Converter.wcsToMbcs ("style \"swt-flat\" { GtkToolbar::shadow-type = none } widget \"*.swt-toolbar-flat\" style : highest \"swt-flat\"", true); //$NON-NLS-1$
-		OS.gtk_rc_parse_string (flatStyle);
+		GTK.gtk_rc_parse_string (flatStyle);
 	}
 
 	/* Initialize the hidden shell */
-	shellHandle = OS.gtk_window_new (OS.GTK_WINDOW_TOPLEVEL);
+	shellHandle = GTK.gtk_window_new (GTK.GTK_WINDOW_TOPLEVEL);
 	if (shellHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_realize (shellHandle);
+	GTK.gtk_widget_realize (shellHandle);
 
 	/* Initialize the filter and event callback */
 	eventCallback = new Callback (this, "eventProc", 2); //$NON-NLS-1$
@@ -1137,13 +1137,13 @@ void createDisplay (DeviceData data) {
 
 	byte[] atomName = Converter.wcsToMbcs ("SWT_Window_" + APP_NAME, true); //$NON-NLS-1$
 	long /*int*/ atom = OS.gdk_atom_intern(atomName, false);
-	OS.gdk_selection_owner_set(OS.gtk_widget_get_window(shellHandle), atom, OS.CurrentTime, false);
+	OS.gdk_selection_owner_set(GTK.gtk_widget_get_window(shellHandle), atom, OS.CurrentTime, false);
 	OS.gdk_selection_owner_get(atom);
 
 	signalCallback = new Callback (this, "signalProc", 3); //$NON-NLS-1$
 	signalProc = signalCallback.getAddress ();
 	if (signalProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-	OS.gtk_widget_add_events (shellHandle, OS.GDK_PROPERTY_CHANGE_MASK);
+	GTK.gtk_widget_add_events (shellHandle, OS.GDK_PROPERTY_CHANGE_MASK);
 	OS.g_signal_connect (shellHandle, OS.property_notify_event, signalProc, PROPERTY_NOTIFY);
 
 	latinKeyGroup = findLatinKeyGroup ();
@@ -1216,7 +1216,7 @@ long /*int*/ keysChangedProc (long /*int*/ keymap, long /*int*/ user_data) {
 
 Image createImage (String name) {
 	byte[] buffer = Converter.wcsToMbcs (name, true);
-	long /*int*/ pixbuf = OS.gtk_icon_theme_load_icon(OS.gtk_icon_theme_get_default(), buffer, 48, OS.GTK_ICON_LOOKUP_FORCE_SIZE, 0);
+	long /*int*/ pixbuf = GTK.gtk_icon_theme_load_icon(GTK.gtk_icon_theme_get_default(), buffer, 48, GTK.GTK_ICON_LOOKUP_FORCE_SIZE, 0);
 	if (pixbuf == 0) return null;
 	int width = OS.gdk_pixbuf_get_width (pixbuf);
 	int height = OS.gdk_pixbuf_get_height (pixbuf);
@@ -1276,8 +1276,8 @@ void destroyDisplay () {
 }
 
 long /*int*/ emissionProc (long /*int*/ ihint, long /*int*/ n_param_values, long /*int*/ param_values, long /*int*/ data) {
-	if (OS.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) {
-		OS.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), OS.GTK_TEXT_DIR_RTL);
+	if (GTK.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) {
+		GTK.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), GTK.GTK_TEXT_DIR_RTL);
 	}
 	return 1;
 }
@@ -1380,7 +1380,7 @@ long /*int*/ eventProc (long /*int*/ event, long /*int*/ data) {
 	if (tracker != null) {
 		dispatch = tracker.processEvent (event);
 	}
-	if (dispatch) OS.gtk_main_do_event (event);
+	if (dispatch) GTK.gtk_main_do_event (event);
 	if (dispatchEvents == null) putGdkEvents ();
 	return 0;
 }
@@ -1491,7 +1491,7 @@ static long /*int*/ rendererClassInitProc (long /*int*/ g_class, long /*int*/ cl
 	GtkCellRendererClass klass = new GtkCellRendererClass ();
 	OS.memmove (klass, g_class);
 	klass.render = rendererRenderProc;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		klass.get_preferred_width = rendererGetPreferredWidthProc;
 	} else {
 		klass.get_size = rendererGetSizeProc;
@@ -1594,12 +1594,12 @@ public static Display getCurrent () {
 
 int getCaretBlinkTime () {
 //	checkDevice ();
-	long /*int*/ settings = OS.gtk_settings_get_default ();
+	long /*int*/ settings = GTK.gtk_settings_get_default ();
 	if (settings == 0) return 500;
 	int [] buffer = new int [1];
-	OS.g_object_get (settings, OS.gtk_cursor_blink, buffer, 0);
+	OS.g_object_get (settings, GTK.gtk_cursor_blink, buffer, 0);
 	if (buffer [0] == 0) return 0;
-	OS.g_object_get (settings, OS.gtk_cursor_blink_time, buffer, 0);
+	OS.g_object_get (settings, GTK.gtk_cursor_blink_time, buffer, 0);
 	if (buffer [0] == 0) return 500;
 	/*
 	* By experimentation, GTK application don't use the whole
@@ -1675,22 +1675,22 @@ public Control getCursorControl () {
 			Control control = (Control) widget;
 			if (control.isEnabled ()) return control;
 		}
-	} while ((handle = OS.gtk_widget_get_parent (handle)) != 0);
+	} while ((handle = GTK.gtk_widget_get_parent (handle)) != 0);
 	return null;
 }
 
 static GtkBorder getEntryInnerBorder (long /*int*/ handle) {
     GtkBorder gtkBorder = new GtkBorder();
-    long /*int*/ border = OS.gtk_entry_get_inner_border (handle);
+    long /*int*/ border = GTK.gtk_entry_get_inner_border (handle);
     if (border != 0) {
     	OS.memmove (gtkBorder, border, GtkBorder.sizeof);
     	return gtkBorder;
     }
     long /*int*/ []  borderPtr = new long /*int*/ [1];
-    OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
+    GTK.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
     if (borderPtr[0] != 0) {
         OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
-        OS.gtk_border_free(borderPtr[0]);
+        GTK.gtk_border_free(borderPtr[0]);
         return gtkBorder;
     }
     gtkBorder.left = INNER_BORDER;
@@ -1757,7 +1757,7 @@ Point getCursorLocationInPixels () {
 		Shell tempShell = activeShell;
 		int [] offsetX = new int [1], offsetY = new int [1];
 		while (tempShell.getParent() != null) {
-			OS.gtk_window_get_position(tempShell.shellHandle, offsetX, offsetY);
+			GTK.gtk_window_get_position(tempShell.shellHandle, offsetX, offsetY);
 			x[0]+= offsetX[0];
 			y[0]+= offsetY[0];
 			tempShell = tempShell.getParent().getShell();
@@ -1921,8 +1921,8 @@ String gtk_css_default_theme_values (int swt) {
 	}
 
 	// Fetch the actual theme in char/string format
-	long /*int*/ themeProvider = OS.gtk_css_provider_get_named(buffer, null);
-	str = OS.gtk_css_provider_to_string (themeProvider);
+	long /*int*/ themeProvider = GTK.gtk_css_provider_get_named(buffer, null);
+	str = GTK.gtk_css_provider_to_string (themeProvider);
 	length = C.strlen (str);
 	if (length == 0) {
 		return "";
@@ -2102,7 +2102,7 @@ String gtk_css_default_theme_values_irregular(int swt, String cssOutput, long /*
 		case SWT.COLOR_INFO_FOREGROUND:
 			selected = cssOutput.indexOf ("@define-color tooltip_fg_color");
 			tSelected = cssOutput.indexOf ("@define-color theme_tooltip_fg_color");
-			if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+			if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 				classDef = cssOutput.indexOf ("tooltip * {");
 			} else {
 				classDef = cssOutput.indexOf (".tooltip {");
@@ -2117,7 +2117,7 @@ String gtk_css_default_theme_values_irregular(int swt, String cssOutput, long /*
 					break;
 				}
 			} else if (classDef != -1){
-				if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+				if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 					COLOR_INFO_FOREGROUND_RGBA = gtk_css_parse_foreground(themeProvider, "tooltip * {");
 				} else {
 					COLOR_INFO_FOREGROUND_RGBA = gtk_css_parse_foreground(themeProvider, ".tooltip {");
@@ -2192,7 +2192,7 @@ GdkRGBA gtk_css_parse_background (long /*int*/ provider, String precise) {
 	int startIndex;
 	GdkRGBA rgba = new GdkRGBA ();
 	// Fetch the CSS in char/string format from the GtkCssProvider.
-	long /*int*/ str = OS.gtk_css_provider_to_string (provider);
+	long /*int*/ str = GTK.gtk_css_provider_to_string (provider);
 	if (str == 0) return COLOR_WIDGET_BACKGROUND_RGBA;
 	int length = C.strlen (str);
 	byte [] buffer = new byte [length];
@@ -2256,7 +2256,7 @@ GdkRGBA gtk_css_parse_foreground (long /*int*/ provider, String precise) {
 	int startIndex;
 	GdkRGBA rgba = new GdkRGBA ();
 	// Fetch the CSS in char/string format from the provider.
-	long /*int*/ str = OS.gtk_css_provider_to_string(provider);
+	long /*int*/ str = GTK.gtk_css_provider_to_string(provider);
 	if (str == 0) return COLOR_WIDGET_FOREGROUND_RGBA;
 	int length = C.strlen (str);
 	byte [] buffer = new byte [length];
@@ -2375,7 +2375,7 @@ String gtk_rgba_to_css_string (GdkRGBA rgba) {
  * @return a String representation of the widget's name
  */
 String gtk_widget_get_name(long /*int*/ handle) {
-	long /*int*/ str = OS.gtk_widget_get_name (handle);
+	long /*int*/ str = GTK.gtk_widget_get_name (handle);
 	String name;
 	if (str == 0) {
 		name = "*";
@@ -2397,7 +2397,7 @@ String gtk_widget_get_name(long /*int*/ handle) {
  * @return a String representation of the widget's CSS name
  */
 String gtk_widget_class_get_css_name(long /*int*/ handle) {
-	long /*int*/ str = OS.gtk_widget_class_get_css_name (OS.GTK_WIDGET_GET_CLASS(handle));
+	long /*int*/ str = GTK.gtk_widget_class_get_css_name (GTK.GTK_WIDGET_GET_CLASS(handle));
 	String name;
 	if (str == 0) {
 		name = "*";
@@ -2467,8 +2467,8 @@ public Menu getMenuBar () {
 public int getDismissalAlignment () {
 	checkDevice ();
 	int [] buffer = new int [1];
-	long /*int*/ settings = OS.gtk_settings_get_default ();
-	OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
+	long /*int*/ settings = GTK.gtk_settings_get_default ();
+	OS.g_object_get (settings, GTK.gtk_alternative_button_order, buffer, 0);
 	return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;
 }
 
@@ -2486,9 +2486,9 @@ public int getDismissalAlignment () {
  */
 public int getDoubleClickTime () {
 	checkDevice ();
-	long /*int*/ settings = OS.gtk_settings_get_default ();
+	long /*int*/ settings = GTK.gtk_settings_get_default ();
 	int [] buffer = new int [1];
-	OS.g_object_get (settings, OS.gtk_double_click_time, buffer, 0);
+	OS.g_object_get (settings, GTK.gtk_double_click_time, buffer, 0);
 	return buffer [0];
 }
 
@@ -2512,7 +2512,7 @@ public Control getFocusControl () {
 	}
 	if (activeShell == null) return null;
 	long /*int*/ shellHandle = activeShell.shellHandle;
-	long /*int*/ handle = OS.gtk_window_get_focus (shellHandle);
+	long /*int*/ handle = GTK.gtk_window_get_focus (shellHandle);
 	if (handle == 0) return null;
 	do {
 		Widget widget = getWidget (handle);
@@ -2520,7 +2520,7 @@ public Control getFocusControl () {
 			Control control = (Control) widget;
 			return control.isEnabled () ? control : null;
 		}
-	} while ((handle = OS.gtk_widget_get_parent (handle)) != 0);
+	} while ((handle = GTK.gtk_widget_get_parent (handle)) != 0);
 	return null;
 }
 
@@ -2659,7 +2659,7 @@ public Monitor [] getMonitors () {
 				monitor.width = DPIUtil.autoScaleDown (dest.width);
 				monitor.height = DPIUtil.autoScaleDown (dest.height);
 
-				if (OS.GTK_VERSION >= OS.VERSION (3, 4, 0)) {
+				if (GTK.GTK_VERSION >= OS.VERSION (3, 4, 0)) {
 					// workarea was defined in GTK 3.4. If present, it will return the best results
 					// since it takes into account per-monitor trim
 					OS.gdk_screen_get_monitor_workarea (screen, i, dest);
@@ -2846,7 +2846,7 @@ public Thread getSyncThread () {
 @Override
 public Color getSystemColor (int id) {
 	checkDevice ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = null;
 		switch (id) {
 		case SWT.COLOR_LINK_FOREGROUND: 					gdkRGBA = copyRGBA(COLOR_LINK_FOREGROUND_RGBA); break;
@@ -3070,7 +3070,7 @@ GdkRGBA toGdkRGBA (GdkRGBA rgba, double brightness) {
 	double[] hue = new double[1];
 	double[] saturationHSV = new double[1];
 	double[] value = new double[1];
-	OS.gtk_rgb_to_hsv(newRGBA.red, newRGBA.green, newRGBA.blue, hue, saturationHSV, value);
+	GTK.gtk_rgb_to_hsv(newRGBA.red, newRGBA.green, newRGBA.blue, hue, saturationHSV, value);
 
 	// Calculate luminosity
 	double luminosity = ((2 - saturationHSV[0]) * value[0]) / 2;
@@ -3090,7 +3090,7 @@ GdkRGBA toGdkRGBA (GdkRGBA rgba, double brightness) {
 	saturationHSV[0] = (2 * saturationHSL) / (luminosity + saturationHSL);
 
 	// Convert from HSV back to RGB and return the GdkRGBA object
-	OS.gtk_hsv_to_rgb(hue[0], saturationHSV[0], value[0], hue, saturationHSV, value);
+	GTK.gtk_hsv_to_rgb(hue[0], saturationHSV[0], value[0], hue, saturationHSV, value);
 	newRGBA.red = hue[0];
 	newRGBA.green = saturationHSV[0];
 	newRGBA.blue = value[0];
@@ -3098,17 +3098,17 @@ GdkRGBA toGdkRGBA (GdkRGBA rgba, double brightness) {
 }
 
 GdkRGBA getBackgroundColor (long /*int*/ context, int state) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	/*
 	* Draw the context background to an offset screen surface and get the color
 	* in the middle of the surface.
 	*/
 	GdkRGBA rgba = new GdkRGBA ();
-	OS.gtk_style_context_save (context);
-	OS.gtk_style_context_set_state (context, state);
+	GTK.gtk_style_context_save (context);
+	GTK.gtk_style_context_set_state (context, state);
 	long /*int*/ surface = Cairo.cairo_image_surface_create (Cairo.CAIRO_FORMAT_RGB24, 1, 1);
 	long /*int*/ cairo = Cairo.cairo_create (surface);
-	OS.gtk_render_background (context, cairo, -50, -50, 100, 100);
+	GTK.gtk_render_background (context, cairo, -50, -50, 100, 100);
 	Cairo.cairo_fill (cairo);
 	Cairo.cairo_surface_flush (surface);
 	byte[] buffer = new byte[3];
@@ -3119,7 +3119,7 @@ GdkRGBA getBackgroundColor (long /*int*/ context, int state) {
 	rgba.alpha = 1.0;
 	Cairo.cairo_surface_destroy (surface);
 	Cairo.cairo_destroy (cairo);
-	OS.gtk_style_context_restore (context);
+	GTK.gtk_style_context_restore (context);
 	return rgba;
 }
 
@@ -3135,13 +3135,13 @@ GdkRGBA copyRGBA (GdkRGBA source) {
 }
 
 void initializeSystemColors () {
-	long /*int*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
+	long /*int*/ tooltipShellHandle = GTK.gtk_window_new (GTK.GTK_WINDOW_POPUP);
 	if (tooltipShellHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	byte[] gtk_tooltip = Converter.wcsToMbcs (OS.GTK3 ? "gtk-tooltip" : "gtk-tooltips", true); //$NON-NLS-1$
-	OS.gtk_widget_set_name (tooltipShellHandle, gtk_tooltip);
-	OS.gtk_widget_realize (tooltipShellHandle);
+	byte[] gtk_tooltip = Converter.wcsToMbcs (GTK.GTK3 ? "gtk-tooltip" : "gtk-tooltips", true); //$NON-NLS-1$
+	GTK.gtk_widget_set_name (tooltipShellHandle, gtk_tooltip);
+	GTK.gtk_widget_realize (tooltipShellHandle);
 
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		COLOR_WIDGET_DARK_SHADOW_RGBA = new GdkRGBA ();
 		COLOR_WIDGET_DARK_SHADOW_RGBA.alpha = 1.0;
 		/*
@@ -3163,174 +3163,174 @@ void initializeSystemColors () {
 		 * them, while some colors only have one potential match. Therefore
 		 * some colors will have better theme coverage than others.
 		 */
-		long /*int*/ context = OS.gtk_widget_get_style_context (tooltipShellHandle);
-		OS.gtk_style_context_add_class (context, OS.GTK_STYLE_CLASS_TOOLTIP);
-		OS.gtk_style_context_invalidate(context);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (tooltipShellHandle);
+		GTK.gtk_style_context_add_class (context, GTK.GTK_STYLE_CLASS_TOOLTIP);
+		GTK.gtk_style_context_invalidate(context);
 		GdkRGBA rgba = new GdkRGBA();
 
 		// Initialize and create a list of X11 named colors
 		initializeColorList();
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorInfoForeground = gtk_css_default_theme_values(SWT.COLOR_INFO_FOREGROUND);
 			if (!colorInfoForeground.isEmpty()) {
 				if (colorInfoForeground != "parsed") {
 					COLOR_INFO_FOREGROUND_RGBA = gtk_css_property_to_rgba (colorInfoForeground);
 				}
 			} else {
-				COLOR_INFO_FOREGROUND_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL);
+				COLOR_INFO_FOREGROUND_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 			}
 		} else {
-			COLOR_INFO_FOREGROUND_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL);
+			COLOR_INFO_FOREGROUND_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 		}
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorInfoBackground = gtk_css_default_theme_values(SWT.COLOR_INFO_BACKGROUND);
 			if (!colorInfoBackground.isEmpty()) {
 				if (colorInfoBackground != "parsed") {
 					COLOR_INFO_BACKGROUND_RGBA = gtk_css_property_to_rgba (colorInfoBackground);
 				}
 			} else {
-				COLOR_INFO_BACKGROUND_RGBA = getBackgroundColor (context, OS.GTK_STATE_FLAG_NORMAL);
+				COLOR_INFO_BACKGROUND_RGBA = getBackgroundColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 			}
 		} else {
-			COLOR_INFO_BACKGROUND_RGBA = getBackgroundColor (context, OS.GTK_STATE_FLAG_NORMAL);
+			COLOR_INFO_BACKGROUND_RGBA = getBackgroundColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 		}
-		OS.gtk_widget_destroy (tooltipShellHandle);
+		GTK.gtk_widget_destroy (tooltipShellHandle);
 
-		context = OS.gtk_widget_get_style_context (shellHandle);
+		context = GTK.gtk_widget_get_style_context (shellHandle);
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorWidgetForeground = gtk_css_default_theme_values(SWT.COLOR_WIDGET_FOREGROUND);
 			if (!colorWidgetForeground.isEmpty()) {
 				COLOR_WIDGET_FOREGROUND_RGBA = gtk_css_property_to_rgba (colorWidgetForeground);
 			} else {
-				COLOR_WIDGET_FOREGROUND_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL);
+				COLOR_WIDGET_FOREGROUND_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 			}
 		} else {
-			COLOR_WIDGET_FOREGROUND_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL);
+			COLOR_WIDGET_FOREGROUND_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 		}
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorWidgetBackground = gtk_css_default_theme_values(SWT.COLOR_WIDGET_BACKGROUND);
 			if (!colorWidgetBackground.isEmpty()) {
 				COLOR_WIDGET_BACKGROUND_RGBA = gtk_css_property_to_rgba (colorWidgetBackground);
 			} else {
-				OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
+				GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba);
 				COLOR_WIDGET_BACKGROUND_RGBA = copyRGBA (rgba);
 			}
 		} else {
-			OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
+			GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba);
 			COLOR_WIDGET_BACKGROUND_RGBA = copyRGBA (rgba);
 		}
 		COLOR_WIDGET_LIGHT_SHADOW_RGBA = COLOR_WIDGET_BACKGROUND_RGBA;
 		COLOR_WIDGET_NORMAL_SHADOW_RGBA = toGdkRGBA (COLOR_WIDGET_BACKGROUND_RGBA, 0.7);
 		COLOR_WIDGET_HIGHLIGHT_SHADOW_RGBA = toGdkRGBA (COLOR_WIDGET_BACKGROUND_RGBA, 1.3);
 
-		OS.gtk_style_context_save (context);
-		OS.gtk_style_context_add_class(context, OS.GTK_STYLE_CLASS_VIEW);
-		OS.gtk_style_context_add_class(context, OS.GTK_STYLE_CLASS_CELL);
-		OS.gtk_style_context_invalidate(context);
+		GTK.gtk_style_context_save (context);
+		GTK.gtk_style_context_add_class(context, GTK.GTK_STYLE_CLASS_VIEW);
+		GTK.gtk_style_context_add_class(context, GTK.GTK_STYLE_CLASS_CELL);
+		GTK.gtk_style_context_invalidate(context);
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorListForeground = gtk_css_default_theme_values(SWT.COLOR_LIST_FOREGROUND);
 			if (!colorListForeground.isEmpty()) {
 				COLOR_LIST_FOREGROUND_RGBA = gtk_css_property_to_rgba (colorListForeground);
 			} else {
-				COLOR_LIST_FOREGROUND_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL);
+				COLOR_LIST_FOREGROUND_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 			}
 		} else {
-			COLOR_LIST_FOREGROUND_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_NORMAL);
+			COLOR_LIST_FOREGROUND_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_NORMAL);
 		}
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorListBackground = gtk_css_default_theme_values(SWT.COLOR_LIST_BACKGROUND);
 			if (!colorListBackground.isEmpty()) {
 				COLOR_LIST_BACKGROUND_RGBA = gtk_css_property_to_rgba (colorListBackground);
 			} else {
-				OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
+				GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba);
 				COLOR_LIST_BACKGROUND_RGBA = copyRGBA(rgba);
 			}
 		} else {
-			OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
+			GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba);
 			COLOR_LIST_BACKGROUND_RGBA = copyRGBA(rgba);
 		}
 
-		OS.gtk_style_context_restore (context);
+		GTK.gtk_style_context_restore (context);
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorListSelectionText = gtk_css_default_theme_values(SWT.COLOR_LIST_SELECTION_TEXT);
 			if (!colorListSelectionText.isEmpty()) {
 				COLOR_LIST_SELECTION_TEXT_RGBA = gtk_css_property_to_rgba (colorListSelectionText);
 			} else {
-				COLOR_LIST_SELECTION_TEXT_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_SELECTED);
+				COLOR_LIST_SELECTION_TEXT_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_SELECTED);
 			}
 		} else {
-			COLOR_LIST_SELECTION_TEXT_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_SELECTED);
+			COLOR_LIST_SELECTION_TEXT_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_SELECTED);
 		}
 		COLOR_TITLE_FOREGROUND_RGBA = COLOR_LIST_SELECTION_TEXT_RGBA;
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorListSelection = gtk_css_default_theme_values(SWT.COLOR_LIST_SELECTION);
 			if (!colorListSelection.isEmpty()) {
 				COLOR_LIST_SELECTION_RGBA = gtk_css_property_to_rgba (colorListSelection);
 			} else {
-				OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_SELECTED, rgba);
+				GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_SELECTED, rgba);
 				COLOR_LIST_SELECTION_RGBA = copyRGBA (rgba);
 			}
 		} else {
-			OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_SELECTED, rgba);
+			GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_SELECTED, rgba);
 			COLOR_LIST_SELECTION_RGBA = copyRGBA (rgba);
 		}
 		COLOR_TITLE_BACKGROUND_RGBA = COLOR_LIST_SELECTION_RGBA;
 		COLOR_TITLE_BACKGROUND_GRADIENT_RGBA = toGdkRGBA (COLOR_LIST_SELECTION_RGBA, 1.3);
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorListSelectionTextInactive = gtk_css_default_theme_values(SWT_COLOR_LIST_SELECTION_TEXT_INACTIVE);
 			if (!colorListSelectionTextInactive.isEmpty()) {
 				COLOR_LIST_SELECTION_TEXT_INACTIVE_RGBA = gtk_css_property_to_rgba (colorListSelectionTextInactive);
 			} else {
-				COLOR_LIST_SELECTION_TEXT_INACTIVE_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_ACTIVE);
+				COLOR_LIST_SELECTION_TEXT_INACTIVE_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_ACTIVE);
 			}
 		} else {
-			COLOR_LIST_SELECTION_TEXT_INACTIVE_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_ACTIVE);
+			COLOR_LIST_SELECTION_TEXT_INACTIVE_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_ACTIVE);
 		}
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorListSelectionInactive = gtk_css_default_theme_values(SWT_COLOR_LIST_SELECTION_INACTIVE);
 			if (!colorListSelectionInactive.isEmpty()) {
 				COLOR_LIST_SELECTION_INACTIVE_RGBA = gtk_css_property_to_rgba (colorListSelectionInactive);
 			} else {
-				OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_ACTIVE, rgba);
+				GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_ACTIVE, rgba);
 				COLOR_LIST_SELECTION_INACTIVE_RGBA = copyRGBA (rgba);
 			}
 		} else {
-			OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_ACTIVE, rgba);
+			GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_ACTIVE, rgba);
 			COLOR_LIST_SELECTION_INACTIVE_RGBA = copyRGBA (rgba);
 		}
 
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorTitleInactiveForeground = gtk_css_default_theme_values(SWT.COLOR_TITLE_INACTIVE_FOREGROUND);
 			if (!colorTitleInactiveForeground.isEmpty()) {
 				COLOR_TITLE_INACTIVE_FOREGROUND_RGBA = gtk_css_property_to_rgba (colorTitleInactiveForeground);
 			} else {
-				COLOR_TITLE_INACTIVE_FOREGROUND_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_INSENSITIVE);
+				COLOR_TITLE_INACTIVE_FOREGROUND_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_INSENSITIVE);
 			}
 		} else {
-			COLOR_TITLE_INACTIVE_FOREGROUND_RGBA = styleContextGetColor (context, OS.GTK_STATE_FLAG_INSENSITIVE);
+			COLOR_TITLE_INACTIVE_FOREGROUND_RGBA = styleContextGetColor (context, GTK.GTK_STATE_FLAG_INSENSITIVE);
 		}
 
 		COLOR_TITLE_INACTIVE_BACKGROUND_RGBA = rgba;
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorTitleInactiveBackground = gtk_css_default_theme_values(SWT.COLOR_TITLE_INACTIVE_BACKGROUND);
 			if (!colorTitleInactiveBackground.isEmpty()) {
 				COLOR_TITLE_INACTIVE_BACKGROUND_RGBA = gtk_css_property_to_rgba (colorTitleInactiveBackground);
 			} else {
-				OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_INSENSITIVE, rgba);
+				GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_INSENSITIVE, rgba);
 				COLOR_TITLE_INACTIVE_BACKGROUND_RGBA = copyRGBA (rgba);
 			}
 		} else {
-			OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_INSENSITIVE, rgba);
+			GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_INSENSITIVE, rgba);
 			COLOR_TITLE_INACTIVE_BACKGROUND_RGBA = copyRGBA (rgba);
 		}
 		COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT_RGBA = toGdkRGBA (COLOR_TITLE_INACTIVE_BACKGROUND_RGBA, 1.3);
@@ -3338,7 +3338,7 @@ void initializeSystemColors () {
 		// NOTE: If COLOR_LINK_FOREGROUND cannot be found from the GTK CSS theme then there is no reliable
 		// way to find it on GTK3 using GtkStyleContext machinery. Use COLOR_LIST_SELECTION instead
 		// as they are often the same.
-		if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 			String colorLinkForeground = gtk_css_default_theme_values(SWT.COLOR_LINK_FOREGROUND);
 			if (!colorLinkForeground.isEmpty()) {
 				if (colorLinkForeground != "parsed") {
@@ -3359,34 +3359,34 @@ void initializeSystemColors () {
 		OS.gdk_colormap_alloc_color(colormap, COLOR_LINK_FOREGROUND, true, true);
 
 		/* Get Tooltip resources */
-		long /*int*/ tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle);
+		long /*int*/ tooltipStyle = GTK.gtk_widget_get_style (tooltipShellHandle);
 		GdkColor gdkColor = new GdkColor();
-		OS.gtk_style_get_fg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_fg (tooltipStyle, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_INFO_FOREGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_bg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_bg (tooltipStyle, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_INFO_BACKGROUND = gdkColor;
-		OS.gtk_widget_destroy (tooltipShellHandle);
+		GTK.gtk_widget_destroy (tooltipShellHandle);
 
 		/* Get Shell resources */
-		long /*int*/ style = OS.gtk_widget_get_style (shellHandle);
+		long /*int*/ style = GTK.gtk_widget_get_style (shellHandle);
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_black (style, gdkColor);
+		GTK.gtk_style_get_black (style, gdkColor);
 		COLOR_WIDGET_DARK_SHADOW = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_dark (style, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_dark (style, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_WIDGET_NORMAL_SHADOW = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_bg (style, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_bg (style, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_WIDGET_LIGHT_SHADOW = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_light (style, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_light (style, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_WIDGET_HIGHLIGHT_SHADOW = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_fg (style, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_fg (style, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_WIDGET_FOREGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_bg (style, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_bg (style, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_WIDGET_BACKGROUND = gdkColor;
 		//gdkColor = new GdkColor();
 		//OS.gtk_style_get_text (style, OS.GTK_STATE_NORMAL, gdkColor);
@@ -3395,40 +3395,40 @@ void initializeSystemColors () {
 		//OS.gtk_style_get_base (style, OS.GTK_STATE_NORMAL, gdkColor);
 		//COLOR_TEXT_BACKGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_text (style, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_text (style, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_LIST_FOREGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_base (style, OS.GTK_STATE_NORMAL, gdkColor);
+		GTK.gtk_style_get_base (style, GTK.GTK_STATE_NORMAL, gdkColor);
 		COLOR_LIST_BACKGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_text (style, OS.GTK_STATE_SELECTED, gdkColor);
+		GTK.gtk_style_get_text (style, GTK.GTK_STATE_SELECTED, gdkColor);
 		COLOR_LIST_SELECTION_TEXT = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_base (style, OS.GTK_STATE_SELECTED, gdkColor);
+		GTK.gtk_style_get_base (style, GTK.GTK_STATE_SELECTED, gdkColor);
 		COLOR_LIST_SELECTION = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_text (style, OS.GTK_STATE_ACTIVE, gdkColor);
+		GTK.gtk_style_get_text (style, GTK.GTK_STATE_ACTIVE, gdkColor);
 		COLOR_LIST_SELECTION_TEXT_INACTIVE = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_base (style, OS.GTK_STATE_ACTIVE, gdkColor);
+		GTK.gtk_style_get_base (style, GTK.GTK_STATE_ACTIVE, gdkColor);
 		COLOR_LIST_SELECTION_INACTIVE = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_bg (style, OS.GTK_STATE_SELECTED, gdkColor);
+		GTK.gtk_style_get_bg (style, GTK.GTK_STATE_SELECTED, gdkColor);
 		COLOR_TITLE_BACKGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_fg (style, OS.GTK_STATE_SELECTED, gdkColor);
+		GTK.gtk_style_get_fg (style, GTK.GTK_STATE_SELECTED, gdkColor);
 		COLOR_TITLE_FOREGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_light (style, OS.GTK_STATE_SELECTED, gdkColor);
+		GTK.gtk_style_get_light (style, GTK.GTK_STATE_SELECTED, gdkColor);
 		COLOR_TITLE_BACKGROUND_GRADIENT = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_bg (style, OS.GTK_STATE_INSENSITIVE, gdkColor);
+		GTK.gtk_style_get_bg (style, GTK.GTK_STATE_INSENSITIVE, gdkColor);
 		COLOR_TITLE_INACTIVE_BACKGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_fg (style, OS.GTK_STATE_INSENSITIVE, gdkColor);
+		GTK.gtk_style_get_fg (style, GTK.GTK_STATE_INSENSITIVE, gdkColor);
 		COLOR_TITLE_INACTIVE_FOREGROUND = gdkColor;
 		gdkColor = new GdkColor();
-		OS.gtk_style_get_light (style, OS.GTK_STATE_INSENSITIVE, gdkColor);
+		GTK.gtk_style_get_light (style, GTK.GTK_STATE_INSENSITIVE, gdkColor);
 		COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT = gdkColor;
 
 	}
@@ -3438,11 +3438,11 @@ void initializeSystemColors () {
  * Initialize COLOR_LINK_FOREGROUND in a helper method to allow for calling on GTK2.
  */
 GdkColor initializeColorLinkForeground (long /*int*/ tooltipShellHandle) {
-	long /*int*/ linkWidget = OS.gtk_label_new (new byte[1]);
+	long /*int*/ linkWidget = GTK.gtk_label_new (new byte[1]);
 	if (linkWidget == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (tooltipShellHandle, linkWidget);
+	GTK.gtk_container_add (tooltipShellHandle, linkWidget);
 	long /*int*/ [] linkColor = new long /*int*/ [1];
-	OS.gtk_widget_style_get (linkWidget, OS.link_color, linkColor, 0);
+	GTK.gtk_widget_style_get (linkWidget, OS.link_color, linkColor, 0);
 	GdkColor gdkColor = new GdkColor();
 	if (linkColor [0] != 0) {
 		OS.memmove (gdkColor, linkColor[0], GdkColor.sizeof);
@@ -3454,7 +3454,7 @@ GdkColor initializeColorLinkForeground (long /*int*/ tooltipShellHandle) {
 }
 
 GdkRGBA styleContextGetColor(long /*int*/ context, int flag) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	/*
 	* Feature in GTK: we need to handle calls to gtk_style_context_get_color()
 	* differently due to changes in GTK3.18+. This solves failing test cases
@@ -3462,13 +3462,13 @@ GdkRGBA styleContextGetColor(long /*int*/ context, int flag) {
 	* Reference: https://blogs.gnome.org/mclasen/2015/11/20/a-gtk-update/
 	*/
 	GdkRGBA rgba = new GdkRGBA ();
-	if (OS.GTK_VERSION >= OS.VERSION(3, 18, 0)) {
-		OS.gtk_style_context_save(context);
-		OS.gtk_style_context_set_state(context, flag);
-		OS.gtk_style_context_get_color (context, flag, rgba);
-		OS.gtk_style_context_restore(context);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 18, 0)) {
+		GTK.gtk_style_context_save(context);
+		GTK.gtk_style_context_set_state(context, flag);
+		GTK.gtk_style_context_get_color (context, flag, rgba);
+		GTK.gtk_style_context_restore(context);
 	} else {
-		OS.gtk_style_context_get_color (context, flag, rgba);
+		GTK.gtk_style_context_get_color (context, flag, rgba);
 	}
 	return rgba;
 }
@@ -3590,38 +3590,38 @@ void initializeCallbacks () {
 	signalIds = new int [Widget.LAST_SIGNAL];
 
 	/* Cache signals for GtkWidget */
-	signalIds [Widget.BUTTON_PRESS_EVENT] = OS.g_signal_lookup (OS.button_press_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.BUTTON_RELEASE_EVENT] = OS.g_signal_lookup (OS.button_release_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.CONFIGURE_EVENT] = OS.g_signal_lookup (OS.configure_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.DELETE_EVENT] = OS.g_signal_lookup (OS.delete_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.ENTER_NOTIFY_EVENT] = OS.g_signal_lookup (OS.enter_notify_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.EVENT] = OS.g_signal_lookup (OS.event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.EVENT_AFTER] = OS.g_signal_lookup (OS.event_after, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.EXPOSE_EVENT] = OS.g_signal_lookup (OS.GTK3 ? OS.draw : OS.expose_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.EXPOSE_EVENT_INVERSE] = OS.g_signal_lookup (OS.GTK3 ? OS.draw : OS.expose_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.FOCUS] = OS.g_signal_lookup (OS.focus, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.FOCUS_IN_EVENT] = OS.g_signal_lookup (OS.focus_in_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.FOCUS_OUT_EVENT] = OS.g_signal_lookup (OS.focus_out_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.GRAB_FOCUS] = OS.g_signal_lookup (OS.grab_focus, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.HIDE] = OS.g_signal_lookup (OS.hide, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.KEY_PRESS_EVENT] = OS.g_signal_lookup (OS.key_press_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.KEY_RELEASE_EVENT] = OS.g_signal_lookup (OS.key_release_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.LEAVE_NOTIFY_EVENT] = OS.g_signal_lookup (OS.leave_notify_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.MAP] = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.MAP_EVENT] = OS.g_signal_lookup (OS.map_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.MNEMONIC_ACTIVATE] = OS.g_signal_lookup (OS.mnemonic_activate, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.MOTION_NOTIFY_EVENT] = OS.g_signal_lookup (OS.motion_notify_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.POPUP_MENU] = OS.g_signal_lookup (OS.popup_menu, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.REALIZE] = OS.g_signal_lookup (OS.realize, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.SCROLL_EVENT] = OS.g_signal_lookup (OS.scroll_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.SHOW] = OS.g_signal_lookup (OS.show, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.SHOW_HELP] = OS.g_signal_lookup (OS.show_help, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.SIZE_ALLOCATE] = OS.g_signal_lookup (OS.size_allocate, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.STYLE_SET] = OS.g_signal_lookup (OS.style_set, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.UNMAP] = OS.g_signal_lookup (OS.unmap, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.UNMAP_EVENT] = OS.g_signal_lookup (OS.unmap_event, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.UNREALIZE] = OS.g_signal_lookup (OS.realize, OS.GTK_TYPE_WIDGET ());
-	signalIds [Widget.WINDOW_STATE_EVENT] = OS.g_signal_lookup (OS.window_state_event, OS.GTK_TYPE_WIDGET ());
+	signalIds [Widget.BUTTON_PRESS_EVENT] = OS.g_signal_lookup (OS.button_press_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.BUTTON_RELEASE_EVENT] = OS.g_signal_lookup (OS.button_release_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.CONFIGURE_EVENT] = OS.g_signal_lookup (OS.configure_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.DELETE_EVENT] = OS.g_signal_lookup (OS.delete_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.ENTER_NOTIFY_EVENT] = OS.g_signal_lookup (OS.enter_notify_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.EVENT] = OS.g_signal_lookup (OS.event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.EVENT_AFTER] = OS.g_signal_lookup (OS.event_after, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.EXPOSE_EVENT] = OS.g_signal_lookup (GTK.GTK3 ? OS.draw : OS.expose_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.EXPOSE_EVENT_INVERSE] = OS.g_signal_lookup (GTK.GTK3 ? OS.draw : OS.expose_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.FOCUS] = OS.g_signal_lookup (OS.focus, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.FOCUS_IN_EVENT] = OS.g_signal_lookup (OS.focus_in_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.FOCUS_OUT_EVENT] = OS.g_signal_lookup (OS.focus_out_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.GRAB_FOCUS] = OS.g_signal_lookup (OS.grab_focus, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.HIDE] = OS.g_signal_lookup (OS.hide, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.KEY_PRESS_EVENT] = OS.g_signal_lookup (OS.key_press_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.KEY_RELEASE_EVENT] = OS.g_signal_lookup (OS.key_release_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.LEAVE_NOTIFY_EVENT] = OS.g_signal_lookup (OS.leave_notify_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.MAP] = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.MAP_EVENT] = OS.g_signal_lookup (OS.map_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.MNEMONIC_ACTIVATE] = OS.g_signal_lookup (OS.mnemonic_activate, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.MOTION_NOTIFY_EVENT] = OS.g_signal_lookup (OS.motion_notify_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.POPUP_MENU] = OS.g_signal_lookup (OS.popup_menu, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.REALIZE] = OS.g_signal_lookup (OS.realize, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.SCROLL_EVENT] = OS.g_signal_lookup (OS.scroll_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.SHOW] = OS.g_signal_lookup (OS.show, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.SHOW_HELP] = OS.g_signal_lookup (OS.show_help, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.SIZE_ALLOCATE] = OS.g_signal_lookup (OS.size_allocate, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.STYLE_SET] = OS.g_signal_lookup (OS.style_set, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.UNMAP] = OS.g_signal_lookup (OS.unmap, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.UNMAP_EVENT] = OS.g_signal_lookup (OS.unmap_event, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.UNREALIZE] = OS.g_signal_lookup (OS.realize, GTK.GTK_TYPE_WIDGET ());
+	signalIds [Widget.WINDOW_STATE_EVENT] = OS.g_signal_lookup (OS.window_state_event, GTK.GTK_TYPE_WIDGET ());
 
 	windowCallback2 = new Callback (this, "windowProc", 2); //$NON-NLS-1$
 	windowProc2 = windowCallback2.getAddress ();
@@ -3820,8 +3820,8 @@ void initializeSubclasses () {
 	OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, OS.pangoLayoutNewProc_CALLBACK(pangoLayoutNewProc));
 	OS.g_type_class_unref (pangoLayoutClass);
 
-	if (OS.GTK3) {
-		long /*int*/ imContextType = OS.GTK_TYPE_IM_MULTICONTEXT ();
+	if (GTK.GTK3) {
+		long /*int*/ imContextType = GTK.GTK_TYPE_IM_MULTICONTEXT ();
 		long /*int*/ imContextClass = OS.g_type_class_ref (imContextType);
 		imContextNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (imContextClass);
 		OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (imContextClass, OS.imContextNewProc_CALLBACK(imContextNewProc));
@@ -3840,7 +3840,7 @@ void initializeSubclasses () {
 		OS.g_type_class_unref (pangoFontFaceClass);
 
 		if (!OS.IsWin32) { /* TODO [win32] replace unixprint */
-			long /*int*/ printerOptionWidgetType = OS.gtk_printer_option_widget_get_type();
+			long /*int*/ printerOptionWidgetType = GTK.gtk_printer_option_widget_get_type();
 			long /*int*/ printerOptionWidgetClass = OS.g_type_class_ref (printerOptionWidgetType);
 			printerOptionWidgetNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (printerOptionWidgetClass);
 			OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (printerOptionWidgetClass, OS.printerOptionWidgetNewProc_CALLBACK(printerOptionWidgetNewProc));
@@ -3861,11 +3861,11 @@ void initializeSystemSettings () {
 	* fix is to for the initializaion by creating
 	* a temporary GtkEntry.
 	*/
-	long /*int*/ entry = OS.gtk_entry_new ();
-	OS.gtk_widget_destroy (entry);
+	long /*int*/ entry = GTK.gtk_entry_new ();
+	GTK.gtk_widget_destroy (entry);
 	int [] buffer2 = new int [1];
-	long /*int*/ settings = OS.gtk_settings_get_default ();
-	OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0);
+	long /*int*/ settings = GTK.gtk_settings_get_default ();
+	OS.g_object_get (settings, GTK.gtk_entry_select_on_focus, buffer2, 0);
 	entrySelectOnFocus = buffer2 [0] != 0;
 }
 
@@ -3951,7 +3951,7 @@ public long /*int*/ internal_new_GC (GCData data) {
 		}
 		data.device = this;
 		data.drawable = root;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			data.backgroundRGBA = getSystemColor (SWT.COLOR_WHITE).handleRGBA;
 			data.foregroundRGBA = getSystemColor (SWT.COLOR_BLACK).handleRGBA;
 		} else {
@@ -4354,7 +4354,7 @@ public boolean post (Event event) {
 						// to gdk_test_simulate_button leads to crash.
 						return false;
 					}
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						long /*int*/ gdkDeviceManager = OS.gdk_display_get_device_manager(gdkDisplay);
 						long /*int*/ gdkPointer = OS.gdk_device_manager_get_client_pointer(gdkDeviceManager);
 						OS.gdk_window_get_device_position(gdkWindow, gdkPointer, x, y, new int[1]);
@@ -4556,7 +4556,7 @@ void releaseDisplay () {
 	checkIfEventProc = 0;
 
 	/* Dispose preedit window */
-	if (preeditWindow != 0) OS.gtk_widget_destroy (preeditWindow);
+	if (preeditWindow != 0) GTK.gtk_widget_destroy (preeditWindow);
 	imControl = null;
 
 	/* Dispose the tooltip map callback */
@@ -4661,7 +4661,7 @@ void releaseDisplay () {
 	eventCallback.dispose ();  eventCallback = null;
 
 	/* Dispose the hidden shell */
-	if (shellHandle != 0) OS.gtk_widget_destroy (shellHandle);
+	if (shellHandle != 0) GTK.gtk_widget_destroy (shellHandle);
 	shellHandle = 0;
 
 	/* Dispose the settings callback */
@@ -4678,8 +4678,8 @@ void releaseDisplay () {
 	OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
 	OS.g_type_class_unref (pangoLayoutClass);
 	pangoLayoutNewProc = 0;
-	if (OS.GTK3) {
-		long /*int*/ imContextType = OS.GTK_TYPE_IM_MULTICONTEXT ();
+	if (GTK.GTK3) {
+		long /*int*/ imContextType = GTK.GTK_TYPE_IM_MULTICONTEXT ();
 		long /*int*/ imContextClass = OS.g_type_class_ref (imContextType);
 		OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (imContextClass, imContextNewProc);
 		OS.g_type_class_unref (imContextClass);
@@ -5049,7 +5049,7 @@ public void setCursorLocation (int x, int y) {
 void setCursorLocationInPixels (Point location) {
 	long /*int*/ gdkDisplay = OS.gdk_display_get_default();
 	long /*int*/ gdkScreen = OS.gdk_screen_get_default();
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		OS.gdk_display_warp_pointer(gdkDisplay, gdkScreen, location.x, location.y);
 	} else {
 		long /*int*/ gdkDeviceManager = OS.gdk_display_get_device_manager(gdkDisplay);
@@ -5212,16 +5212,16 @@ public void setData (Object data) {
 }
 
 long /*int*/ setDirectionProc (long /*int*/ widget, long /*int*/ direction) {
-	OS.gtk_widget_set_direction (widget, (int)/*64*/ direction);
-	if (OS.GTK_IS_MENU_ITEM (widget)) {
-		long /*int*/ submenu = OS.gtk_menu_item_get_submenu (widget);
+	GTK.gtk_widget_set_direction (widget, (int)/*64*/ direction);
+	if (GTK.GTK_IS_MENU_ITEM (widget)) {
+		long /*int*/ submenu = GTK.gtk_menu_item_get_submenu (widget);
 		if (submenu != 0) {
-			OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction);
-			OS.gtk_container_forall (submenu, setDirectionProc, direction);
+			GTK.gtk_widget_set_direction (submenu, (int)/*64*/ direction);
+			GTK.gtk_container_forall (submenu, setDirectionProc, direction);
 		}
 	}
-	if (OS.GTK_IS_CONTAINER (widget)) {
-		OS.gtk_container_forall (widget, setDirectionProc, direction);
+	if (GTK.GTK_IS_CONTAINER (widget)) {
+		GTK.gtk_container_forall (widget, setDirectionProc, direction);
 	}
 	return 0;
 }
@@ -5340,43 +5340,43 @@ public final Consumer<Error> getErrorHandler () {
 void showIMWindow (Control control) {
 	imControl = control;
 	if (preeditWindow == 0) {
-		preeditWindow = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
+		preeditWindow = GTK.gtk_window_new (GTK.GTK_WINDOW_POPUP);
 		if (preeditWindow == 0) error (SWT.ERROR_NO_HANDLES);
-		preeditLabel = OS.gtk_label_new (null);
+		preeditLabel = GTK.gtk_label_new (null);
 		if (preeditLabel == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (preeditWindow, preeditLabel);
-		OS.gtk_widget_show (preeditLabel);
+		GTK.gtk_container_add (preeditWindow, preeditLabel);
+		GTK.gtk_widget_show (preeditLabel);
 	}
 	long /*int*/ [] preeditString = new long /*int*/ [1];
 	long /*int*/ [] pangoAttrs = new long /*int*/ [1];
 	long /*int*/ imHandle = control.imHandle ();
-	OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null);
+	GTK.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null);
 	if (preeditString [0] != 0 && C.strlen (preeditString [0]) > 0) {
 		Control widget = control.findBackgroundControl ();
 		if (widget == null) widget = control;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			widget.setBackgroundGdkRGBA (preeditWindow, control.getBackgroundGdkRGBA());
 			widget.setForegroundGdkRGBA (preeditLabel, control.getForegroundGdkRGBA());
 		} else {
 			GdkColor color = widget.getBackgroundGdkColor ();
-			OS.gtk_widget_modify_bg (preeditWindow,  OS.GTK_STATE_NORMAL, color);
+			GTK.gtk_widget_modify_bg (preeditWindow,  GTK.GTK_STATE_NORMAL, color);
 			widget.setForegroundColor (preeditLabel, control.getForegroundGdkColor());
 		}
 		widget.setFontDescription (preeditLabel, control.getFontDescription ());
-		if (pangoAttrs [0] != 0) OS.gtk_label_set_attributes (preeditLabel, pangoAttrs[0]);
-		OS.gtk_label_set_text (preeditLabel, preeditString [0]);
+		if (pangoAttrs [0] != 0) GTK.gtk_label_set_attributes (preeditLabel, pangoAttrs[0]);
+		GTK.gtk_label_set_text (preeditLabel, preeditString [0]);
 		Point point = control.toDisplayInPixels (control.getIMCaretPos ());
-		OS.gtk_window_move (preeditWindow, point.x, point.y);
+		GTK.gtk_window_move (preeditWindow, point.x, point.y);
 		GtkRequisition requisition = new GtkRequisition ();
-		if (OS.GTK3) {
-			OS.gtk_widget_get_preferred_size (preeditLabel, requisition, null);
+		if (GTK.GTK3) {
+			GTK.gtk_widget_get_preferred_size (preeditLabel, requisition, null);
 		} else {
-			OS.gtk_widget_size_request (preeditLabel, requisition);
+			GTK.gtk_widget_size_request (preeditLabel, requisition);
 		}
-		OS.gtk_window_resize (preeditWindow, requisition.width, requisition.height);
-		OS.gtk_widget_show (preeditWindow);
+		GTK.gtk_window_resize (preeditWindow, requisition.width, requisition.height);
+		GTK.gtk_widget_show (preeditWindow);
 	} else {
-		OS.gtk_widget_hide (preeditWindow);
+		GTK.gtk_widget_hide (preeditWindow);
 	}
 	if (preeditString [0] != 0) OS.g_free (preeditString [0]);
 	if (pangoAttrs [0] != 0) OS.pango_attr_list_unref (pangoAttrs [0]);
@@ -5744,10 +5744,10 @@ long /*int*/ signalProc (long /*int*/ gobject, long /*int*/ arg1, long /*int*/ u
 				long /*int*/ atom = OS.gdk_x11_atom_to_xatom (OS.gdk_atom_intern (name, true));
 				if (atom == OS.gdk_x11_atom_to_xatom (gdkEvent.atom)) {
 					long /*int*/ xWindow;
-					if (OS.GTK3) {
-						xWindow = OS.gdk_x11_window_get_xid (OS.gtk_widget_get_window (shellHandle));
+					if (GTK.GTK3) {
+						xWindow = OS.gdk_x11_window_get_xid (GTK.gtk_widget_get_window (shellHandle));
 					} else {
-						xWindow = OS.gdk_x11_drawable_get_xid (OS.gtk_widget_get_window( shellHandle));
+						xWindow = OS.gdk_x11_drawable_get_xid (GTK.gtk_widget_get_window( shellHandle));
 					}
 					long /*int*/ [] type = new long /*int*/ [1];
 					int [] format = new int [1];
@@ -5851,7 +5851,7 @@ public void update () {
 	 * Do not send expose events on GTK 3.16.0+
 	 * It's worth checking whether can be removed on all GTK 3 versions.
 	 */
-	if (OS.GTK_VERSION < OS.VERSION(3, 16, 0)) {
+	if (GTK.GTK_VERSION < OS.VERSION(3, 16, 0)) {
 		OS.gdk_window_process_all_updates ();
 	}
 }
@@ -5911,7 +5911,7 @@ long /*int*/ windowTimerProc (long /*int*/ handle) {
 }
 
 long /*int*/ gdk_window_get_device_position (long /*int*/ window, int[] x, int[] y, int[] mask) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/ display = 0;
 		if( window != 0) {
 			display = OS.gdk_window_get_display (window);
@@ -5928,7 +5928,7 @@ long /*int*/ gdk_window_get_device_position (long /*int*/ window, int[] x, int[]
 }
 
 long /*int*/ gdk_device_get_window_at_position (int[] win_x, int[] win_y) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/ display = OS.gdk_display_get_default ();
 		long /*int*/ device_manager = OS.gdk_display_get_device_manager (display);
 		long /*int*/ device = OS.gdk_device_manager_get_client_pointer (device_manager);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java
index 6a9658fcd0..675d56edd7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java
@@ -122,7 +122,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	Point size = computeNativeSize (handle, wHint, hHint, changed);
 	if (size.x == 0 && wHint == SWT.DEFAULT) size.x = DEFAULT_WIDTH;
 	if (size.y == 0 && hHint == SWT.DEFAULT) size.y = DEFAULT_HEIGHT;
-	int border = OS.gtk_container_get_border_width (handle);
+	int border = GTK.gtk_container_get_border_width (handle);
 	size.x += 2 * border;
 	size.y += 2 * border;
 	return size;
@@ -133,28 +133,28 @@ void createHandle (int index) {
 	state |= HANDLE;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	handle = gtk_box_new (OS.GTK_ORIENTATION_VERTICAL, false, 0);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	handle = gtk_box_new (GTK.GTK_ORIENTATION_VERTICAL, false, 0);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 	if ((style & SWT.V_SCROLL) != 0) {
-		scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
+		scrolledHandle = GTK.gtk_scrolled_window_new (0, 0);
 		if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC);
-		OS.gtk_container_add (fixedHandle, scrolledHandle);
-		if (OS.GTK_VERSION < OS.VERSION(3, 8, 0)) {
-			OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);
+		GTK.gtk_scrolled_window_set_policy (scrolledHandle, GTK.GTK_POLICY_NEVER, GTK.GTK_POLICY_AUTOMATIC);
+		GTK.gtk_container_add (fixedHandle, scrolledHandle);
+		if (GTK.GTK_VERSION < OS.VERSION(3, 8, 0)) {
+			GTK.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);
 		} else {
-			OS.gtk_container_add(scrolledHandle, handle);
+			GTK.gtk_container_add(scrolledHandle, handle);
 		}
-		long /*int*/ viewport = OS.gtk_bin_get_child (scrolledHandle);
-		OS.gtk_viewport_set_shadow_type (viewport, OS.GTK_SHADOW_NONE);
+		long /*int*/ viewport = GTK.gtk_bin_get_child (scrolledHandle);
+		GTK.gtk_viewport_set_shadow_type (viewport, GTK.GTK_SHADOW_NONE);
 	} else {
-		OS.gtk_container_add (fixedHandle, handle);
+		GTK.gtk_container_add (fixedHandle, handle);
 	}
-	OS.gtk_container_set_border_width (handle, 0);
+	GTK.gtk_container_set_border_width (handle, 0);
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont().handle);
 	}
 }
@@ -434,7 +434,7 @@ void reskinChildren (int flags) {
 
 @Override
 void setWidgetBackground  () {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		GdkRGBA rgba = (state & BACKGROUND) != 0 ? getBackgroundGdkRGBA () : null;
 		super.setBackgroundGdkRGBA (handle, rgba);
 	} else {
@@ -453,7 +453,7 @@ void setFontDescription (long /*int*/ font) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setForegroundGdkColor (color);
 	for (int i = 0; i < itemCount; i++) {
 		items[i].setForegroundColor (color);
@@ -462,7 +462,7 @@ void setForegroundGdkColor (GdkColor color) {
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setForegroundGdkRGBA(rgba);
 	for (int i = 0; i < itemCount; i++) {
 		items[i].setForegroundRGBA (rgba);
@@ -486,7 +486,7 @@ void setScrollbar () {
 	ExpandItem item = items [itemCount - 1];
 	int maxHeight = item.y + getBandHeight () + spacing;
 	if (item.expanded) maxHeight += item.height;
-	long /*int*/ adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (scrolledHandle);
+	long /*int*/ adjustmentHandle = GTK.gtk_scrolled_window_get_vadjustment (scrolledHandle);
 	GtkAdjustment adjustment = new GtkAdjustment ();
 	gtk_adjustment_get (adjustmentHandle, adjustment);
 	yCurrentScroll = (int)adjustment.value;
@@ -500,16 +500,16 @@ void setScrollbar () {
 	adjustment.value = Math.min (yCurrentScroll, maxHeight);
 	adjustment.upper = maxHeight;
 	adjustment.page_size = height;
-	OS.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
-	int policy = maxHeight > height ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-	OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, policy);
+	int policy = maxHeight > height ? GTK.GTK_POLICY_ALWAYS : GTK.GTK_POLICY_NEVER;
+	GTK.gtk_scrolled_window_set_policy (scrolledHandle, GTK.GTK_POLICY_NEVER, policy);
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (fixedHandle, allocation);
+	GTK.gtk_widget_get_allocation (fixedHandle, allocation);
 	int width = allocation.width - spacing * 2;
-	if (policy == OS.GTK_POLICY_ALWAYS) {
+	if (policy == GTK.GTK_POLICY_ALWAYS) {
 		long /*int*/ vHandle = 0;
-		vHandle = OS.gtk_scrolled_window_get_vscrollbar (scrolledHandle);
+		vHandle = GTK.gtk_scrolled_window_get_vscrollbar (scrolledHandle);
 		GtkRequisition requisition = new GtkRequisition ();
 		gtk_widget_get_preferred_size (vHandle, requisition);
 		width -= requisition.width;
@@ -542,8 +542,8 @@ void setSpacingInPixels (int spacing) {
 	if (spacing < 0) return;
 	if (spacing == this.spacing) return;
 	this.spacing = spacing;
-	OS.gtk_box_set_spacing (handle, spacing);
-	OS.gtk_container_set_border_width (handle, spacing);
+	GTK.gtk_box_set_spacing (handle, spacing);
+	GTK.gtk_container_set_border_width (handle, spacing);
 }
 
 void showItem (ExpandItem item) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
index 1c187d56df..fcfbd33804 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
@@ -124,21 +124,21 @@ protected void checkSubclass () {
 @Override
 void createHandle (int index) {
 	state |= HANDLE;
-	handle = OS.gtk_expander_new (null);
+	handle = GTK.gtk_expander_new (null);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 	clientHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (clientHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (handle, clientHandle);
-	boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 4);
+	GTK.gtk_container_add (handle, clientHandle);
+	boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 4);
 	if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	labelHandle = OS.gtk_label_new (null);
+	labelHandle = GTK.gtk_label_new (null);
 	if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	imageHandle = OS.gtk_image_new ();
+	imageHandle = GTK.gtk_image_new ();
 	if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (boxHandle, imageHandle);
-	OS.gtk_container_add (boxHandle, labelHandle);
-	OS.gtk_expander_set_label_widget (handle, boxHandle);
-	OS.gtk_widget_set_can_focus (handle, true);
+	GTK.gtk_container_add (boxHandle, imageHandle);
+	GTK.gtk_container_add (boxHandle, labelHandle);
+	GTK.gtk_expander_set_label_widget (handle, boxHandle);
+	GTK.gtk_widget_set_can_focus (handle, true);
 }
 
 @Override
@@ -159,7 +159,7 @@ void deregister() {
 
 @Override
 void release (boolean destroy) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		//454940 ExpandBar DND fix.
 		//Since controls are now nested under the Item,
 		//Item is responsible for it's release.
@@ -289,7 +289,7 @@ public int getHeaderHeight () {
 int getHeaderHeightInPixels () {
 	checkWidget ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	// allocation.height normally returns the header height instead of the whole
 	// widget itself. This is to prevent situations where allocation.height actually
 	// returns the correct header height.
@@ -349,7 +349,7 @@ int getPreferredWidth (GC gc) {
 long /*int*/ gtk_activate (long /*int*/ widget) {
 	Event event = new Event ();
 	event.item = this;
-	int type = OS.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand;
+	int type = GTK.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand;
 	parent.sendEvent (type, event);
 	return 0;
 }
@@ -362,7 +362,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 
 @Override
 long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
-	OS.gtk_widget_set_can_focus (handle, false);
+	GTK.gtk_widget_set_can_focus (handle, false);
 	parent.lastFocus = this;
 	return 0;
 }
@@ -380,7 +380,7 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
 }
 
 boolean hasFocus () {
-	return OS.gtk_widget_has_focus (handle);
+	return GTK.gtk_widget_has_focus (handle);
 }
 
 @Override
@@ -424,10 +424,10 @@ void releaseWidget () {
 
 void resizeControl (int yScroll) {
 	if (control != null && !control.isDisposed ()) {
-		boolean visible = OS.gtk_expander_get_expanded (handle);
+		boolean visible = GTK.gtk_expander_get_expanded (handle);
 		if (visible) {
 			GtkAllocation allocation = new GtkAllocation ();
-			OS.gtk_widget_get_allocation (clientHandle, allocation);
+			GTK.gtk_widget_get_allocation (clientHandle, allocation);
 
 			//454940 change in hierarchy
 			/* SWT's calls to gtk_widget_size_allocate and gtk_widget_set_allocation
@@ -438,14 +438,14 @@ void resizeControl (int yScroll) {
 			* As of GTK3, the hierarchy is changed, this affected child-size allocation and a fix
 			* is now neccessary.
 			* See also other 454940 notes and similar fix in: 453827 */
-			int x = (OS.GTK3) ? 0 : allocation.x;
-			int y = (OS.GTK3) ? 0 : allocation.y;
+			int x = (GTK.GTK3) ? 0 : allocation.x;
+			int y = (GTK.GTK3) ? 0 : allocation.y;
 
 			if (x != -1 && y != -1) {
 				int width = allocation.width;
 				int height = allocation.height;
 				int [] property = new int [1];
-				OS.gtk_widget_style_get (handle, OS.focus_line_width, property, 0);
+				GTK.gtk_widget_style_get (handle, OS.focus_line_width, property, 0);
 				y += property [0] * 2;
 				height -= property [0] * 2;
 
@@ -459,13 +459,13 @@ void resizeControl (int yScroll) {
 				*/
 				ScrollBar vBar = parent.verticalBar;
 				if (vBar != null) {
-					if (OS.gtk_widget_get_visible (vBar.handle)) {
-						OS.gtk_widget_get_allocation (parent.scrolledHandle, allocation);
+					if (GTK.gtk_widget_get_visible (vBar.handle)) {
+						GTK.gtk_widget_get_allocation (parent.scrolledHandle, allocation);
 						width = allocation.width - parent.vScrollBarWidth () - 2 * parent.spacing;
 					}
 				}
 				// Bug 479242: Bound calculation is correct without needing to use yScroll in GTK3
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					control.setBounds (x, y, width, Math.max (0, height), true, true);
 				}
 				else {
@@ -525,7 +525,7 @@ public void setControl (Control control) {
 	this.control = control;
 	if (control != null) {
 		control.setVisible (expanded);
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			//454940 ExpandBar DND fix.
 			//Reparenting on the GTK side.
 			//Proper hierachy on gtk side is required for DND to function properly.
@@ -556,18 +556,18 @@ long /*int*/ clientHandle () {
 public void setExpanded (boolean expanded) {
 	checkWidget ();
 	this.expanded = expanded;
-	OS.gtk_expander_set_expanded (handle, expanded);
+	GTK.gtk_expander_set_expanded (handle, expanded);
 	parent.layoutItems (0, true);
 }
 
 boolean setFocus () {
-	if (!OS.gtk_widget_get_child_visible (handle)) return false;
-	OS.gtk_widget_set_can_focus (handle, true);
-	OS.gtk_widget_grab_focus (handle);
+	if (!GTK.gtk_widget_get_child_visible (handle)) return false;
+	GTK.gtk_widget_set_can_focus (handle, true);
+	GTK.gtk_widget_grab_focus (handle);
 	// widget could be disposed at this point
 	if (isDisposed ()) return false;
-	boolean result = OS.gtk_widget_is_focus (handle);
-	if (!result) OS.gtk_widget_set_can_focus (handle, false);
+	boolean result = GTK.gtk_widget_is_focus (handle);
+	if (!result) GTK.gtk_widget_set_can_focus (handle, false);
 	return result;
 }
 
@@ -578,14 +578,14 @@ void setFontDescription (long /*int*/ font) {
 }
 
 void setForegroundColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (handle, color);
 	if (labelHandle != 0) setForegroundColor (labelHandle, color);
 	if (imageHandle != 0) setForegroundColor (imageHandle, color);
 }
 
 void setForegroundRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	parent.setForegroundGdkRGBA (handle, rgba);
 	if (labelHandle != 0) parent.setForegroundGdkRGBA (labelHandle, rgba);
 	if (imageHandle != 0) parent.setForegroundGdkRGBA (imageHandle, rgba);
@@ -611,7 +611,7 @@ void setHeightInPixels (int height) {
 	checkWidget ();
 	if (height < 0) return;
 	this.height = height;
-	OS.gtk_widget_set_size_request (clientHandle, -1, height);
+	GTK.gtk_widget_set_size_request (clientHandle, -1, height);
 	parent.layoutItems (0, false);
 }
 
@@ -626,12 +626,12 @@ public void setImage (Image image) {
 		int imageIndex = imageList.add (image);
 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
 		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-		if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
-		OS.gtk_widget_show (imageHandle);
+		if (text.length () == 0) GTK.gtk_widget_hide (labelHandle);
+		GTK.gtk_widget_show (imageHandle);
 	} else {
 		gtk_image_set_from_pixbuf (imageHandle, 0);
-		OS.gtk_widget_show (labelHandle);
-		OS.gtk_widget_hide (imageHandle);
+		GTK.gtk_widget_show (labelHandle);
+		GTK.gtk_widget_hide (imageHandle);
 	}
 }
 
@@ -639,9 +639,9 @@ public void setImage (Image image) {
 void setOrientation (boolean create) {
 	super.setOrientation (create);
 	if ((parent.style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		OS.gtk_widget_set_direction (handle, dir);
-		OS.gtk_container_forall (handle, display.setDirectionProc, dir);
+		int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		GTK.gtk_widget_set_direction (handle, dir);
+		GTK.gtk_container_forall (handle, display.setDirectionProc, dir);
 	}
 }
 
@@ -649,25 +649,25 @@ void setOrientation (boolean create) {
 public void setText (String string) {
 	super.setText (string);
 	byte [] buffer = Converter.wcsToMbcs (string, true);
-	OS.gtk_label_set_text (labelHandle, buffer);
+	GTK.gtk_label_set_text (labelHandle, buffer);
 }
 
 void showWidget (int index) {
-		OS.gtk_widget_show (handle);
-		OS.gtk_widget_show (clientHandle);
+		GTK.gtk_widget_show (handle);
+		GTK.gtk_widget_show (clientHandle);
 		if (labelHandle != 0)
-			OS.gtk_widget_show (labelHandle);
+			GTK.gtk_widget_show (labelHandle);
 		if (boxHandle != 0)
-			OS.gtk_widget_show (boxHandle);
-		OS.gtk_container_add (parent.handle, handle);
-		OS.gtk_box_set_child_packing (parent.handle, handle, false, false, 0, OS.GTK_PACK_START);
+			GTK.gtk_widget_show (boxHandle);
+		GTK.gtk_container_add (parent.handle, handle);
+		GTK.gtk_box_set_child_packing (parent.handle, handle, false, false, 0, GTK.GTK_PACK_START);
 }
 
 @Override
 long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {
 	switch ((int)/*64*/user_data) {
 		case ACTIVATE_INVERSE: {
-			expanded = OS.gtk_expander_get_expanded (handle);
+			expanded = GTK.gtk_expander_get_expanded (handle);
 			parent.layoutItems (0, false);
 			return 0;
 		}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
index ce22f78270..475aa4f71b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
@@ -105,9 +105,9 @@ String computeResultChooserDialog () {
 	if ((style & SWT.MULTI) != 0) {
 		long /*int*/ list = 0;
 		if (uriMode) {
-			list = OS.gtk_file_chooser_get_uris (handle);
+			list = GTK.gtk_file_chooser_get_uris (handle);
 		} else {
-			list = OS.gtk_file_chooser_get_filenames (handle);
+			list = GTK.gtk_file_chooser_get_filenames (handle);
 		}
 		int listLength = OS.g_slist_length (list);
 		fileNames = new String [listLength];
@@ -147,9 +147,9 @@ String computeResultChooserDialog () {
 	} else {
 		long /*int*/ utf8Ptr = 0;
 		if (uriMode) {
-			utf8Ptr = OS.gtk_file_chooser_get_uri (handle);
+			utf8Ptr = GTK.gtk_file_chooser_get_uri (handle);
 		} else {
-			long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);
+			long /*int*/ path = GTK.gtk_file_chooser_get_filename (handle);
 			if (path != 0) {
 				utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
 				if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path);
@@ -172,9 +172,9 @@ String computeResultChooserDialog () {
 		}
 	}
 	filterIndex = -1;
-	long /*int*/ filter = OS.gtk_file_chooser_get_filter (handle);
+	long /*int*/ filter = GTK.gtk_file_chooser_get_filter (handle);
 	if (filter != 0) {
-		long /*int*/ filterNamePtr = OS.gtk_file_filter_get_name (filter);
+		long /*int*/ filterNamePtr = GTK.gtk_file_filter_get_name (filter);
 		if (filterNamePtr != 0) {
 			int length = C.strlen (filterNamePtr);
 			byte[] buffer = new byte [length];
@@ -302,51 +302,51 @@ public String open () {
 String openChooserDialog () {
 	byte [] titleBytes = Converter.wcsToMbcs (title, true);
 	int action = (style & SWT.SAVE) != 0 ?
-		OS.GTK_FILE_CHOOSER_ACTION_SAVE :
-		OS.GTK_FILE_CHOOSER_ACTION_OPEN;
+		GTK.GTK_FILE_CHOOSER_ACTION_SAVE :
+		GTK.GTK_FILE_CHOOSER_ACTION_OPEN;
 	long /*int*/ shellHandle = parent.topHandle ();
 	Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
 	if (display.getDismissalAlignment() == SWT.RIGHT) {
-		if (OS.GTK3) {
-			handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_NAMED_LABEL_CANCEL, OS.GTK_RESPONSE_CANCEL, OS.GTK_NAMED_LABEL_OK, OS.GTK_RESPONSE_OK, 0);
+		if (GTK.GTK3) {
+			handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, GTK.GTK_NAMED_LABEL_CANCEL, GTK.GTK_RESPONSE_CANCEL, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_RESPONSE_OK, 0);
 		} else {
-			handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
+			handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, GTK.GTK_STOCK_CANCEL (), GTK.GTK_RESPONSE_CANCEL, GTK.GTK_STOCK_OK (), GTK.GTK_RESPONSE_OK, 0);
 		}
 	} else {
-		if (OS.GTK3) {
-			handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_NAMED_LABEL_OK, OS.GTK_RESPONSE_OK, OS.GTK_NAMED_LABEL_CANCEL, OS.GTK_RESPONSE_CANCEL, 0);
+		if (GTK.GTK3) {
+			handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, GTK.GTK_NAMED_LABEL_OK, GTK.GTK_RESPONSE_OK, GTK.GTK_NAMED_LABEL_CANCEL, GTK.GTK_RESPONSE_CANCEL, 0);
 		} else {
-			handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);
+			handle = GTK.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, GTK.GTK_STOCK_OK (), GTK.GTK_RESPONSE_OK, GTK.GTK_STOCK_CANCEL (), GTK.GTK_RESPONSE_CANCEL, 0);
 		}
 	}
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_window_set_modal (handle, true);
-	long /*int*/ group = OS.gtk_window_get_group(0);
-	OS.gtk_window_group_add_window (group, handle);
-	long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+	GTK.gtk_window_set_modal (handle, true);
+	long /*int*/ group = GTK.gtk_window_get_group(0);
+	GTK.gtk_window_group_add_window (group, handle);
+	long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (shellHandle);
 	if (pixbufs != 0) {
-		OS.gtk_window_set_icon_list (handle, pixbufs);
+		GTK.gtk_window_set_icon_list (handle, pixbufs);
 		OS.g_list_free (pixbufs);
 	}
 	if (uriMode) {
-		OS.gtk_file_chooser_set_local_only (handle, false);
+		GTK.gtk_file_chooser_set_local_only (handle, false);
 	}
 	presetChooserDialog ();
 	display.addIdleProc ();
 	String answer = null;
 	Dialog oldModal = null;
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		oldModal = display.getModalDialog ();
 		display.setModalDialog (this);
 	}
 	int signalId = 0;
 	long /*int*/ hookId = 0;
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
-		signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
+		signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
 		hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
 	}
 	display.sendPreExternalEventDispatchEvent ();
-	int response = OS.gtk_dialog_run (handle);
+	int response = GTK.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -358,20 +358,20 @@ String openChooserDialog () {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
 		OS.g_signal_remove_emission_hook (signalId, hookId);
 	}
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		display.setModalDialog (oldModal);
 	}
-	if (response == OS.GTK_RESPONSE_OK) {
+	if (response == GTK.GTK_RESPONSE_OK) {
 		answer = computeResultChooserDialog ();
 	}
 	display.removeIdleProc ();
-	OS.gtk_widget_destroy (handle);
+	GTK.gtk_widget_destroy (handle);
 	return answer;
 }
 void presetChooserDialog () {
 	/* MULTI is only valid if the native dialog's action is Open */
 	if ((style & (SWT.SAVE | SWT.MULTI)) == SWT.MULTI) {
-		OS.gtk_file_chooser_set_select_multiple (handle, true);
+		GTK.gtk_file_chooser_set_select_multiple (handle, true);
 	}
 	if (filterPath == null) filterPath = "";
 	if (fileName == null) fileName = "";
@@ -382,7 +382,7 @@ void presetChooserDialog () {
 		if (filterPath.length () > 0) {
 			if (uriMode) {
 				byte [] buffer = Converter.wcsToMbcs (filterPath, true);
-				OS.gtk_file_chooser_set_current_folder_uri (handle, buffer);
+				GTK.gtk_file_chooser_set_current_folder_uri (handle, buffer);
 			} else {
 				/* filename must be a full path */
 				byte [] buffer = Converter.wcsToMbcs (SEPARATOR + filterPath, true);
@@ -395,7 +395,7 @@ void presetChooserDialog () {
 					byte [] outputBuffer = new byte [PATH_MAX];
 					long /*int*/ ptr = OS.realpath (buffer, outputBuffer);
 					if (ptr != 0) {
-						OS.gtk_file_chooser_set_current_folder (handle, ptr);
+						GTK.gtk_file_chooser_set_current_folder (handle, ptr);
 					}
 					/* We are not doing free here because realpath returns the address of outputBuffer
 					 * which is created in this code and we let the garbage collector to take care of this
@@ -403,7 +403,7 @@ void presetChooserDialog () {
 				} else {
 					long /*int*/ ptr = OS.realpath (buffer, null);
 					if (ptr != 0) {
-						OS.gtk_file_chooser_set_current_folder (handle, ptr);
+						GTK.gtk_file_chooser_set_current_folder (handle, ptr);
 						OS.g_free (ptr);
 					}
 				}
@@ -436,7 +436,7 @@ void presetChooserDialog () {
 				}
 			}
 			byte [] buffer = Converter.wcsToMbcs (filenameWithExt.toString (), true);
-			OS.gtk_file_chooser_set_current_name (handle, buffer);
+			GTK.gtk_file_chooser_set_current_name (handle, buffer);
 		}
 	} else {
 		StringBuilder stringBuilder = new StringBuilder();
@@ -453,7 +453,7 @@ void presetChooserDialog () {
 		}
 		byte [] buffer = Converter.wcsToMbcs (stringBuilder.toString(), true);
 		if (uriMode) {
-			OS.gtk_file_chooser_set_uri (handle, buffer);
+			GTK.gtk_file_chooser_set_uri (handle, buffer);
 		} else {
 			/*
 			 * in GTK version 2.10, gtk_file_chooser_set_current_folder requires path
@@ -465,9 +465,9 @@ void presetChooserDialog () {
 				long /*int*/ ptr = OS.realpath (buffer, outputBuffer);
 				if (ptr != 0) {
 					if (fileName.length() > 0) {
-						OS.gtk_file_chooser_set_filename (handle, ptr);
+						GTK.gtk_file_chooser_set_filename (handle, ptr);
 					} else {
-						OS.gtk_file_chooser_set_current_folder (handle, ptr);
+						GTK.gtk_file_chooser_set_current_folder (handle, ptr);
 					}
 					/* We are not doing free here because realpath returns the address of outputBuffer
 					 * which is created in this code and we let the garbage collector to take care of this
@@ -477,9 +477,9 @@ void presetChooserDialog () {
 				long /*int*/ ptr = OS.realpath (buffer, null);
 				if (ptr != 0) {
 					if (fileName.length() > 0) {
-						OS.gtk_file_chooser_set_filename (handle, ptr);
+						GTK.gtk_file_chooser_set_filename (handle, ptr);
 					} else {
-						OS.gtk_file_chooser_set_current_folder (handle, ptr);
+						GTK.gtk_file_chooser_set_current_folder (handle, ptr);
 					}
 					OS.g_free (ptr);
 				}
@@ -489,7 +489,7 @@ void presetChooserDialog () {
 
 	/* Set overwrite mode */
 	if ((style & SWT.SAVE) != 0) {
-		OS.gtk_file_chooser_set_do_overwrite_confirmation (handle, overwrite);
+		GTK.gtk_file_chooser_set_do_overwrite_confirmation (handle, overwrite);
 	}
 
 	/* Set the extension filters */
@@ -498,34 +498,34 @@ void presetChooserDialog () {
 	long /*int*/ initialFilter = 0;
 	for (int i = 0; i < filterExtensions.length; i++) {
 		if (filterExtensions [i] != null) {
-			long /*int*/ filter = OS.gtk_file_filter_new ();
+			long /*int*/ filter = GTK.gtk_file_filter_new ();
 			if (filterNames.length > i && filterNames [i] != null) {
 				byte [] name = Converter.wcsToMbcs (filterNames [i], true);
-				OS.gtk_file_filter_set_name (filter, name);
+				GTK.gtk_file_filter_set_name (filter, name);
 			} else {
 				byte [] name = Converter.wcsToMbcs (filterExtensions [i], true);
-				OS.gtk_file_filter_set_name (filter, name);
+				GTK.gtk_file_filter_set_name (filter, name);
 			}
 			int start = 0;
 			int index = filterExtensions [i].indexOf (EXTENSION_SEPARATOR);
 			while (index != -1) {
 				String current = filterExtensions [i].substring (start, index);
 				byte [] filterString = Converter.wcsToMbcs (current, true);
-				OS.gtk_file_filter_add_pattern (filter, filterString);
+				GTK.gtk_file_filter_add_pattern (filter, filterString);
 				start = index + 1;
 				index = filterExtensions [i].indexOf (EXTENSION_SEPARATOR, start);
 			}
 			String current = filterExtensions [i].substring (start);
 			byte [] filterString = Converter.wcsToMbcs (current, true);
-			OS.gtk_file_filter_add_pattern (filter, filterString);
-			OS.gtk_file_chooser_add_filter (handle, filter);
+			GTK.gtk_file_filter_add_pattern (filter, filterString);
+			GTK.gtk_file_chooser_add_filter (handle, filter);
 			if (i == filterIndex) {
 				initialFilter = filter;
 			}
 		}
 	}
 	if (initialFilter != 0) {
-		OS.gtk_file_chooser_set_filter(handle, initialFilter);
+		GTK.gtk_file_chooser_set_filter(handle, initialFilter);
 	}
 	fullPath = null;
 	fileNames = new String [0];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
index e6550f4685..267e7dec72 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
@@ -159,16 +159,16 @@ public FontData open () {
 	handle = gtk_font_chooser_dialog_new (titleBytes);
 	if (parent!=null) {
 		long /*int*/ shellHandle = parent.topHandle ();
-		OS.gtk_window_set_transient_for(handle, shellHandle);
-		long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+		GTK.gtk_window_set_transient_for(handle, shellHandle);
+		long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (shellHandle);
 		if (pixbufs != 0) {
-			OS.gtk_window_set_icon_list (handle, pixbufs);
+			GTK.gtk_window_set_icon_list (handle, pixbufs);
 			OS.g_list_free (pixbufs);
 		}
 	}
-	long /*int*/ group = OS.gtk_window_get_group(0);
-	OS.gtk_window_group_add_window (group, handle);
-	OS.gtk_window_set_modal (handle, true);
+	long /*int*/ group = GTK.gtk_window_get_group(0);
+	GTK.gtk_window_group_add_window (group, handle);
+	GTK.gtk_window_set_modal (handle, true);
 	if (fontData != null) {
 		Font font = new Font (display, fontData);
 		long /*int*/ fontName = OS.pango_font_description_to_string (font.handle);
@@ -181,18 +181,18 @@ public FontData open () {
 	}
 	display.addIdleProc ();
 	Dialog oldModal = null;
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		oldModal = display.getModalDialog ();
 		display.setModalDialog (this);
 	}
 	int signalId = 0;
 	long /*int*/ hookId = 0;
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
-		signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
+		signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
 		hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
 	}
 	display.sendPreExternalEventDispatchEvent ();
-	int response = OS.gtk_dialog_run (handle);
+	int response = GTK.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -204,10 +204,10 @@ public FontData open () {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
 		OS.g_signal_remove_emission_hook (signalId, hookId);
 	}
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		display.setModalDialog (oldModal);
 	}
-	boolean success = response == OS.GTK_RESPONSE_OK;
+	boolean success = response == GTK.GTK_RESPONSE_OK;
 	if (success) {
 		long /*int*/ fontName = gtk_font_chooser_get_font (handle);
 		int length = C.strlen (fontName);
@@ -220,7 +220,7 @@ public FontData open () {
 		OS.pango_font_description_free (fontDesc);
 	}
 	display.removeIdleProc ();
-	OS.gtk_widget_destroy(handle);
+	GTK.gtk_widget_destroy(handle);
 	if (!success) return null;
 	return fontData;
 }
@@ -288,27 +288,27 @@ public void setRGB (RGB rgb) {
 }
 
 long /*int*/ gtk_font_chooser_get_font(long /*int*/ fontchooser) {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
-		return OS.gtk_font_chooser_get_font(fontchooser);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
+		return GTK.gtk_font_chooser_get_font(fontchooser);
 	} else {
-		return OS.gtk_font_selection_dialog_get_font_name(fontchooser);
+		return GTK.gtk_font_selection_dialog_get_font_name(fontchooser);
 	}
 }
 
 long /*int*/ gtk_font_chooser_dialog_new (byte[] title) {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
-		return OS.gtk_font_chooser_dialog_new (title, 0);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
+		return GTK.gtk_font_chooser_dialog_new (title, 0);
 	} else {
-		return OS.gtk_font_selection_dialog_new (title);
+		return GTK.gtk_font_selection_dialog_new (title);
 	}
 }
 
 
 void gtk_font_chooser_set_font(long /*int*/ fsd, byte[] fontname) {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
-		OS.gtk_font_chooser_set_font(fsd, fontname);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
+		GTK.gtk_font_chooser_set_font(fsd, fontname);
 	} else {
-		OS.gtk_font_selection_dialog_set_font_name(fsd, fontname);
+		GTK.gtk_font_selection_dialog_set_font_name(fsd, fontname);
 	}
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
index 6d890fe3e9..c88f0306db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
@@ -108,14 +108,14 @@ long /*int*/ clientHandle () {
 Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	Point size = super.computeSizeInPixels(wHint, hHint, changed);
 	int width;
-	if(OS.GTK3){
+	if(GTK.GTK3){
 		width = computeNativeSize (handle, SWT.DEFAULT, SWT.DEFAULT, false).x;
 	}
 	else{
-		int x_thickness = OS.gtk_style_get_xthickness (OS.gtk_widget_get_style (handle));
+		int x_thickness = GTK.gtk_style_get_xthickness (GTK.gtk_widget_get_style (handle));
 		// GTK adds a LABEL_PAD and LABEL_SIDE_PAD to the label width, we also need to add
           	// the thickness of the frame border
-		int minimalSizeAroundLabel = 2 * (OS.GTK_FRAME_LABEL_PAD + OS.GTK_FRAME_LABEL_SIDE_PAD + x_thickness);
+		int minimalSizeAroundLabel = 2 * (GTK.GTK_FRAME_LABEL_PAD + GTK.GTK_FRAME_LABEL_SIDE_PAD + x_thickness);
 		width = computeNativeSize (labelHandle, SWT.DEFAULT, SWT.DEFAULT, false) .x + minimalSizeAroundLabel;
 	}
 	size.x = Math.max (size.x, width);
@@ -126,7 +126,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	checkWidget();
 	forceResize ();
 	GtkAllocation allocation = new GtkAllocation();
-	OS.gtk_widget_get_allocation (clientHandle, allocation);
+	GTK.gtk_widget_get_allocation (clientHandle, allocation);
 	int clientX = allocation.x;
 	int clientY = allocation.y;
 	x -= clientX;
@@ -159,8 +159,8 @@ Rectangle getClientAreaInPixels () {
 
 @Override
 GdkRGBA getContextColorGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION (3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 14, 0)) {
 		if (foreground != null) {
 			return foreground;
 		} else {
@@ -173,13 +173,13 @@ GdkRGBA getContextColorGdkRGBA () {
 
 @Override
 GdkRGBA getContextBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		return super.getContextBackgroundGdkRGBA();
 	} else {
-		long /*int*/ context = OS.gtk_widget_get_style_context (fixedHandle);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (fixedHandle);
 		GdkRGBA rgba = new GdkRGBA ();
-		OS.gtk_style_context_get_background_color (context, OS.GTK_STATE_FLAG_NORMAL, rgba);
+		GTK.gtk_style_context_get_background_color (context, GTK.GTK_STATE_FLAG_NORMAL, rgba);
 		if ((state & BACKGROUND) == 0) {
 			return defaultBackground();
 		}
@@ -193,12 +193,12 @@ void createHandle(int index) {
 
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
 
-	handle = OS.gtk_frame_new (null);
+	handle = GTK.gtk_frame_new (null);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 
-	labelHandle = OS.gtk_label_new (null);
+	labelHandle = GTK.gtk_label_new (null);
 	if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	OS.g_object_ref (labelHandle);
 	OS.g_object_ref_sink (labelHandle);
@@ -210,25 +210,25 @@ void createHandle(int index) {
 	 * it can listen to events (clicking/tooltip etc.) and so that
 	 * background can be drawn on it.
 	 */
-	OS.gtk_widget_set_has_window (clientHandle, true);
+	GTK.gtk_widget_set_has_window (clientHandle, true);
 
-	OS.gtk_container_add (fixedHandle, handle);
-	OS.gtk_container_add (handle, clientHandle);
+	GTK.gtk_container_add (fixedHandle, handle);
+	GTK.gtk_container_add (handle, clientHandle);
 	if ((style & SWT.SHADOW_IN) != 0) {
-		OS.gtk_frame_set_shadow_type (handle, OS.GTK_SHADOW_IN);
+		GTK.gtk_frame_set_shadow_type (handle, GTK.GTK_SHADOW_IN);
 	}
 	if ((style & SWT.SHADOW_OUT) != 0) {
-		OS.gtk_frame_set_shadow_type (handle, OS.GTK_SHADOW_OUT);
+		GTK.gtk_frame_set_shadow_type (handle, GTK.GTK_SHADOW_OUT);
 	}
 	if ((style & SWT.SHADOW_ETCHED_IN) != 0) {
-		OS.gtk_frame_set_shadow_type (handle, OS.GTK_SHADOW_ETCHED_IN);
+		GTK.gtk_frame_set_shadow_type (handle, GTK.GTK_SHADOW_ETCHED_IN);
 	}
 	if ((style & SWT.SHADOW_ETCHED_OUT) != 0) {
-		OS.gtk_frame_set_shadow_type (handle, OS.GTK_SHADOW_ETCHED_OUT);
+		GTK.gtk_frame_set_shadow_type (handle, GTK.GTK_SHADOW_ETCHED_OUT);
 	}
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription (defaultFont ().handle);
 	}
 }
@@ -247,7 +247,7 @@ void deregister () {
 
 @Override
 void enableWidget (boolean enabled) {
-	OS.gtk_widget_set_sensitive (labelHandle, enabled);
+	GTK.gtk_widget_set_sensitive (labelHandle, enabled);
 }
 
 @Override
@@ -335,13 +335,13 @@ void releaseWidget () {
 
 @Override
 void setBackgroundGdkRGBA(long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setBackgroundGdkRGBA(fixedHandle, rgba);
 }
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
 	setBackgroundGdkColor (fixedHandle, color);
 	// Bug 453827 - client handle should also be painted as it's visible to the user now.
@@ -356,8 +356,8 @@ void setFontDescription (long /*int*/ font) {
 
 @Override
 void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION < OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) {
 		super.setForegroundGdkRGBA(handle, rgba);
 		return;
 	}
@@ -375,14 +375,14 @@ void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setForegroundGdkColor (color);
 	setForegroundColor(labelHandle, color);
 }
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setForegroundGdkRGBA(rgba);
 	setForegroundGdkRGBA (labelHandle, rgba);
 }
@@ -391,8 +391,8 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 void setOrientation (boolean create) {
 	super.setOrientation (create);
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		OS.gtk_widget_set_direction (labelHandle, dir);
+		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		GTK.gtk_widget_set_direction (labelHandle, dir);
 	}
 }
 
@@ -429,16 +429,16 @@ public void setText (String string) {
 	text = string;
 	char [] chars = fixMnemonic (string);
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+	GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	if (string.length () != 0) {
-		if (OS.gtk_frame_get_label_widget (handle) == 0) {
-			OS.gtk_frame_set_label_widget (handle, labelHandle);
+		if (GTK.gtk_frame_get_label_widget (handle) == 0) {
+			GTK.gtk_frame_set_label_widget (handle, labelHandle);
 		}
 	} else {
-		OS.gtk_frame_set_label_widget (handle, 0);
+		GTK.gtk_frame_set_label_widget (handle, 0);
 	}
 	// Set the foreground now that the text has been set
-	if (OS.GTK_VERSION >= OS.VERSION (3, 16, 0) && foreground != null) {
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 16, 0) && foreground != null) {
 		setForegroundGdkRGBA (labelHandle, foreground);
 	}
 }
@@ -446,26 +446,26 @@ public void setText (String string) {
 @Override
 void showWidget () {
 	super.showWidget ();
-	if (clientHandle != 0) OS.gtk_widget_show (clientHandle);
-	if (labelHandle != 0) OS.gtk_widget_show (labelHandle);
+	if (clientHandle != 0) GTK.gtk_widget_show (clientHandle);
+	if (labelHandle != 0) GTK.gtk_widget_show (labelHandle);
 }
 
 @Override
 int setBounds(int x, int y, int width, int height, boolean move, boolean resize) {
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			// Work around for bug 470129.
 			// See also https://bugzilla.gnome.org/show_bug.cgi?id=754976 :
 			// GtkFrame: Attempt to allocate size of width 1 (or a small number) fails
 			//
 			// GtkFrame does not handle well allocating less than its minimum size
 			GtkRequisition requisition = new GtkRequisition();
-			OS.gtk_widget_get_preferred_size(handle, requisition, null);
+			GTK.gtk_widget_get_preferred_size(handle, requisition, null);
 			/*
 			 * Feature in GTK3.20+: size calculations take into account GtkCSSNode
 			 * elements which we cannot access. If the to-be-allocated size minus
 			 * these elements is < 0, allocate the preferred size instead.
 			 */
-			if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+			if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 				width = (width - (requisition.width - width)) < 0 ? requisition.width : width;
 				height = (height - (requisition.height - height)) < 0 ? requisition.height : height;
 			} else {
@@ -477,7 +477,7 @@ int setBounds(int x, int y, int width, int height, boolean move, boolean resize)
 
 @Override
 long /*int*/ paintHandle() {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		return super.paintHandle();
 	}
 	else {
@@ -485,8 +485,8 @@ long /*int*/ paintHandle() {
 		/* we draw all our children on the clientHandle*/
 		long /*int*/ paintHandle = clientHandle;
 		while (paintHandle != topHandle) {
-			if (OS.gtk_widget_get_has_window (paintHandle)) break;
-			paintHandle = OS.gtk_widget_get_parent (paintHandle);
+			if (GTK.gtk_widget_get_has_window (paintHandle)) break;
+			paintHandle = GTK.gtk_widget_get_parent (paintHandle);
 		}
 		return paintHandle;
 	}
@@ -495,7 +495,7 @@ long /*int*/ paintHandle() {
 @Override
 long /*int*/ paintWindow () {
 	long /*int*/ paintHandle = clientHandle;
-	OS.gtk_widget_realize (paintHandle);
+	GTK.gtk_widget_realize (paintHandle);
 	return gtk_widget_get_window (paintHandle);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java
index 92540ebbbc..2e972a8fe2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java
@@ -246,7 +246,7 @@ public boolean getWideCaret () {
 long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	if (!isInlineEnabled ()) return 0;
 	long /*int*/ imHandle = imHandle ();
-	if (imHandle != 0) OS.gtk_im_context_reset (imHandle);
+	if (imHandle != 0) GTK.gtk_im_context_reset (imHandle);
 	return 0;
 }
 
@@ -290,7 +290,7 @@ long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {
 	long /*int*/ [] preeditString = new long /*int*/ [1];
 	long /*int*/ [] pangoAttrs = new long /*int*/ [1];
 	int [] cursorPos = new int [1];
-	OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos);
+	GTK.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos);
 	caretOffset = cursorPos [0];
 	char [] chars = null;
 	if (preeditString [0] != 0) {
@@ -318,7 +318,7 @@ long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {
 				long /*int*/ attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND);
 				if (attr != 0) {
 					OS.memmove (attrColor, attr, PangoAttrColor.sizeof);
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						GdkRGBA rgba = new GdkRGBA ();
 						rgba.alpha = 1.0;
 						// Manual conversion since PangoAttrColor is a special case.
@@ -338,7 +338,7 @@ long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {
 				attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_BACKGROUND);
 				if (attr != 0) {
 					OS.memmove (attrColor, attr, PangoAttrColor.sizeof);
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						GdkRGBA rgba = new GdkRGBA ();
 						rgba.alpha = 1.0;
 						// Manual conversion since PangoAttrColor is a special case.
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 9bdcbc8874..7b12f858a9 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
@@ -121,9 +121,9 @@ void connectPaint () {
 	 * This causes issues when setting a background color, as whatever
 	 * is drawn on the Label is not re-drawn. See bug 483791.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION (3, 9, 0) && labelHandle != 0) {
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 9, 0) && labelHandle != 0) {
 		int paintMask = OS.GDK_EXPOSURE_MASK;
-		OS.gtk_widget_add_events (labelHandle, paintMask);
+		GTK.gtk_widget_add_events (labelHandle, paintMask);
 
 		OS.g_signal_connect_closure_by_id (labelHandle, display.signalIds [DRAW], 0, display.getClosure (EXPOSE_EVENT_INVERSE), false);
 		OS.g_signal_connect_closure_by_id (labelHandle, display.signalIds [DRAW], 0, display.getClosure (DRAW), true);
@@ -150,10 +150,10 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	* The fix is to use pango layout directly instead of the label size request
 	* to calculate its preferred size.
 	*/
-	boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && OS.gtk_widget_get_visible (labelHandle);
+	boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && GTK.gtk_widget_get_visible (labelHandle);
 	if (fixWrap || frameHandle != 0) forceResize ();
 	if (fixWrap) {
-		long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
+		long /*int*/ labelLayout = GTK.gtk_label_get_layout (labelHandle);
 		int pangoWidth = OS.pango_layout_get_width (labelLayout);
 		if (wHint != SWT.DEFAULT) {
 			OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE);
@@ -165,10 +165,10 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 		OS.pango_layout_set_width (labelLayout, pangoWidth);
 		if (frameHandle != 0) {
 			int [] labelWidth = new int [1], labelHeight = new int [1];
-			OS.gtk_widget_get_size_request (labelHandle, labelWidth, labelHeight);
-			OS.gtk_widget_set_size_request (labelHandle, 1, 1);
+			GTK.gtk_widget_get_size_request (labelHandle, labelWidth, labelHeight);
+			GTK.gtk_widget_set_size_request (labelHandle, 1, 1);
 			size = computeNativeSize (frameHandle, -1, -1, changed);
-			OS.gtk_widget_set_size_request (labelHandle, labelWidth [0], labelHeight [0]);
+			GTK.gtk_widget_set_size_request (labelHandle, labelWidth [0], labelHeight [0]);
 			size.x = size.x - 1;
 			size.y = size.y - 1;
 		} else {
@@ -179,10 +179,10 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	} else {
 		if (frameHandle != 0) {
 			int [] reqWidth = new int [1], reqHeight = new int [1];
-			OS.gtk_widget_get_size_request (handle, reqWidth, reqHeight);
-			OS.gtk_widget_set_size_request (handle, wHint, hHint);
+			GTK.gtk_widget_get_size_request (handle, reqWidth, reqHeight);
+			GTK.gtk_widget_set_size_request (handle, wHint, hHint);
 			size = computeNativeSize (frameHandle, -1, -1, changed);
-			OS.gtk_widget_set_size_request (handle, reqWidth [0], reqHeight [0]);
+			GTK.gtk_widget_set_size_request (handle, reqWidth [0], reqHeight [0]);
 		} else {
 			size = computeNativeSize (handle, wHint, hHint, changed);
 		}
@@ -197,7 +197,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	* muliple lines of text.
 	*/
 	if (hHint == SWT.DEFAULT && labelHandle != 0) {
-		long /*int*/ layout = OS.gtk_label_get_layout (labelHandle);
+		long /*int*/ layout = GTK.gtk_label_get_layout (labelHandle);
 		long /*int*/ context = OS.pango_layout_get_context (layout);
 		long /*int*/ lang = OS.pango_context_get_language (context);
 		long /*int*/ font = getFontDescription ();
@@ -206,7 +206,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 		int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));
 		OS.pango_font_metrics_unref (metrics);
 		int fontHeight = ascent + descent;
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			int [] bufferBottom = new int [1];
 			int [] bufferTop = new int [1];
 			OS.g_object_get(labelHandle, OS.margin_bottom, bufferBottom, 0);
@@ -219,7 +219,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 		}
 		if (frameHandle != 0) {
 			fontHeight += 2 * getThickness (frameHandle).y;
-			fontHeight += 2 * OS.gtk_container_get_border_width (frameHandle);
+			fontHeight += 2 * GTK.gtk_container_get_border_width (frameHandle);
 		}
 		size.y = Math.max (size.y, fontHeight);
 	}
@@ -231,46 +231,46 @@ void createHandle (int index) {
 	state |= HANDLE | THEME_BACKGROUND;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
 	if ((style & SWT.SEPARATOR) != 0) {
 		if ((style & SWT.HORIZONTAL)!= 0) {
-			handle = gtk_separator_new (OS.GTK_ORIENTATION_HORIZONTAL);
+			handle = gtk_separator_new (GTK.GTK_ORIENTATION_HORIZONTAL);
 		} else {
-			handle = gtk_separator_new (OS.GTK_ORIENTATION_VERTICAL);
+			handle = gtk_separator_new (GTK.GTK_ORIENTATION_VERTICAL);
 		}
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 	} else {
-		handle = OS.gtk_event_box_new();
+		handle = GTK.gtk_event_box_new();
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-		boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 0);
+		boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 0);
 		if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		labelHandle = OS.gtk_label_new_with_mnemonic (null);
+		labelHandle = GTK.gtk_label_new_with_mnemonic (null);
 		if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		imageHandle = OS.gtk_image_new ();
+		imageHandle = GTK.gtk_image_new ();
 		if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (handle, boxHandle);
-		OS.gtk_container_add (boxHandle, labelHandle);
-		OS.gtk_container_add (boxHandle, imageHandle);
-		OS.gtk_box_set_child_packing(boxHandle, labelHandle, true, true, 0, OS.GTK_PACK_START);
-		OS.gtk_box_set_child_packing(boxHandle, imageHandle, true, true, 0, OS.GTK_PACK_START);
+		GTK.gtk_container_add (handle, boxHandle);
+		GTK.gtk_container_add (boxHandle, labelHandle);
+		GTK.gtk_container_add (boxHandle, imageHandle);
+		GTK.gtk_box_set_child_packing(boxHandle, labelHandle, true, true, 0, GTK.GTK_PACK_START);
+		GTK.gtk_box_set_child_packing(boxHandle, imageHandle, true, true, 0, GTK.GTK_PACK_START);
 	}
 	if ((style & SWT.BORDER) != 0) {
-		frameHandle = OS.gtk_frame_new (null);
+		frameHandle = GTK.gtk_frame_new (null);
 		if (frameHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (fixedHandle, frameHandle);
-		OS.gtk_container_add (frameHandle, handle);
-		OS.gtk_frame_set_shadow_type (frameHandle, OS.GTK_SHADOW_ETCHED_IN);
+		GTK.gtk_container_add (fixedHandle, frameHandle);
+		GTK.gtk_container_add (frameHandle, handle);
+		GTK.gtk_frame_set_shadow_type (frameHandle, GTK.GTK_SHADOW_ETCHED_IN);
 	} else {
-		OS.gtk_container_add (fixedHandle, handle);
+		GTK.gtk_container_add (fixedHandle, handle);
 	}
 	if ((style & SWT.SEPARATOR) != 0) return;
 	if ((style & SWT.WRAP) != 0) {
-		OS.gtk_label_set_line_wrap (labelHandle, true);
-		OS.gtk_label_set_line_wrap_mode (labelHandle, OS.PANGO_WRAP_WORD_CHAR);
+		GTK.gtk_label_set_line_wrap (labelHandle, true);
+		GTK.gtk_label_set_line_wrap_mode (labelHandle, OS.PANGO_WRAP_WORD_CHAR);
 	}
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont ().handle);
 	}
 	setAlignment ();
@@ -443,16 +443,16 @@ void releaseWidget () {
 
 @Override
 void resizeHandle (int width, int height) {
-	if (OS.GTK3) {
-		OS.swt_fixed_resize (OS.gtk_widget_get_parent (fixedHandle), fixedHandle, width, height);
+	if (GTK.GTK3) {
+		OS.swt_fixed_resize (GTK.gtk_widget_get_parent (fixedHandle), fixedHandle, width, height);
 		long /*int*/ child = frameHandle != 0 ? frameHandle : handle;
 		Point sizes = resizeCalculationsGTK3 (child, width, height);
 		width = sizes.x;
 		height = sizes.y;
-		OS.swt_fixed_resize (OS.gtk_widget_get_parent (child), child, width, height);
+		OS.swt_fixed_resize (GTK.gtk_widget_get_parent (child), child, width, height);
 	} else {
-		OS.gtk_widget_set_size_request (fixedHandle, width, height);
-		OS.gtk_widget_set_size_request (frameHandle != 0 ? frameHandle : handle, width, height);
+		GTK.gtk_widget_set_size_request (fixedHandle, width, height);
+		GTK.gtk_widget_set_size_request (frameHandle != 0 ? frameHandle : handle, width, height);
 	}
 }
 
@@ -480,52 +480,52 @@ public void setAlignment (int alignment) {
 
 void setAlignment () {
 	if ((style & SWT.LEFT) != 0) {
-		if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
-			gtk_widget_set_align(labelHandle,OS.GTK_ALIGN_START, OS.GTK_ALIGN_START); //Aligns widget
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
+			gtk_widget_set_align(labelHandle,GTK.GTK_ALIGN_START, GTK.GTK_ALIGN_START); //Aligns widget
 			gtk_label_set_align (0.0f, 0.0f); //Aligns text inside the widget.
-			gtk_widget_set_align(imageHandle, OS.GTK_ALIGN_START, OS.GTK_ALIGN_CENTER);
+			gtk_widget_set_align(imageHandle, GTK.GTK_ALIGN_START, GTK.GTK_ALIGN_CENTER);
 		} else {
-			OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f);
-			OS.gtk_misc_set_alignment (imageHandle, 0.0f, 0.5f);
+			GTK.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f);
+			GTK.gtk_misc_set_alignment (imageHandle, 0.0f, 0.5f);
 		}
-		OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_LEFT);
+		GTK.gtk_label_set_justify (labelHandle, GTK.GTK_JUSTIFY_LEFT);
 		return;
 	}
 	if ((style & SWT.CENTER) != 0) {
-		if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
-			gtk_widget_set_align(labelHandle,OS.GTK_ALIGN_CENTER, OS.GTK_ALIGN_START); //Aligns widget
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
+			gtk_widget_set_align(labelHandle,GTK.GTK_ALIGN_CENTER, GTK.GTK_ALIGN_START); //Aligns widget
 			gtk_label_set_align (0.5f, 0.0f); //Aligns text inside the widget.
-			gtk_widget_set_align(imageHandle, OS.GTK_ALIGN_CENTER, OS.GTK_ALIGN_CENTER);
+			gtk_widget_set_align(imageHandle, GTK.GTK_ALIGN_CENTER, GTK.GTK_ALIGN_CENTER);
 		} else {
-			OS.gtk_misc_set_alignment (labelHandle, 0.5f, 0.0f);
-			OS.gtk_misc_set_alignment (imageHandle, 0.5f, 0.5f);
+			GTK.gtk_misc_set_alignment (labelHandle, 0.5f, 0.0f);
+			GTK.gtk_misc_set_alignment (imageHandle, 0.5f, 0.5f);
 		}
 
-		OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_CENTER);
+		GTK.gtk_label_set_justify (labelHandle, GTK.GTK_JUSTIFY_CENTER);
 		return;
 	}
 	if ((style & SWT.RIGHT) != 0) {
-		if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
-			gtk_widget_set_align(labelHandle,OS.GTK_ALIGN_END, OS.GTK_ALIGN_START); //Aligns widget.
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0)) {
+			gtk_widget_set_align(labelHandle,GTK.GTK_ALIGN_END, GTK.GTK_ALIGN_START); //Aligns widget.
 			gtk_label_set_align (1.0f, 0.0f); //Aligns text inside the widget.
-			gtk_widget_set_align(imageHandle, OS.GTK_ALIGN_END, OS.GTK_ALIGN_CENTER);
+			gtk_widget_set_align(imageHandle, GTK.GTK_ALIGN_END, GTK.GTK_ALIGN_CENTER);
 		} else  {
-			OS.gtk_misc_set_alignment (labelHandle, 1.0f, 0.0f);
-			OS.gtk_misc_set_alignment (imageHandle, 1.0f, 0.5f);
+			GTK.gtk_misc_set_alignment (labelHandle, 1.0f, 0.0f);
+			GTK.gtk_misc_set_alignment (imageHandle, 1.0f, 0.5f);
 		}
-		OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_RIGHT);
+		GTK.gtk_label_set_justify (labelHandle, GTK.GTK_JUSTIFY_RIGHT);
 		return;
 	}
 }
 
 private void gtk_label_set_align (float xalign, float yalign) {
-	OS.gtk_label_set_xalign (labelHandle, xalign);
-	OS.gtk_label_set_yalign (labelHandle, yalign);
+	GTK.gtk_label_set_xalign (labelHandle, xalign);
+	GTK.gtk_label_set_yalign (labelHandle, yalign);
 }
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
 	setBackgroundGdkColor(fixedHandle, color);
 	if (labelHandle != 0) setBackgroundGdkColor(labelHandle, color);
@@ -547,7 +547,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	* won't draw properly.
 	*/
 	boolean fixWrap = resize && labelHandle != 0 && (style & SWT.WRAP) != 0;
-	if (fixWrap) OS.gtk_widget_set_size_request (labelHandle, -1, -1);
+	if (fixWrap) GTK.gtk_widget_set_size_request (labelHandle, -1, -1);
 	int result = super.setBounds (x, y, width, height, move, resize);
 	/*
 	* Bug in GTK.  For some reason, when the label is
@@ -562,20 +562,20 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	*/
 	if (fixWrap) {
 		GtkAllocation allocation = new GtkAllocation();
-		OS.gtk_widget_get_allocation (handle, allocation);
+		GTK.gtk_widget_get_allocation (handle, allocation);
 		int labelWidth = allocation.width;
 		int labelHeight = allocation.height;
-		OS.gtk_widget_set_size_request (labelHandle, labelWidth, labelHeight);
+		GTK.gtk_widget_set_size_request (labelHandle, labelWidth, labelHeight);
 		/*
 		* Bug in GTK.  Setting the size request should invalidate the label's
 		* layout, but it does not.  The fix is to resize the label directly.
 		*/
 		GtkRequisition requisition = new GtkRequisition ();
 		gtk_widget_get_preferred_size (labelHandle, requisition);
-		OS.gtk_widget_get_allocation(labelHandle, allocation);
+		GTK.gtk_widget_get_allocation(labelHandle, allocation);
 		allocation.width = labelWidth;
 		allocation.height = labelHeight;
-		OS.gtk_widget_size_allocate (labelHandle, allocation);
+		GTK.gtk_widget_size_allocate (labelHandle, allocation);
 	}
 	return result;
 }
@@ -588,18 +588,18 @@ void setFontDescription (long /*int*/ font) {
 
 	// Bug 445801: Work around for computeSize not returning a different value after
 	// changing font, see https://bugzilla.gnome.org/show_bug.cgi?id=753116
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		// This updates the pango context and also clears the size request cache on the GTK side.
-		int originalDirection = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		int tempDirection = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_LTR : OS.GTK_TEXT_DIR_RTL;
-		OS.gtk_widget_set_direction (labelHandle, tempDirection);
-		OS.gtk_widget_set_direction (labelHandle, originalDirection);
+		int originalDirection = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		int tempDirection = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_LTR : GTK.GTK_TEXT_DIR_RTL;
+		GTK.gtk_widget_set_direction (labelHandle, tempDirection);
+		GTK.gtk_widget_set_direction (labelHandle, originalDirection);
 	}
 }
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setForegroundGdkColor(color);
 	setForegroundColor (fixedHandle, color);
 	if (labelHandle != 0) setForegroundColor (labelHandle, color);
@@ -608,7 +608,7 @@ void setForegroundGdkColor (GdkColor color) {
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setForegroundGdkRGBA (rgba);
 	setForegroundGdkRGBA (fixedHandle, rgba);
 	if (labelHandle != 0) setForegroundGdkRGBA (labelHandle, rgba);
@@ -619,9 +619,9 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 void setOrientation (boolean create) {
 	super.setOrientation (create);
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		if (labelHandle != 0) OS.gtk_widget_set_direction (labelHandle, dir);
-		if (imageHandle != 0) OS.gtk_widget_set_direction (imageHandle, dir);
+		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		if (labelHandle != 0) GTK.gtk_widget_set_direction (labelHandle, dir);
+		if (imageHandle != 0) GTK.gtk_widget_set_direction (imageHandle, dir);
 	}
 }
 
@@ -653,12 +653,12 @@ public void setImage (Image image) {
 		int imageIndex = imageList.add (image);
 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
 		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-		OS.gtk_widget_hide (labelHandle);
-		OS.gtk_widget_show (imageHandle);
+		GTK.gtk_widget_hide (labelHandle);
+		GTK.gtk_widget_show (imageHandle);
 	} else {
 		gtk_image_set_from_pixbuf (imageHandle, 0);
-		OS.gtk_widget_show (labelHandle);
-		OS.gtk_widget_hide (imageHandle);
+		GTK.gtk_widget_show (labelHandle);
+		GTK.gtk_widget_hide (imageHandle);
 	}
 }
 
@@ -700,14 +700,14 @@ public void setText (String string) {
 	text = string;
 	char [] chars = fixMnemonic (string);
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
-	OS.gtk_widget_hide (imageHandle);
-	OS.gtk_widget_show (labelHandle);
+	GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+	GTK.gtk_widget_hide (imageHandle);
+	GTK.gtk_widget_show (labelHandle);
 }
 
 @Override
 void setWidgetBackground  () {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		GdkRGBA rgba = (state & BACKGROUND) != 0 ? getBackgroundGdkRGBA () : null;
 		super.setBackgroundGdkRGBA (handle, rgba);
 	} else {
@@ -718,20 +718,20 @@ void setWidgetBackground  () {
 @Override
 void showWidget () {
 	super.showWidget ();
-	if (frameHandle != 0) OS.gtk_widget_show (frameHandle);
-	if (labelHandle != 0) OS.gtk_widget_show (labelHandle);
-	if (boxHandle != 0) OS.gtk_widget_show (boxHandle);
+	if (frameHandle != 0) GTK.gtk_widget_show (frameHandle);
+	if (labelHandle != 0) GTK.gtk_widget_show (labelHandle);
+	if (boxHandle != 0) GTK.gtk_widget_show (boxHandle);
 }
 
 long /*int*/ gtk_separator_new (int orientation) {
 	long /*int*/ separator = 0;
-	if (OS.GTK3) {
-		separator = OS.gtk_separator_new (orientation);
+	if (GTK.GTK3) {
+		separator = GTK.gtk_separator_new (orientation);
 	} else {
-		if (orientation == OS.GTK_ORIENTATION_HORIZONTAL) {
-			separator = OS.gtk_hseparator_new ();
+		if (orientation == GTK.GTK_ORIENTATION_HORIZONTAL) {
+			separator = GTK.gtk_hseparator_new ();
 		} else {
-			separator = OS.gtk_vseparator_new ();
+			separator = GTK.gtk_vseparator_new ();
 		}
 	}
 	return separator;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
index 54cb41c911..2680748f8c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
@@ -148,8 +148,8 @@ void createHandle(int index) {
 	state |= HANDLE | THEME_BACKGROUND;
 	handle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (handle, true);
-	OS.gtk_widget_set_can_focus (handle, true);
+	GTK.gtk_widget_set_has_window (handle, true);
+	GTK.gtk_widget_set_can_focus (handle, true);
 	layout = new TextLayout (display);
 	disabledColor = new Color (display, LINK_DISABLED_FOREGROUND);
 	offsets = new Point [0];
@@ -391,15 +391,15 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event)
 
 @Override
 long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
-		long /*int*/ context = OS.gtk_widget_get_style_context(widget);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		long /*int*/ context = GTK.gtk_widget_get_style_context(widget);
 		GtkAllocation allocation = new GtkAllocation();
-		OS.gtk_widget_get_allocation (widget, allocation);
+		GTK.gtk_widget_get_allocation (widget, allocation);
 		int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
 		int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height;
 		// We specify a 0 value for x & y as we want the whole widget to be
 		// colored, not some portion of it.
-		OS.gtk_render_background(context, cairo, 0, 0, width, height);
+		GTK.gtk_render_background(context, cairo, 0, 0, width, height);
 	}
 	return super.gtk_draw(widget, cairo);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
index ccb4faaa96..00a639be4c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
@@ -102,10 +102,10 @@ public void add (String string) {
 	checkWidget();
 	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
 	byte [] buffer = Converter.wcsToMbcs (string, true);
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
-	OS.gtk_list_store_append (modelHandle, iter);
-	OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
+	GTK.gtk_list_store_append (modelHandle, iter);
+	GTK.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
 	OS.g_free (iter);
 }
 
@@ -138,23 +138,23 @@ public void add (String string) {
 public void add (String string, int index) {
 	checkWidget();
 	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 	if (!(0 <= index && index <= count)) {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
 	byte [] buffer = Converter.wcsToMbcs (string, true);
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
 	/*
 	* Feature in GTK.  It is much faster to append to a list store
 	* than to insert at the end using gtk_list_store_insert().
 	*/
 	if (index == count) {
-		OS.gtk_list_store_append (modelHandle, iter);
+		GTK.gtk_list_store_append (modelHandle, iter);
 	} else {
-		OS.gtk_list_store_insert (modelHandle, iter, index);
+		GTK.gtk_list_store_insert (modelHandle, iter, index);
 	}
-	OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
+	GTK.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
 	OS.g_free (iter);
 }
 
@@ -199,37 +199,37 @@ void createHandle (int index) {
 	state |= HANDLE;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	scrolledHandle = GTK.gtk_scrolled_window_new (0, 0);
 	if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	/*
 	* Columns:
 	* 0 - text
 	*/
 	long /*int*/ [] types = new long /*int*/ [] {OS.G_TYPE_STRING ()};
-	modelHandle = OS.gtk_list_store_newv (types.length, types);
+	modelHandle = GTK.gtk_list_store_newv (types.length, types);
 	if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	handle = OS.gtk_tree_view_new_with_model (modelHandle);
+	handle = GTK.gtk_tree_view_new_with_model (modelHandle);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ textRenderer = OS.gtk_cell_renderer_text_new ();
+	long /*int*/ textRenderer = GTK.gtk_cell_renderer_text_new ();
 	if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ columnHandle = OS.gtk_tree_view_column_new ();
+	long /*int*/ columnHandle = GTK.gtk_tree_view_column_new ();
 	if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
-	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, TEXT_COLUMN);
-	OS.gtk_tree_view_column_set_min_width (columnHandle, 0);
-	OS.gtk_tree_view_insert_column (handle, columnHandle, index);
-	OS.gtk_container_add (fixedHandle, scrolledHandle);
-	OS.gtk_container_add (scrolledHandle, handle);
-
-	int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
-	long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
-	OS.gtk_tree_selection_set_mode (selectionHandle, mode);
-	OS.gtk_tree_view_set_headers_visible (handle, false);
-	int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-	int vsp = (style & SWT.V_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-	OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
-	if ((style & SWT.BORDER) != 0) OS.gtk_scrolled_window_set_shadow_type (scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
+	GTK.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
+	GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, TEXT_COLUMN);
+	GTK.gtk_tree_view_column_set_min_width (columnHandle, 0);
+	GTK.gtk_tree_view_insert_column (handle, columnHandle, index);
+	GTK.gtk_container_add (fixedHandle, scrolledHandle);
+	GTK.gtk_container_add (scrolledHandle, handle);
+
+	int mode = (style & SWT.MULTI) != 0 ? GTK.GTK_SELECTION_MULTIPLE : GTK.GTK_SELECTION_BROWSE;
+	long /*int*/ selectionHandle = GTK.gtk_tree_view_get_selection (handle);
+	GTK.gtk_tree_selection_set_mode (selectionHandle, mode);
+	GTK.gtk_tree_view_set_headers_visible (handle, false);
+	int hsp = (style & SWT.H_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER;
+	int vsp = (style & SWT.V_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER;
+	GTK.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
+	if ((style & SWT.BORDER) != 0) GTK.gtk_scrolled_window_set_shadow_type (scrolledHandle, GTK.GTK_SHADOW_ETCHED_IN);
 	/*
 	* Bug in GTK. When a treeview is the child of an override shell,
 	* and if the user has ever invokes the interactive search field,
@@ -238,11 +238,11 @@ void createHandle (int index) {
 	* shell.
 	*/
 	if ((getShell ().style & SWT.ON_TOP) != 0) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	}
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont().handle);
 	}
 }
@@ -257,7 +257,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	checkWidget ();
 	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
-	OS.gtk_widget_realize(handle);
+	GTK.gtk_widget_realize(handle);
 	Point size = computeNativeSize (handle, wHint, hHint, changed);
 	if (size.x == 0 && wHint == SWT.DEFAULT) size.x = DEFAULT_WIDTH;
 	/*
@@ -265,7 +265,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	 * So if the height is returned as zero calculate the table height
 	 * based on the number of items in the table
 	 */
-	 if (OS.GTK3 && size.y == 0 && hHint == SWT.DEFAULT) {
+	 if (GTK.GTK3 && size.y == 0 && hHint == SWT.DEFAULT) {
 	 size.y = getItemCount() * getItemHeightInPixels();
 	 }
 
@@ -289,7 +289,7 @@ GdkRGBA defaultBackground () {
 @Override
 void deregister() {
 	super.deregister ();
-	display.removeWidget (OS.gtk_tree_view_get_selection (handle));
+	display.removeWidget (GTK.gtk_tree_view_get_selection (handle));
 }
 
 /**
@@ -306,12 +306,12 @@ void deregister() {
  */
 public void deselect (int index) {
 	checkWidget();
-	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0)))  return;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	if (!(0 <= index && index < GTK.gtk_tree_model_iter_n_children (modelHandle, 0)))  return;
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-	OS.gtk_tree_selection_unselect_iter (selection, iter);
+	GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+	GTK.gtk_tree_selection_unselect_iter (selection, iter);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_free (iter);
 }
@@ -334,16 +334,16 @@ public void deselect (int index) {
 public void deselect (int start, int end) {
 	checkWidget();
 	if (start < 0 && end < 0) return;
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 	if (start >= count && end >= count) return;
 	start = Math.min (count - 1, Math.max (0, start));
 	end = Math.min (count - 1, Math.max (0, end));
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=start; index<=end; index++) {
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-		OS.gtk_tree_selection_unselect_iter (selection, iter);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+		GTK.gtk_tree_selection_unselect_iter (selection, iter);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_free (iter);
@@ -369,15 +369,15 @@ public void deselect (int start, int end) {
 public void deselect (int [] indices) {
 	checkWidget();
 	if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int i=0; i<indices.length; i++) {
 		int index = indices [i];
 		if (index < 0 || index > count - 1) continue;
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-		OS.gtk_tree_selection_unselect_iter (selection, iter);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+		GTK.gtk_tree_selection_unselect_iter (selection, iter);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_free (iter);
@@ -393,9 +393,9 @@ public void deselect (int [] indices) {
  */
 public void deselectAll () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_unselect_all (selection);
+	GTK.gtk_tree_selection_unselect_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 }
 
@@ -405,11 +405,11 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 	if (OS.isX11()) { //Wayland
 		if (filter) {
 			long /*int*/ [] path = new long /*int*/ [1];
-			if (OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {
 				if (path [0] != 0) {
-					long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-					if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
-					OS.gtk_tree_path_free (path [0]);
+					long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+					if (GTK.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
+					GTK.gtk_tree_path_free (path [0]);
 				}
 			} else {
 				return false;
@@ -422,8 +422,8 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 		double [] startX = new double[1];
 		double [] startY = new double [1];
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_gesture_drag_get_start_point(dragGesture, startX, startY)) {
-			if (OS.gtk_tree_view_get_path_at_pos (handle, (int) startX[0], (int) startY[0], path, null, null, null)) {
+		if (GTK.gtk_gesture_drag_get_start_point(dragGesture, startX, startY)) {
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, (int) startX[0], (int) startY[0], path, null, null, null)) {
 				if (path [0] != 0) {
 					boolean dragDetect = super.dragDetect (x, y, filter, false, consume);
 					if (dragDetect && selected && consume != null) consume [0] = true;
@@ -445,7 +445,7 @@ long /*int*/ eventWindow () {
 
 @Override
 GdkColor getBackgroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getBaseGdkColor ();
 }
 
@@ -463,18 +463,18 @@ GdkColor getBackgroundGdkColor () {
 public int getFocusIndex () {
 	checkWidget();
 	long /*int*/ [] path = new long /*int*/ [1];
-	OS.gtk_tree_view_get_cursor (handle, path, null);
+	GTK.gtk_tree_view_get_cursor (handle, path, null);
 	if (path [0] == 0) return -1;
-	long /*int*/ indices = OS.gtk_tree_path_get_indices (path [0]);
+	long /*int*/ indices = GTK.gtk_tree_path_get_indices (path [0]);
 	int [] index = new int []{-1};
 	if (indices != 0) C.memmove (index, indices, 4);
-	OS.gtk_tree_path_free (path [0]);
+	GTK.gtk_tree_path_free (path [0]);
 	return index [0];
 }
 
 @Override
 GdkColor getForegroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getTextColor ();
 }
 
@@ -495,13 +495,13 @@ GdkColor getForegroundGdkColor () {
  */
 public String getItem (int index) {
 	checkWidget();
-	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0)))  {
+	if (!(0 <= index && index < GTK.gtk_tree_model_iter_n_children (modelHandle, 0)))  {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
 	long /*int*/ [] ptr = new long /*int*/ [1];
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-	OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+	GTK.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
 	OS.g_free (iter);
 	if (ptr [0] == 0) return null;
 	int length = C.strlen (ptr [0]);
@@ -523,7 +523,7 @@ public String getItem (int index) {
  */
 public int getItemCount () {
 	checkWidget();
-	return OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	return GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 }
 
 /**
@@ -544,24 +544,24 @@ public int getItemHeight () {
 
 int getItemHeightInPixels () {
 	checkWidget();
-	int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
-	long /*int*/ column = OS.gtk_tree_view_get_column (handle, 0);
+	int itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
+	long /*int*/ column = GTK.gtk_tree_view_get_column (handle, 0);
 	if (itemCount == 0) {
 		int [] w = new int [1], h = new int [1];
-		OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
+		GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
 		int height = h [0];
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			long /*int*/ textRenderer = getTextRenderer (column);
-			OS.gtk_cell_renderer_get_preferred_height_for_width (textRenderer, handle, 0, h, null);
+			GTK.gtk_cell_renderer_get_preferred_height_for_width (textRenderer, handle, 0, h, null);
 			height += h [0];
 		}
 		return height;
 	} else {
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		OS.gtk_tree_model_get_iter_first (modelHandle, iter);
-		OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		GTK.gtk_tree_model_get_iter_first (modelHandle, iter);
+		GTK.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
 		int [] w = new int [1], h = new int [1];
-		OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
+		GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
 		OS.g_free (iter);
 		return h [0];
 	}
@@ -585,13 +585,13 @@ int getItemHeightInPixels () {
  */
 public String [] getItems () {
 	checkWidget();
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	String [] result = new String [count];
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	for (int index=0; index<count; index++) {
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-		OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+		GTK.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
 		if (ptr [0] != 0) {
 			int length = C.strlen (ptr [0]);
 			byte[] buffer = new byte [length];
@@ -642,8 +642,8 @@ public String [] getSelection () {
  */
 public int getSelectionCount () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	return OS.gtk_tree_selection_count_selected_rows (selection);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	return GTK.gtk_tree_selection_count_selected_rows (selection);
 }
 
 /**
@@ -659,8 +659,8 @@ public int getSelectionCount () {
  */
 public int getSelectionIndex () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, null);
 	long /*int*/ originalList = list;
 	if (list != 0) {
 		int [] index = new int [1];
@@ -668,14 +668,14 @@ public int getSelectionIndex () {
 		while (list != 0) {
 			long /*int*/ data = OS.g_list_data (list);
 			if (foundIndex == false) {
-				long /*int*/ indices = OS.gtk_tree_path_get_indices (data);
+				long /*int*/ indices = GTK.gtk_tree_path_get_indices (data);
 				if (indices !=0) {
 					C.memmove (index, indices, 4);
 					foundIndex = true;
 				}
 			}
 			list = OS.g_list_next (list);
-			OS.gtk_tree_path_free (data);
+			GTK.gtk_tree_path_free (data);
 		}
 		OS.g_list_free (originalList);
 		return index [0];
@@ -701,8 +701,8 @@ public int getSelectionIndex () {
  */
 public int [] getSelectionIndices () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, null);
 	long /*int*/ originalList = list;
 	if (list != 0) {
 		int count = OS.g_list_length (list);
@@ -710,14 +710,14 @@ public int [] getSelectionIndices () {
 		int length = 0;
 		for (int i=0; i<count; i++) {
 			long /*int*/ data = OS.g_list_data (list);
-			long /*int*/ indices = OS.gtk_tree_path_get_indices (data);
+			long /*int*/ indices = GTK.gtk_tree_path_get_indices (data);
 			if (indices != 0) {
 				int [] index = new int [1];
 				C.memmove (index, indices, 4);
 				treeSelection [length] = index [0];
 				length++;
 			}
-			OS.gtk_tree_path_free (data);
+			GTK.gtk_tree_path_free (data);
 			list = OS.g_list_next (list);
 		}
 		OS.g_list_free (originalList);
@@ -729,13 +729,13 @@ public int [] getSelectionIndices () {
 }
 
 long /*int*/ getTextRenderer (long /*int*/ column) {
-	long /*int*/ list = OS.gtk_cell_layout_get_cells(column);
+	long /*int*/ list = GTK.gtk_cell_layout_get_cells(column);
 	if (list == 0) return 0;
 	long /*int*/ originalList = list;
 	long /*int*/ textRenderer = 0;
 	while (list != 0) {
 		long /*int*/ renderer = OS.g_list_data (list);
-		if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
+		if (GTK.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
 			textRenderer = renderer;
 			break;
 		}
@@ -765,23 +765,23 @@ public int getTopIndex () {
 	 * using the UI. Otherwise, fetch topIndex using GtkTreeView API.
 	 */
 	long /*int*/ vAdjustment;
-	if (OS.GTK3) {
-		vAdjustment = OS.gtk_scrollable_get_vadjustment (handle);
+	if (GTK.GTK3) {
+		vAdjustment = GTK.gtk_scrollable_get_vadjustment (handle);
 	} else {
-		vAdjustment = OS.gtk_tree_view_get_vadjustment (handle);
+		vAdjustment = GTK.gtk_tree_view_get_vadjustment (handle);
 	}
-	currentAdjustment = OS.gtk_adjustment_get_value (vAdjustment);
+	currentAdjustment = GTK.gtk_adjustment_get_value (vAdjustment);
 	if (cachedAdjustment == currentAdjustment) {
 		return topIndex;
 	} else {
 		long /*int*/ [] path = new long /*int*/ [1];
-		OS.gtk_widget_realize (handle);
-		if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return 0;
+		GTK.gtk_widget_realize (handle);
+		if (!GTK.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return 0;
 		if (path [0] == 0) return 0;
-		long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]);
+		long /*int*/ indices = GTK.gtk_tree_path_get_indices (path[0]);
 		int[] index = new int [1];
 		if (indices != 0) C.memmove (index, indices, 4);
-		OS.gtk_tree_path_free (path [0]);
+		GTK.gtk_tree_path_free (path [0]);
 		return index [0];
 	}
 }
@@ -803,7 +803,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 			* The fix is to detect this case in 'event_after' and send the
 			* expose event.
 			*/
-			if (OS.gtk_tree_model_iter_n_children (modelHandle, 0) == 0) {
+			if (GTK.gtk_tree_model_iter_n_children (modelHandle, 0) == 0) {
 				gtk_expose_event (widget, gdkEvent);
 			}
 			break;
@@ -830,12 +830,12 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 		long /*int*/ nextEvent = OS.gdk_event_peek ();
 		if (nextEvent == 0) {
 			long /*int*/ [] path = new long /*int*/ [1];
-			long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-			if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
+			long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
 					path[0] != 0) {
 				//  selection count is used in the case of clicking an already selected item while holding Control
 				selectionCountOnPress = getSelectionCount();
-				if (OS.gtk_tree_selection_path_is_selected (selection, path[0])) {
+				if (GTK.gtk_tree_selection_path_is_selected (selection, path[0])) {
 					if (((gdkEvent.state & (OS.GDK_CONTROL_MASK|OS.GDK_SHIFT_MASK)) == 0) ||
 							((gdkEvent.state & OS.GDK_CONTROL_MASK) != 0)) {
 						/**
@@ -845,8 +845,8 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 						 * E.g to reproduce: Open DNDExample, select "Tree", select multiple items, try dragging.
 						 *   without line below, only one item is selected for drag.
 						 */
-						long /*int*/ gtk_false_funcPtr = OS.GET_FUNCTION_POINTER_gtk_false();
-						OS.gtk_tree_selection_set_select_function(selection, gtk_false_funcPtr, 0, 0);
+						long /*int*/ gtk_false_funcPtr = GTK.GET_FUNCTION_POINTER_gtk_false();
+						GTK.gtk_tree_selection_set_select_function(selection, gtk_false_funcPtr, 0, 0);
 					}
 				}
 			}
@@ -866,11 +866,11 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	int button = gdkEvent.button;
 	if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-				if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
-				OS.gtk_tree_path_free (path [0]);
+				long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+				if (GTK.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
+				GTK.gtk_tree_path_free (path [0]);
 			}
 		}
 	}
@@ -884,13 +884,13 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	*/
 	if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+				long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 				OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
+				GTK.gtk_tree_view_set_cursor (handle, path [0], 0, false);
 				OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_tree_path_free (path [0]);
+				GTK.gtk_tree_path_free (path [0]);
 			}
 		}
 	}
@@ -917,7 +917,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
 long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
 	GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-	if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
+	if (gdkEvent.window != GTK.gtk_tree_view_get_bin_window (handle)) return 0;
 	/*
 	 * Feature in GTK. In multi-select tree view there is a problem with using DnD operations while also selecting multiple items.
 	 * When doing a DnD, GTK de-selects all other items except for the widget being dragged from. By disabling the selection function
@@ -927,19 +927,19 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event)
 	 */
 	if ((state & DRAG_DETECT) != 0 && hooks (SWT.DragDetect) && !OS.isX11()) { // Wayland
 		long /*int*/ [] path = new long /*int*/ [1];
-		long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+		long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 		// free up the selection function on release.
-		OS.gtk_tree_selection_set_select_function(selection,0,0,0);
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
-				path[0] != 0 && OS.gtk_tree_selection_path_is_selected (selection, path[0])) {
+		GTK.gtk_tree_selection_set_select_function(selection,0,0,0);
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
+				path[0] != 0 && GTK.gtk_tree_selection_path_is_selected (selection, path[0])) {
 			selectionCountOnRelease = getSelectionCount();
 			if ((gdkEvent.state & (OS.GDK_CONTROL_MASK|OS.GDK_SHIFT_MASK)) == 0) {
-				OS.gtk_tree_view_set_cursor(handle, path[0], 0,  false);
+				GTK.gtk_tree_view_set_cursor(handle, path[0], 0,  false);
 			}
 			 // Check to see if there has been a new tree item selected when holding Control in Path.
 			 // If not, deselect the item.
 			if ((gdkEvent.state & OS.GDK_CONTROL_MASK) != 0 && selectionCountOnRelease == selectionCountOnPress) {
-				OS.gtk_tree_selection_unselect_path (selection,path[0]);
+				GTK.gtk_tree_selection_unselect_path (selection,path[0]);
 			}
 		}
 	}
@@ -982,7 +982,7 @@ void sendTreeDefaultSelection() {
 @Override
 void hookEvents () {
 	super.hookEvents();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection(handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection(handle);
 	OS.g_signal_connect_closure (selection, OS.changed, display.getClosure (CHANGED), false);
 	OS.g_signal_connect_closure (handle, OS.row_activated, display.getClosure (ROW_ACTIVATED), false);
 }
@@ -1055,24 +1055,24 @@ public int indexOf (String string, int start) {
  */
 public boolean isSelected (int index) {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	byte [] buffer = Converter.wcsToMbcs (Integer.toString (index), true);
-	long /*int*/ path = OS.gtk_tree_path_new_from_string (buffer);
-	boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);
-	OS.gtk_tree_path_free (path);
+	long /*int*/ path = GTK.gtk_tree_path_new_from_string (buffer);
+	boolean answer = GTK.gtk_tree_selection_path_is_selected (selection, path);
+	GTK.gtk_tree_path_free (path);
 	return answer;
 }
 
 @Override
 long /*int*/ paintWindow () {
-	OS.gtk_widget_realize (handle);
-	return OS.gtk_tree_view_get_bin_window (handle);
+	GTK.gtk_widget_realize (handle);
+	return GTK.gtk_tree_view_get_bin_window (handle);
 }
 
 @Override
 void register () {
 	super.register ();
-	display.addWidget (OS.gtk_tree_view_get_selection (handle), this);
+	display.addWidget (GTK.gtk_tree_view_get_selection (handle), this);
 }
 
 @Override
@@ -1098,14 +1098,14 @@ void releaseWidget () {
  */
 public void remove (int index) {
 	checkWidget();
-	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0)))  {
+	if (!(0 <= index && index < GTK.gtk_tree_model_iter_n_children (modelHandle, 0)))  {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_list_store_remove (modelHandle, iter);
+	GTK.gtk_list_store_remove (modelHandle, iter);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_free (iter);
 }
@@ -1129,16 +1129,16 @@ public void remove (int index) {
 public void remove (int start, int end) {
 	checkWidget();
 	if (start > end) return;
-	int count =  OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	int count =  GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 	if (!(0 <= start && start <= end && end < count)) {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=end; index>=start; index--) {
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-		OS.gtk_list_store_remove (modelHandle, iter);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+		GTK.gtk_list_store_remove (modelHandle, iter);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_free (iter);
@@ -1195,15 +1195,15 @@ public void remove (int [] indices) {
 	if (!(0 <= start && start <= end && end < count)) {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	int last = -1;
 	for (int i=0; i<newIndices.length; i++) {
 		int index = newIndices [i];
 		if (index != last) {
-			OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-			OS.gtk_list_store_remove (modelHandle, iter);
+			GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+			GTK.gtk_list_store_remove (modelHandle, iter);
 			last = index;
 		}
 	}
@@ -1221,9 +1221,9 @@ public void remove (int [] indices) {
  */
 public void removeAll () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_list_store_clear (modelHandle);
+	GTK.gtk_list_store_clear (modelHandle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 }
 
@@ -1266,16 +1266,16 @@ public void removeSelectionListener(SelectionListener listener) {
  */
 public void select (int index) {
 	checkWidget();
-	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0)))  return;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	if (!(0 <= index && index < GTK.gtk_tree_model_iter_n_children (modelHandle, 0)))  return;
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-	OS.gtk_tree_selection_select_iter (selection, iter);
+	GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+	GTK.gtk_tree_selection_select_iter (selection, iter);
 	if ((style & SWT.SINGLE) != 0) {
-		long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-		OS.gtk_tree_view_set_cursor (handle, path, 0, false);
-		OS.gtk_tree_path_free (path);
+		long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+		GTK.gtk_tree_view_set_cursor (handle, path, 0, false);
+		GTK.gtk_tree_path_free (path);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	OS.g_free (iter);
@@ -1306,20 +1306,20 @@ public void select (int index) {
 public void select (int start, int end) {
 	checkWidget ();
 	if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return;
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 	if (count == 0 || start >= count) return;
 	start = Math.max (0, start);
 	end = Math.min (end, count - 1);
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=start; index<=end; index++) {
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-		OS.gtk_tree_selection_select_iter (selection, iter);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+		GTK.gtk_tree_selection_select_iter (selection, iter);
 		if ((style & SWT.SINGLE) != 0) {
-			long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-			OS.gtk_tree_view_set_cursor (handle, path, 0, false);
-			OS.gtk_tree_path_free (path);
+			long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+			GTK.gtk_tree_view_set_cursor (handle, path, 0, false);
+			GTK.gtk_tree_path_free (path);
 		}
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -1353,19 +1353,19 @@ public void select (int [] indices) {
 	if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
 	int length = indices.length;
 	if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int i=0; i<length; i++) {
 		int index = indices [i];
 		if (!(0 <= index && index < count)) continue;
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-		OS.gtk_tree_selection_select_iter (selection, iter);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+		GTK.gtk_tree_selection_select_iter (selection, iter);
 		if ((style & SWT.SINGLE) != 0) {
-			long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-			OS.gtk_tree_view_set_cursor (handle, path, 0, false);
-			OS.gtk_tree_path_free (path);
+			long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+			GTK.gtk_tree_view_set_cursor (handle, path, 0, false);
+			GTK.gtk_tree_path_free (path);
 		}
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -1385,9 +1385,9 @@ public void select (int [] indices) {
 public void selectAll () {
 	checkWidget();
 	if ((style & SWT.SINGLE) != 0) return;
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_select_all (selection);
+	GTK.gtk_tree_selection_select_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 }
 
@@ -1397,24 +1397,24 @@ void selectFocusIndex (int index) {
 	* specified index, so any previous selection in the list will be lost.
 	* gtk does not provide a way to just set focus to a specified list item.
 	*/
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 	if (!(0 <= index && index < count))  return;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_view_set_cursor (handle, path, 0, false);
+	GTK.gtk_tree_view_set_cursor (handle, path, 0, false);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	OS.g_free (iter);
 }
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
-	OS.gtk_widget_modify_base (handle, 0, color);
+	GTK.gtk_widget_modify_base (handle, 0, color);
 }
 
 @Override
@@ -1428,7 +1428,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	* a new shell is created. The fix is to ensure the tree view is realized
 	* after it has been resized.
 	*/
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	return result;
 }
 
@@ -1451,13 +1451,13 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 public void setItem (int index, String string) {
 	checkWidget();
 	if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
-	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0)))  {
+	if (!(0 <= index && index < GTK.gtk_tree_model_iter_n_children (modelHandle, 0)))  {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
 	byte [] buffer = Converter.wcsToMbcs (string, true);
-	OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
+	GTK.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
 	OS.g_free (iter);
 }
 
@@ -1481,25 +1481,25 @@ public void setItems (String... items) {
 	for (int i=0; i<items.length; i++) {
 		if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT);
 	}
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_list_store_clear (modelHandle);
+	GTK.gtk_list_store_clear (modelHandle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
 	for (int i=0; i<items.length; i++) {
 		String string = items [i];
 		byte [] buffer = Converter.wcsToMbcs (string, true);
-		OS.gtk_list_store_append (modelHandle, iter);
-		OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
+		GTK.gtk_list_store_append (modelHandle, iter);
+		GTK.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
 	}
 	OS.g_free (iter);
 }
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION (3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 14, 0)) {
 		GdkRGBA toSet = rgba == null ? display.COLOR_LIST_FOREGROUND_RGBA : rgba;
 		setForegroundGdkRGBA (handle, toSet);
 	} else {
@@ -1509,7 +1509,7 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (handle, color, false);
 }
 
@@ -1562,7 +1562,7 @@ public void setSelection (int start, int end) {
 	checkWidget ();
 	deselectAll ();
 	if (end < 0 || start > end || ((style & SWT.SINGLE) != 0 && start != end)) return;
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 	if (count == 0 || start >= count) return;
 	start = Math.max (0, start);
 	end = Math.min (end, count - 1);
@@ -1683,22 +1683,22 @@ public void setTopIndex (int index) {
 	 * doesn't exist on GTK2.
 	 */
 	long /*int*/ vAdjustment;
-	if (OS.GTK3) {
-		vAdjustment = OS.gtk_scrollable_get_vadjustment (handle);
+	if (GTK.GTK3) {
+		vAdjustment = GTK.gtk_scrollable_get_vadjustment (handle);
 	} else {
-		vAdjustment = OS.gtk_tree_view_get_vadjustment (handle);
+		vAdjustment = GTK.gtk_tree_view_get_vadjustment (handle);
 	}
-	cachedAdjustment = OS.gtk_adjustment_get_value (vAdjustment);
+	cachedAdjustment = GTK.gtk_adjustment_get_value (vAdjustment);
 	topIndex = index;
 	/*
 	 * Scroll to the cell, now that the topIndex variable has been set.
 	 */
-	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-	OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);
-	OS.gtk_tree_path_free (path);
+	if (!(0 <= index && index < GTK.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+	GTK.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);
+	GTK.gtk_tree_path_free (path);
 	OS.g_free (iter);
 }
 
@@ -1716,12 +1716,12 @@ public void showSelection () {
 	checkWidget();
 	int index = getSelectionIndex ();
 	if (index == -1) return;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
 
-	OS.gtk_widget_realize (handle);
-	OS.gtk_tree_view_scroll_to_cell (handle, path, 0, false, 0, 0);
+	GTK.gtk_widget_realize (handle);
+	GTK.gtk_tree_view_scroll_to_cell (handle, path, 0, false, 0, 0);
 
 	/*
 	 * Reverting the code for bug 459072. With gtk_tree_view_scroll_to_cell, there are some pending gtk events.
@@ -1729,21 +1729,21 @@ public void showSelection () {
 	 * all the pending events and update top index.
 	 */
 	GdkRectangle visibleRect = new GdkRectangle ();
-	OS.gtk_tree_view_get_visible_rect (handle, visibleRect);
+	GTK.gtk_tree_view_get_visible_rect (handle, visibleRect);
 	GdkRectangle cellRect = new GdkRectangle ();
-	OS.gtk_tree_view_get_cell_area (handle, path, 0, cellRect);
+	GTK.gtk_tree_view_get_cell_area (handle, path, 0, cellRect);
 	int[] tx = new int[1], ty = new int[1];
-	OS.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
+	GTK.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
 	if (ty[0] < visibleRect.y ) {
-		OS.gtk_tree_view_scroll_to_point (handle, -1, ty[0]);
+		GTK.gtk_tree_view_scroll_to_point (handle, -1, ty[0]);
 	} else {
 		int height = Math.min (visibleRect.height, cellRect.height);
 		if (ty[0] + height > visibleRect.y + visibleRect.height) {
 			ty[0] += cellRect.height - visibleRect.height;
-			OS.gtk_tree_view_scroll_to_point (handle, -1, ty[0]);
+			GTK.gtk_tree_view_scroll_to_point (handle, -1, ty[0]);
 		}
 	}
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	OS.g_free (iter);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
index 766d7928e5..3816dca0e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
@@ -193,7 +193,7 @@ static int checkStyle (int style) {
 }
 
 void _setVisible (boolean visible) {
-	if (visible == OS.gtk_widget_get_mapped (handle)) return;
+	if (visible == GTK.gtk_widget_get_mapped (handle)) return;
 	if (visible) {
 		sendEvent (SWT.Show);
 		if (getItemCount () != 0) {
@@ -204,9 +204,9 @@ void _setVisible (boolean visible) {
 			* when it is being shown in an ON_TOP shell.
 			*/
 			if ((parent._getShell ().style & SWT.ON_TOP) != 0) {
-				OS.gtk_menu_shell_set_take_focus (handle, false);
+				GTK.gtk_menu_shell_set_take_focus (handle, false);
 			}
-			if (OS.GTK_VERSION < OS.VERSION(3, 22, 0)) {
+			if (GTK.GTK_VERSION < OS.VERSION(3, 22, 0)) {
 				long /*int*/ address = 0;
 				hasLocation = false;
 				long /*int*/ data = 0;
@@ -220,7 +220,7 @@ void _setVisible (boolean visible) {
 				TrayItem item = display.currentTrayItem;
 				if (item != null && !item.isDisposed()) {
 					 data = item.handle;
-					 address = OS.gtk_status_icon_position_menu_func ();
+					 address = GTK.gtk_status_icon_position_menu_func ();
 				}
 				/*
 				* Bug in GTK.  The timestamp passed into gtk_menu_popup is used
@@ -228,7 +228,7 @@ void _setVisible (boolean visible) {
 				* will fail.  The fix is to ensure that the timestamp of the last
 				* event processed is used.
 				*/
-				OS.gtk_menu_popup (handle, 0, 0, address, data, 0, display.getLastEventTime ());
+				GTK.gtk_menu_popup (handle, 0, 0, address, data, 0, display.getLastEventTime ());
 			}
 			else {
 				/*
@@ -236,17 +236,17 @@ void _setVisible (boolean visible) {
 				 *  requires an event to hook on to. This requires the popup & events related to the menu be handled
 				 *  immediately and not as a post event in display, requiring the current event.
 				 */
-				long /*int*/ eventPtr = OS.gtk_get_current_event();
+				long /*int*/ eventPtr = GTK.gtk_get_current_event();
 				if (eventPtr == 0) {
 					eventPtr = OS.gdk_event_new(OS.GDK_BUTTON_PRESS);
 					GdkEventButton event = new GdkEventButton ();
 					event.type = OS.GDK_BUTTON_PRESS;
-					event.window = OS.g_object_ref(OS.gtk_widget_get_window (getShell().handle));
+					event.window = OS.g_object_ref(GTK.gtk_widget_get_window (getShell().handle));
 					long /*int*/ device_manager = OS.gdk_display_get_device_manager (OS.gdk_display_get_default ());
 					event.device = OS.gdk_device_manager_get_client_pointer (device_manager);
 					event.time = display.getLastEventTime ();
 					OS.memmove (eventPtr, event, GdkEventButton.sizeof);
-					OS.gtk_menu_popup_at_pointer (handle, eventPtr);
+					GTK.gtk_menu_popup_at_pointer (handle, eventPtr);
 				} else {
 					if (!OS.isX11()) {
 						/*
@@ -280,14 +280,14 @@ void _setVisible (boolean visible) {
 						}
 					}
 				}
-				OS.gtk_menu_popup_at_pointer (handle, eventPtr);
+				GTK.gtk_menu_popup_at_pointer (handle, eventPtr);
 				OS.gdk_event_free (eventPtr);
 			}
 		} else {
 			sendEvent (SWT.Hide);
 		}
 	} else {
-		OS.gtk_menu_popdown (handle);
+		GTK.gtk_menu_popdown (handle);
 	}
 }
 
@@ -356,33 +356,33 @@ public void addHelpListener (HelpListener listener) {
 void createHandle (int index) {
 	state |= HANDLE;
 	if ((style & SWT.BAR) != 0) {
-		handle = OS.gtk_menu_bar_new ();
+		handle = GTK.gtk_menu_bar_new ();
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 		long /*int*/ vboxHandle = parent.vboxHandle;
-		OS.gtk_container_add (vboxHandle, handle);
-		OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, OS.GTK_PACK_START);
+		GTK.gtk_container_add (vboxHandle, handle);
+		GTK.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, GTK.GTK_PACK_START);
 	} else {
-		handle = OS.gtk_menu_new ();
+		handle = GTK.gtk_menu_new ();
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 	}
 }
 
 void createIMMenu (long /*int*/ imHandle) {
 	boolean showInputMethod = false;
-	long /*int*/ settings = OS.gtk_settings_get_default ();
-	if (settings != 0 && OS.GTK_VERSION < OS.VERSION (3, 10, 0)) {
+	long /*int*/ settings = GTK.gtk_settings_get_default ();
+	if (settings != 0 && GTK.GTK_VERSION < OS.VERSION (3, 10, 0)) {
 		int [] buffer = new int [1];
-		OS.g_object_get (settings, OS.gtk_show_input_method_menu, buffer, 0);
+		OS.g_object_get (settings, GTK.gtk_show_input_method_menu, buffer, 0);
 		showInputMethod = buffer[0] != 0;
 	}
 	if (imHandle == 0 || !showInputMethod) {
 		this.imHandle = 0;
 		if (imItem != 0) {
-			OS.gtk_widget_destroy (imItem);
+			GTK.gtk_widget_destroy (imItem);
 			imItem = 0;
 		}
 		if (imSeparator != 0) {
-			OS.gtk_widget_destroy (imSeparator);
+			GTK.gtk_widget_destroy (imSeparator);
 			imSeparator = 0;
 		}
 		return;
@@ -391,53 +391,53 @@ void createIMMenu (long /*int*/ imHandle) {
 	this.imHandle = imHandle;
 
 	if (imSeparator == 0) {
-		imSeparator = OS.gtk_separator_menu_item_new ();
-		OS.gtk_widget_show (imSeparator);
-		OS.gtk_menu_shell_insert (handle, imSeparator, -1);
+		imSeparator = GTK.gtk_separator_menu_item_new ();
+		GTK.gtk_widget_show (imSeparator);
+		GTK.gtk_menu_shell_insert (handle, imSeparator, -1);
 	}
 	if (imItem == 0) {
 		byte[] buffer = Converter.wcsToMbcs (SWT.getMessage("SWT_InputMethods"), true);
-		if (OS.GTK3) {
-			imItem = OS.gtk_menu_item_new ();
+		if (GTK.GTK3) {
+			imItem = GTK.gtk_menu_item_new ();
 			if (imItem == 0) error (SWT.ERROR_NO_HANDLES);
 			long /*int*/ imageHandle = 0;
-			long /*int*/ labelHandle = OS.gtk_accel_label_new (buffer);
+			long /*int*/ labelHandle = GTK.gtk_accel_label_new (buffer);
 			if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-			if (OS.GTK_VERSION >= OS.VERSION (3, 16, 0)) {
-				OS.gtk_label_set_xalign (labelHandle, 0);
-				OS.gtk_widget_set_halign (labelHandle, OS.GTK_ALIGN_FILL);
+			if (GTK.GTK_VERSION >= OS.VERSION (3, 16, 0)) {
+				GTK.gtk_label_set_xalign (labelHandle, 0);
+				GTK.gtk_widget_set_halign (labelHandle, GTK.GTK_ALIGN_FILL);
 			} else {
-				OS.gtk_misc_set_alignment(labelHandle, 0, 0);
+				GTK.gtk_misc_set_alignment(labelHandle, 0, 0);
 			}
-			long /*int*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 0);
+			long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 0);
 			if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
 			if (OS.SWT_PADDED_MENU_ITEMS) {
-				imageHandle = OS.gtk_image_new();
+				imageHandle = GTK.gtk_image_new();
 				if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-				OS.gtk_image_set_pixel_size (imageHandle, 16);
+				GTK.gtk_image_set_pixel_size (imageHandle, 16);
 				if (boxHandle != 0) {
-					OS.gtk_container_add (boxHandle, imageHandle);
-					OS.gtk_widget_show (imageHandle);
+					GTK.gtk_container_add (boxHandle, imageHandle);
+					GTK.gtk_widget_show (imageHandle);
 				}
 			}
 			if (labelHandle != 0 && boxHandle != 0) {
-				OS.gtk_box_pack_end (boxHandle, labelHandle, true, true, 0);
-				OS.gtk_widget_show (labelHandle);
+				GTK.gtk_box_pack_end (boxHandle, labelHandle, true, true, 0);
+				GTK.gtk_widget_show (labelHandle);
 			}
 			if (boxHandle != 0) {
-				OS.gtk_container_add (imItem, boxHandle);
-				OS.gtk_widget_show (boxHandle);
+				GTK.gtk_container_add (imItem, boxHandle);
+				GTK.gtk_widget_show (boxHandle);
 			}
 		} else {
-			imItem = OS.gtk_image_menu_item_new_with_label (buffer);
+			imItem = GTK.gtk_image_menu_item_new_with_label (buffer);
 			if (imItem == 0) error (SWT.ERROR_NO_HANDLES);
 		}
-		OS.gtk_widget_show (imItem);
-		OS.gtk_menu_shell_insert (handle, imItem, -1);
+		GTK.gtk_widget_show (imItem);
+		GTK.gtk_menu_shell_insert (handle, imItem, -1);
 	}
-	long /*int*/ imSubmenu = OS.gtk_menu_new ();
-	OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);
-	OS.gtk_menu_item_set_submenu (imItem, imSubmenu);
+	long /*int*/ imSubmenu = GTK.gtk_menu_new ();
+	GTK.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);
+	GTK.gtk_menu_item_set_submenu (imItem, imSubmenu);
 }
 
 @Override
@@ -462,14 +462,14 @@ void fixMenus (Decorations newParent) {
 
 /*public*/ Rectangle getBounds () {
 	checkWidget();
-	if (!OS.gtk_widget_get_mapped (handle)) {
+	if (!GTK.gtk_widget_get_mapped (handle)) {
 		return new Rectangle (0, 0, 0, 0);
 	}
 	long /*int*/ window = gtk_widget_get_window (handle);
 	int [] origin_x = new int [1], origin_y = new int [1];
 	OS.gdk_window_get_origin (window, origin_x, origin_y);
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	int x = origin_x [0] + allocation.x;
 	int y = origin_y [0] + allocation.y;
 	int width = allocation.width;
@@ -511,7 +511,7 @@ public MenuItem getDefaultItem () {
  */
 public boolean getEnabled () {
 	checkWidget();
-	return OS.gtk_widget_get_sensitive (handle);
+	return GTK.gtk_widget_get_sensitive (handle);
 }
 
 /**
@@ -531,7 +531,7 @@ public boolean getEnabled () {
  */
 public MenuItem getItem (int index) {
 	checkWidget();
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
 	int count = OS.g_list_length (list);
 	if (imSeparator != 0) count--;
@@ -555,7 +555,7 @@ public MenuItem getItem (int index) {
  */
 public int getItemCount () {
 	checkWidget();
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) return 0;
 	int count = OS.g_list_length (list);
 	OS.g_list_free (list);
@@ -582,7 +582,7 @@ public int getItemCount () {
  */
 public MenuItem [] getItems () {
 	checkWidget();
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) return new MenuItem [0];
 	long /*int*/ originalList = list;
 	int count = OS.g_list_length (list);
@@ -735,7 +735,7 @@ public boolean getVisible () {
 			}
 		}
 	}
-	return OS.gtk_widget_get_mapped (handle);
+	return GTK.gtk_widget_get_mapped (handle);
 }
 
 @Override
@@ -781,7 +781,7 @@ long /*int*/ gtk_show (long /*int*/ widget) {
 @Override
 long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {
 	if (sendHelpEvent (helpType)) {
-		OS.gtk_menu_shell_deactivate (handle);
+		GTK.gtk_menu_shell_deactivate (handle);
 		return 1;
 	}
 	return 0;
@@ -1015,7 +1015,7 @@ public void setDefaultItem (MenuItem item) {
  */
 public void setEnabled (boolean enabled) {
 	checkWidget();
-	OS.gtk_widget_set_sensitive (handle, enabled);
+	GTK.gtk_widget_set_sensitive (handle, enabled);
 }
 
 /**
@@ -1117,8 +1117,8 @@ void _setOrientation (int orientation) {
 @Override
 void setOrientation (boolean create) {
     if ((style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-    	int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-        if (handle != 0) OS.gtk_widget_set_direction (handle, dir);
+    	int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+        if (handle != 0) GTK.gtk_widget_set_direction (handle, dir);
         MenuItem [] items = getItems ();
         for (int i = 0; i < items.length; i++) {
             items [i].setOrientation (create);
@@ -1150,7 +1150,7 @@ public void setVisible (boolean visible) {
 	 *  requires an event to hook on to. This requires the popup & events related to the menu be handled
 	 *  immediately and not as a post event in display.
 	 */
-	if (OS.GTK_VERSION < OS.VERSION(3, 22, 0)) {
+	if (GTK.GTK_VERSION < OS.VERSION(3, 22, 0)) {
 		if (visible) {
 			display.addPopup (this);
 		} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
index a2d0927c11..55598109b6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
@@ -257,11 +257,11 @@ void createHandle (int index) {
 	int bits = SWT.CHECK | SWT.RADIO | SWT.PUSH | SWT.SEPARATOR | SWT.CASCADE;
 	switch (style & bits) {
 		case SWT.SEPARATOR:
-			handle = OS.gtk_separator_menu_item_new ();
+			handle = GTK.gtk_separator_menu_item_new ();
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			break;
 		case SWT.RADIO:
-			if (OS.GTK_VERSION <= OS.VERSION (3, 10, 8)) {
+			if (GTK.GTK_VERSION <= OS.VERSION (3, 10, 8)) {
 				/*
 				 * Bug in Ubuntu <= 14.04 with UBUNTU_MENUPROXY. GTK crashes when
 				 * label of radio button is empty, see https://bugs.eclipse.org/419729 .
@@ -280,46 +280,46 @@ void createHandle (int index) {
 			* to the same group.  This allows the visible button to be
 			* unselected.
 			*/
-			groupHandle = OS.gtk_radio_menu_item_new (0);
+			groupHandle = GTK.gtk_radio_menu_item_new (0);
 			if (groupHandle == 0) error (SWT.ERROR_NO_HANDLES);
 			OS.g_object_ref (groupHandle);
 			OS.g_object_ref_sink (groupHandle);
-			long /*int*/ group = OS.gtk_radio_menu_item_get_group (groupHandle);
-			if (OS.GTK3) {
-				handle = OS.gtk_radio_menu_item_new (group);
+			long /*int*/ group = GTK.gtk_radio_menu_item_get_group (groupHandle);
+			if (GTK.GTK3) {
+				handle = GTK.gtk_radio_menu_item_new (group);
 				if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 
-				labelHandle = OS.gtk_accel_label_new (buffer);
+				labelHandle = GTK.gtk_accel_label_new (buffer);
 				if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
-				boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 6);
+				boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 6);
 				if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
 				if (OS.SWT_PADDED_MENU_ITEMS) {
-					imageHandle = OS.gtk_image_new ();
+					imageHandle = GTK.gtk_image_new ();
 					if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
 				}
 			} else { // Gtk2
-				handle = OS.gtk_radio_menu_item_new_with_label (group, buffer);
+				handle = GTK.gtk_radio_menu_item_new_with_label (group, buffer);
 			}
 			break;
 		case SWT.CHECK:
-			if (OS.GTK3) {
-				handle = OS.gtk_check_menu_item_new ();
+			if (GTK.GTK3) {
+				handle = GTK.gtk_check_menu_item_new ();
 				if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 
-				labelHandle = OS.gtk_accel_label_new (buffer);
+				labelHandle = GTK.gtk_accel_label_new (buffer);
 				if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
-				boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 6);
+				boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 6);
 				if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
 				if (OS.SWT_PADDED_MENU_ITEMS) {
-					imageHandle = OS.gtk_image_new ();
+					imageHandle = GTK.gtk_image_new ();
 					if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
 				}
 			} else { // Gtk2
-				handle = OS.gtk_check_menu_item_new_with_label (buffer);
+				handle = GTK.gtk_check_menu_item_new_with_label (buffer);
 				if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			}
 			break;
@@ -327,78 +327,78 @@ void createHandle (int index) {
 		// menus are used, the "head" menu item (such as File, Edit, Help, etc.) should
 		// not be padded. We only care about this in Gtk3.
 		case SWT.CASCADE:
-			if (OS.GTK3) {
-				handle = OS.gtk_menu_item_new ();
+			if (GTK.GTK3) {
+				handle = GTK.gtk_menu_item_new ();
 				if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 
-				labelHandle = OS.gtk_accel_label_new (buffer);
+				labelHandle = GTK.gtk_accel_label_new (buffer);
 				if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
-				boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 6);
+				boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 6);
 				if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
 				if ((parent.style & bits) == SWT.BAR) {
 					break;
 				}
 				if (OS.SWT_PADDED_MENU_ITEMS) {
-					imageHandle = OS.gtk_image_new ();
+					imageHandle = GTK.gtk_image_new ();
 					if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
 				}
 				break;
 			}
 		case SWT.PUSH:
 		default:
-			if (OS.GTK3) {
-				handle = OS.gtk_menu_item_new ();
+			if (GTK.GTK3) {
+				handle = GTK.gtk_menu_item_new ();
 				if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 
-				labelHandle = OS.gtk_accel_label_new (buffer);
+				labelHandle = GTK.gtk_accel_label_new (buffer);
 				if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
-				boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 6);
+				boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 6);
 				if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
 				if (OS.SWT_PADDED_MENU_ITEMS) {
-					imageHandle = OS.gtk_image_new ();
+					imageHandle = GTK.gtk_image_new ();
 					if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
 				}
 			} else { // Gtk2
-				handle = OS.gtk_image_menu_item_new_with_label (buffer);
+				handle = GTK.gtk_image_menu_item_new_with_label (buffer);
 			}
 			break;
 	}
 	if (imageHandle != 0) {
 		if (OS.SWT_PADDED_MENU_ITEMS) {
-			OS.gtk_image_set_pixel_size (imageHandle, 16);
+			GTK.gtk_image_set_pixel_size (imageHandle, 16);
 		}
-		OS.gtk_container_add (boxHandle, imageHandle);
-		OS.gtk_widget_show (imageHandle);
+		GTK.gtk_container_add (boxHandle, imageHandle);
+		GTK.gtk_widget_show (imageHandle);
 	}
 	if (labelHandle != 0) {
-		if (OS.GTK_VERSION >= OS.VERSION (3, 16, 0)) {
-			OS.gtk_label_set_xalign (labelHandle, 0);
-			OS.gtk_widget_set_halign (labelHandle, OS.GTK_ALIGN_FILL);
+		if (GTK.GTK_VERSION >= OS.VERSION (3, 16, 0)) {
+			GTK.gtk_label_set_xalign (labelHandle, 0);
+			GTK.gtk_widget_set_halign (labelHandle, GTK.GTK_ALIGN_FILL);
 		} else {
-			OS.gtk_misc_set_alignment(labelHandle, 0, 0);
+			GTK.gtk_misc_set_alignment(labelHandle, 0, 0);
 		}
-		OS.gtk_box_pack_end (boxHandle, labelHandle, true, true, 0);
-		OS.gtk_widget_show (labelHandle);
+		GTK.gtk_box_pack_end (boxHandle, labelHandle, true, true, 0);
+		GTK.gtk_widget_show (labelHandle);
 	}
 	if (boxHandle != 0) {
-		OS.gtk_container_add (handle, boxHandle);
-		OS.gtk_widget_show (boxHandle);
+		GTK.gtk_container_add (handle, boxHandle);
+		GTK.gtk_widget_show (boxHandle);
 	}
 	if ((style & SWT.SEPARATOR) == 0) {
 		if (boxHandle == 0) {
-			labelHandle = OS.gtk_bin_get_child (handle);
+			labelHandle = GTK.gtk_bin_get_child (handle);
 		}
-		OS.gtk_accel_label_set_accel_widget (labelHandle, 0);
+		GTK.gtk_accel_label_set_accel_widget (labelHandle, 0);
 	}
 	long /*int*/ parentHandle = parent.handle;
-	boolean enabled = OS.gtk_widget_get_sensitive (parentHandle);
-	if (!enabled) OS.gtk_widget_set_sensitive (parentHandle, true);
-	OS.gtk_menu_shell_insert (parentHandle, handle, index);
-	if (!enabled) OS.gtk_widget_set_sensitive (parentHandle, false);
-	OS.gtk_widget_show (handle);
+	boolean enabled = GTK.gtk_widget_get_sensitive (parentHandle);
+	if (!enabled) GTK.gtk_widget_set_sensitive (parentHandle, true);
+	GTK.gtk_menu_shell_insert (parentHandle, handle, index);
+	if (!enabled) GTK.gtk_widget_set_sensitive (parentHandle, false);
+	GTK.gtk_widget_show (handle);
 }
 
 void fixMenus (Decorations newParent) {
@@ -438,11 +438,11 @@ long /*int*/ getAccelGroup () {
 
 /*public*/ Rectangle getBounds () {
 	checkWidget();
-	if (!OS.gtk_widget_get_mapped (handle)) {
+	if (!GTK.gtk_widget_get_mapped (handle)) {
 		return new Rectangle (0, 0, 0, 0);
 	}
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	int width = allocation.width;
@@ -467,7 +467,7 @@ long /*int*/ getAccelGroup () {
  */
 public boolean getEnabled () {
 	checkWidget();
-	return OS.gtk_widget_get_sensitive (handle);
+	return GTK.gtk_widget_get_sensitive (handle);
 }
 
 /**
@@ -544,7 +544,7 @@ public Menu getParent () {
 public boolean getSelection () {
 	checkWidget();
 	if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false;
-	return OS.gtk_check_menu_item_get_active(handle);
+	return GTK.gtk_check_menu_item_get_active(handle);
 }
 
 /**
@@ -600,7 +600,7 @@ long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {
 		handled = parent.sendHelpEvent (helpType);
 	}
 	if (handled) {
-		OS.gtk_menu_shell_deactivate (parent.handle);
+		GTK.gtk_menu_shell_deactivate (parent.handle);
 		return 1;
 	}
 	return 0;
@@ -801,10 +801,10 @@ public void setAccelerator (int accelerator) {
  */
 public void setEnabled (boolean enabled) {
 	checkWidget();
-	if (OS.gtk_widget_get_sensitive (handle) == enabled) return;
+	if (GTK.gtk_widget_get_sensitive (handle) == enabled) return;
 	long /*int*/ accelGroup = getAccelGroup ();
 	if (accelGroup != 0) removeAccelerator (accelGroup);
-	OS.gtk_widget_set_sensitive (handle, enabled);
+	GTK.gtk_widget_set_sensitive (handle, enabled);
 	if (accelGroup != 0) addAccelerator (accelGroup);
 }
 
@@ -861,45 +861,45 @@ public void setImage (Image image) {
 			imageList.put (imageIndex, image);
 		}
 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
-		if (OS.GTK3) {
-			if (!OS.GTK_IS_MENU_ITEM (handle)) return;
+		if (GTK.GTK3) {
+			if (!GTK.GTK_IS_MENU_ITEM (handle)) return;
 			if (OS.SWT_PADDED_MENU_ITEMS && imageHandle != 0) {
-				OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+				GTK.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
 			} else {
 				if (imageHandle == 0 && boxHandle != 0) {
-					imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);
-					OS.gtk_container_add (boxHandle, imageHandle);
-					OS.gtk_box_reorder_child (boxHandle, imageHandle, 0);
+					imageHandle = GTK.gtk_image_new_from_pixbuf (pixbuf);
+					GTK.gtk_container_add (boxHandle, imageHandle);
+					GTK.gtk_box_reorder_child (boxHandle, imageHandle, 0);
 				} else {
-					OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+					GTK.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
 				}
 				if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
 			}
 		} else {
-			if (!OS.GTK_IS_IMAGE_MENU_ITEM (handle)) return;
-			imageHandle = OS.gtk_image_new_from_pixbuf (pixbuf);
-			OS.gtk_image_menu_item_set_image (handle, imageHandle);
+			if (!GTK.GTK_IS_IMAGE_MENU_ITEM (handle)) return;
+			imageHandle = GTK.gtk_image_new_from_pixbuf (pixbuf);
+			GTK.gtk_image_menu_item_set_image (handle, imageHandle);
 			}
 		if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_widget_show (imageHandle);
+		GTK.gtk_widget_show (imageHandle);
 	} else {
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			if (imageHandle != 0 && boxHandle != 0) {
 				if (OS.SWT_PADDED_MENU_ITEMS) {
-					OS.gtk_container_remove(boxHandle, imageHandle);
-					imageHandle = OS.gtk_image_new ();
+					GTK.gtk_container_remove(boxHandle, imageHandle);
+					imageHandle = GTK.gtk_image_new ();
 					if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-					OS.gtk_image_set_pixel_size (imageHandle, 16);
-					OS.gtk_container_add (boxHandle, imageHandle);
-					OS.gtk_widget_show (imageHandle);
+					GTK.gtk_image_set_pixel_size (imageHandle, 16);
+					GTK.gtk_container_add (boxHandle, imageHandle);
+					GTK.gtk_widget_show (imageHandle);
 				} else {
-					OS.gtk_container_remove(boxHandle, imageHandle);
+					GTK.gtk_container_remove(boxHandle, imageHandle);
 					imageHandle = 0;
 				}
 			}
 		} else {
-			if (!OS.GTK_IS_IMAGE_MENU_ITEM (handle)) return;
-			OS.gtk_image_menu_item_set_image (handle, 0);
+			if (!GTK.GTK_IS_IMAGE_MENU_ITEM (handle)) return;
+			GTK.gtk_image_menu_item_set_image (handle, 0);
 		}
 	}
 }
@@ -957,11 +957,11 @@ public void setMenu (Menu menu) {
 		* to replace or GTK will destroy it.
 		*/
 		OS.g_object_ref (oldMenu.handle);
-		OS.gtk_menu_item_set_submenu (handle, 0);
+		GTK.gtk_menu_item_set_submenu (handle, 0);
 	}
 	if ((this.menu = menu) != null) {
 		menu.cascade = this;
-		OS.gtk_menu_item_set_submenu (handle, menu.handle);
+		GTK.gtk_menu_item_set_submenu (handle, menu.handle);
 	}
 	if (accelGroup != 0) addAccelerators (accelGroup);
 }
@@ -970,9 +970,9 @@ public void setMenu (Menu menu) {
 void setOrientation (boolean create) {
     super.setOrientation (create);
     if ((parent.style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-    	int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-        OS.gtk_widget_set_direction (handle, dir);
-        OS.gtk_container_forall (handle, display.setDirectionProc, dir);
+    	int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+        GTK.gtk_widget_set_direction (handle, dir);
+        GTK.gtk_container_forall (handle, display.setDirectionProc, dir);
         if (menu != null) menu._setOrientation (parent.style & (SWT.RIGHT_TO_LEFT | SWT.LEFT_TO_RIGHT));
     }
 }
@@ -1003,8 +1003,8 @@ public void setSelection (boolean selected) {
 	checkWidget();
 	if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ACTIVATE);
-	OS.gtk_check_menu_item_set_active (handle, selected);
-	if ((style & SWT.RADIO) != 0) OS.gtk_check_menu_item_set_active (groupHandle, !selected);
+	GTK.gtk_check_menu_item_set_active (handle, selected);
+	if ((style & SWT.RADIO) != 0) GTK.gtk_check_menu_item_set_active (groupHandle, !selected);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, ACTIVATE);
 }
 
@@ -1061,18 +1061,18 @@ public void setText (String string) {
 	}
 	char [] chars = fixMnemonic (string);
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	if (boxHandle == 0 && !OS.GTK3) {
-		labelHandle = OS.gtk_bin_get_child (handle);
+	if (boxHandle == 0 && !GTK.GTK3) {
+		labelHandle = GTK.gtk_bin_get_child (handle);
 	}
-	if (labelHandle != 0 && OS.GTK_IS_LABEL (labelHandle)) {
-		OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
-		if (OS.GTK_IS_ACCEL_LABEL (labelHandle)) {
-			if (OS.GTK3) {
-				if (OS.GTK_VERSION >= OS.VERSION(3, 6, 0)) {
+	if (labelHandle != 0 && GTK.GTK_IS_LABEL (labelHandle)) {
+		GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+		if (GTK.GTK_IS_ACCEL_LABEL (labelHandle)) {
+			if (GTK.GTK3) {
+				if (GTK.GTK_VERSION >= OS.VERSION(3, 6, 0)) {
 					MaskKeysym maskKeysym = getMaskKeysym();
 					if (maskKeysym != null) {
-						OS.gtk_accel_label_set_accel_widget (labelHandle, handle);
-						OS.gtk_accel_label_set_accel (labelHandle,
+						GTK.gtk_accel_label_set_accel_widget (labelHandle, handle);
+						GTK.gtk_accel_label_set_accel (labelHandle,
 								maskKeysym.keysym, maskKeysym.mask);
 					}
 				} else {
@@ -1091,8 +1091,8 @@ private void setAccelLabel(long /*int*/ label, String accelString) {
 	byte[] buffer = Converter.wcsToMbcs (accelString, true);
 	long /*int*/ ptr = OS.g_malloc (buffer.length);
 	C.memmove (ptr, buffer, buffer.length);
-	long /*int*/ oldPtr = OS.GTK_ACCEL_LABEL_GET_ACCEL_STRING (label);
-	OS.GTK_ACCEL_LABEL_SET_ACCEL_STRING (label, ptr);
+	long /*int*/ oldPtr = GTK.GTK_ACCEL_LABEL_GET_ACCEL_STRING (label);
+	GTK.GTK_ACCEL_LABEL_SET_ACCEL_STRING (label, ptr);
 	if (oldPtr != 0) OS.g_free (oldPtr);
 }
 
@@ -1148,9 +1148,9 @@ void updateAccelerator (long /*int*/ accelGroup, boolean add) {
 	/* When accel_key is zero, it causes GTK warnings */
 	if (keysym != 0) {
 		if (add) {
-			OS.gtk_widget_add_accelerator (handle, OS.activate, accelGroup, keysym, mask, OS.GTK_ACCEL_VISIBLE);
+			GTK.gtk_widget_add_accelerator (handle, OS.activate, accelGroup, keysym, mask, GTK.GTK_ACCEL_VISIBLE);
 		} else {
-			OS.gtk_widget_remove_accelerator (handle, accelGroup, keysym, mask);
+			GTK.gtk_widget_remove_accelerator (handle, accelGroup, keysym, mask);
 		}
 	}
 }
@@ -1223,9 +1223,9 @@ boolean updateAcceleratorText (boolean show) {
 	if (maskKeysym.keysym != 0) {
 		long /*int*/ accelGroup = getAccelGroup ();
 		if (show) {
-			OS.gtk_widget_add_accelerator (handle, OS.activate, accelGroup, maskKeysym.keysym, maskKeysym.mask, OS.GTK_ACCEL_VISIBLE);
+			GTK.gtk_widget_add_accelerator (handle, OS.activate, accelGroup, maskKeysym.keysym, maskKeysym.mask, GTK.GTK_ACCEL_VISIBLE);
 		} else {
-			OS.gtk_widget_remove_accelerator (handle, accelGroup, maskKeysym.keysym, maskKeysym.mask);
+			GTK.gtk_widget_remove_accelerator (handle, accelGroup, maskKeysym.keysym, maskKeysym.mask);
 		}
 	}
 	return maskKeysym.keysym != 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
index 4af6ae4a8c..55f462e479 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MessageBox.java
@@ -141,30 +141,30 @@ public void setMessage (String string) {
  */
 public int open () {
 	long /*int*/ parentHandle = (parent != null) ? parent.topHandle() : 0;
-	int dialogFlags = OS.GTK_DIALOG_DESTROY_WITH_PARENT;
+	int dialogFlags = GTK.GTK_DIALOG_DESTROY_WITH_PARENT;
 	if ((style & (SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) {
-		dialogFlags |= OS.GTK_DIALOG_MODAL;
+		dialogFlags |= GTK.GTK_DIALOG_MODAL;
 	}
-	int messageType = OS.GTK_MESSAGE_INFO;
-	if ((style & (SWT.ICON_WARNING)) != 0)  messageType = OS.GTK_MESSAGE_WARNING;
-	if ((style & (SWT.ICON_QUESTION)) != 0) messageType = OS.GTK_MESSAGE_QUESTION;
-	if ((style & (SWT.ICON_ERROR)) != 0)    messageType = OS.GTK_MESSAGE_ERROR;
+	int messageType = GTK.GTK_MESSAGE_INFO;
+	if ((style & (SWT.ICON_WARNING)) != 0)  messageType = GTK.GTK_MESSAGE_WARNING;
+	if ((style & (SWT.ICON_QUESTION)) != 0) messageType = GTK.GTK_MESSAGE_QUESTION;
+	if ((style & (SWT.ICON_ERROR)) != 0)    messageType = GTK.GTK_MESSAGE_ERROR;
 
 	byte [] format = Converter.wcsToMbcs ("%s", true);
 	byte [] buffer = Converter.wcsToMbcs (message, true);
-	handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, format, buffer);
+	handle = GTK.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, format, buffer);
 	if (handle == 0) error(SWT.ERROR_NO_HANDLES);
 	if (parentHandle != 0) {
-		long /*int*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle);
+		long /*int*/ pixbufs = GTK.gtk_window_get_icon_list (parentHandle);
 		if (pixbufs != 0) {
-			OS.gtk_window_set_icon_list (handle, pixbufs);
+			GTK.gtk_window_set_icon_list (handle, pixbufs);
 			OS.g_list_free (pixbufs);
 		}
 	}
 	Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
 	createButtons (display.getDismissalAlignment ());
 	buffer = Converter.wcsToMbcs(title, true);
-	OS.gtk_window_set_title(handle,buffer);
+	GTK.gtk_window_set_title(handle,buffer);
 	display.addIdleProc ();
 	Dialog oldModal = null;
 	/*
@@ -172,21 +172,21 @@ public int open () {
 	* parent shells, it is required to assign the
 	* dialog to the same window group as of the shells.
 	*/
-	long /*int*/ group = OS.gtk_window_get_group(0);
-	OS.gtk_window_group_add_window (group, handle);
+	long /*int*/ group = GTK.gtk_window_get_group(0);
+	GTK.gtk_window_group_add_window (group, handle);
 
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		oldModal = display.getModalDialog ();
 		display.setModalDialog (this);
 	}
 	int signalId = 0;
 	long /*int*/ hookId = 0;
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
-		signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
+		signalId = OS.g_signal_lookup (OS.map, GTK.GTK_TYPE_WIDGET());
 		hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
 	}
 	display.sendPreExternalEventDispatchEvent ();
-	int response = OS.gtk_dialog_run (handle);
+	int response = GTK.gtk_dialog_run (handle);
 	/*
 	* This call to gdk_threads_leave() is a temporary work around
 	* to avoid deadlocks when gdk_threads_init() is called by native
@@ -198,31 +198,31 @@ public int open () {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
 		OS.g_signal_remove_emission_hook (signalId, hookId);
 	}
-	if (OS.gtk_window_get_modal (handle)) {
+	if (GTK.gtk_window_get_modal (handle)) {
 		display.setModalDialog (oldModal);
 	}
 	display.removeIdleProc ();
-	OS.gtk_widget_destroy (handle);
+	GTK.gtk_widget_destroy (handle);
 	return response;
 }
 
 private void createButtons (int alignment) {
 	if (alignment == SWT.LEFT) {
-		if ((style & SWT.OK) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-ok", true), SWT.OK);
-		if ((style & SWT.ABORT) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
-		if ((style & SWT.RETRY) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
-		if ((style & SWT.YES) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-yes", true), SWT.YES);
-		if ((style & SWT.NO) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-no", true), SWT.NO);
-		if ((style & SWT.IGNORE) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
-		if ((style & SWT.CANCEL) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-cancel", true), SWT.CANCEL);
+		if ((style & SWT.OK) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-ok", true), SWT.OK);
+		if ((style & SWT.ABORT) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
+		if ((style & SWT.RETRY) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
+		if ((style & SWT.YES) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-yes", true), SWT.YES);
+		if ((style & SWT.NO) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-no", true), SWT.NO);
+		if ((style & SWT.IGNORE) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
+		if ((style & SWT.CANCEL) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-cancel", true), SWT.CANCEL);
 	} else {
-		if ((style & SWT.CANCEL) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-cancel", true), SWT.CANCEL);
-		if ((style & SWT.OK) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-ok", true), SWT.OK);
-		if ((style & SWT.NO) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-no", true), SWT.NO);
-		if ((style & SWT.YES) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-yes", true), SWT.YES);
-		if ((style & SWT.IGNORE) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
-		if ((style & SWT.RETRY) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
-		if ((style & SWT.ABORT) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
+		if ((style & SWT.CANCEL) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-cancel", true), SWT.CANCEL);
+		if ((style & SWT.OK) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-ok", true), SWT.OK);
+		if ((style & SWT.NO) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-no", true), SWT.NO);
+		if ((style & SWT.YES) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs ("gtk-yes", true), SWT.YES);
+		if ((style & SWT.IGNORE) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
+		if ((style & SWT.RETRY) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
+		if ((style & SWT.ABORT) != 0) GTK.gtk_dialog_add_button(handle, Converter.wcsToMbcs (SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
 	}
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
index e8fdbfd4a5..2a01856d1e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
@@ -85,11 +85,11 @@ void createHandle (int index) {
 	state |= HANDLE;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	handle = OS.gtk_progress_bar_new ();
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	handle = GTK.gtk_progress_bar_new ();
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (fixedHandle, handle);
-	int orientation = (style & SWT.VERTICAL) != 0 ? OS.GTK_PROGRESS_BOTTOM_TO_TOP : OS.GTK_PROGRESS_LEFT_TO_RIGHT;
+	GTK.gtk_container_add (fixedHandle, handle);
+	int orientation = (style & SWT.VERTICAL) != 0 ? GTK.GTK_PROGRESS_BOTTOM_TO_TOP : GTK.GTK_PROGRESS_LEFT_TO_RIGHT;
 	gtk_orientable_set_orientation (handle, orientation);
 	if ((style & SWT.INDETERMINATE) != 0) {
 		timerId = OS.g_timeout_add (DELAY, display.windowTimerProc, handle);
@@ -98,7 +98,7 @@ void createHandle (int index) {
 
 @Override
 long /*int*/ eventHandle () {
-	return OS.GTK3 ? fixedHandle : super.eventHandle ();
+	return GTK.GTK3 ? fixedHandle : super.eventHandle ();
 }
 
 /**
@@ -297,7 +297,7 @@ public void setState (int state) {
 
 @Override
 long /*int*/ timerProc (long /*int*/ widget) {
-	if (isVisible ()) OS.gtk_progress_bar_pulse (handle);
+	if (isVisible ()) GTK.gtk_progress_bar_pulse (handle);
 	return 1;
 }
 
@@ -308,11 +308,11 @@ void updateBar (int selection, int minimum, int maximum) {
 	* fix is to update the progress bar state only when realized and restore
 	* the state when the progress bar becomes realized.
 	*/
-	if (!OS.gtk_widget_get_realized (handle)) return;
+	if (!GTK.gtk_widget_get_realized (handle)) return;
 
 	double fraction = minimum == maximum ? 1 : (double)(selection - minimum) / (maximum - minimum);
-	OS.gtk_progress_bar_set_fraction (handle, fraction);
-	if (!OS.GTK3) {
+	GTK.gtk_progress_bar_set_fraction (handle, fraction);
+	if (!GTK.GTK3) {
 		/*
 		* Feature in GTK.  The progress bar does
 		* not redraw right away when a value is
@@ -327,19 +327,19 @@ void updateBar (int selection, int minimum, int maximum) {
 }
 
 void gtk_orientable_set_orientation (long /*int*/ pbar, int orientation) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		switch (orientation) {
-			case OS.GTK_PROGRESS_BOTTOM_TO_TOP:
-				OS.gtk_orientable_set_orientation(pbar, OS.GTK_ORIENTATION_VERTICAL);
-				OS.gtk_progress_bar_set_inverted(pbar, true);
+			case GTK.GTK_PROGRESS_BOTTOM_TO_TOP:
+				GTK.gtk_orientable_set_orientation(pbar, GTK.GTK_ORIENTATION_VERTICAL);
+				GTK.gtk_progress_bar_set_inverted(pbar, true);
 				break;
-			case OS.GTK_PROGRESS_LEFT_TO_RIGHT:
-				OS.gtk_orientable_set_orientation(pbar, OS.GTK_ORIENTATION_HORIZONTAL);
-				OS.gtk_progress_bar_set_inverted(pbar, false);
+			case GTK.GTK_PROGRESS_LEFT_TO_RIGHT:
+				GTK.gtk_orientable_set_orientation(pbar, GTK.GTK_ORIENTATION_HORIZONTAL);
+				GTK.gtk_progress_bar_set_inverted(pbar, false);
 				break;
 		}
 	} else {
-		OS.gtk_progress_bar_set_orientation(pbar, orientation);
+		GTK.gtk_progress_bar_set_orientation(pbar, orientation);
 	}
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
index 7f1d1ce844..54abcb70ff 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
@@ -140,8 +140,8 @@ void createHandle (int index) {
 	state |= HANDLE | THEME_BACKGROUND;
 	handle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (handle, true);
-	OS.gtk_widget_set_can_focus (handle, true);
+	GTK.gtk_widget_set_has_window (handle, true);
+	GTK.gtk_widget_set_can_focus (handle, true);
 	int type = (style & SWT.VERTICAL) != 0 ? OS.GDK_SB_H_DOUBLE_ARROW : OS.GDK_SB_V_DOUBLE_ARROW;
 	defaultCursor = OS.gdk_cursor_new_for_display (OS.gdk_display_get_default(), type);
 }
@@ -182,7 +182,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr)
 	startX = (int) (gdkEvent.x_root - origin_x [0]);
 	startY = (int) (gdkEvent.y_root - origin_y [0]);
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation(handle, allocation);
+	GTK.gtk_widget_get_allocation(handle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	int width = allocation.width;
@@ -226,7 +226,7 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ eventPt
 	if (!dragging) return 0;
 	dragging = false;
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	int width = allocation.width;
 	int height = allocation.height;
 	Event event = new Event ();
@@ -249,15 +249,15 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ eventPt
 
 @Override
 long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
-		long /*int*/ context = OS.gtk_widget_get_style_context(widget);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		long /*int*/ context = GTK.gtk_widget_get_style_context(widget);
 		GtkAllocation allocation = new GtkAllocation();
-		OS.gtk_widget_get_allocation (widget, allocation);
+		GTK.gtk_widget_get_allocation (widget, allocation);
 		int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
 		int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height;
 		// We specify a 0 value for x & y as we want the whole widget to be
 		// colored, not some portion of it.
-		OS.gtk_render_background(context, cairo, 0, 0, width, height);
+		GTK.gtk_render_background(context, cairo, 0, 0, width, height);
 	}
 	return super.gtk_draw(widget, cairo);
 }
@@ -269,7 +269,7 @@ long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
 	// widget could be disposed at this point
 	if (handle != 0) {
 		GtkAllocation allocation = new GtkAllocation ();
-		OS.gtk_widget_get_allocation (handle, allocation);
+		GTK.gtk_widget_get_allocation (handle, allocation);
 		lastX = allocation.x;
 		lastY = allocation.y;
 	}
@@ -300,10 +300,10 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
 			}
 			int parentBorder = 0;
 			GtkAllocation allocation = new GtkAllocation ();
-			OS.gtk_widget_get_allocation (handle, allocation);
+			GTK.gtk_widget_get_allocation (handle, allocation);
 			int width = allocation.width;
 			int height = allocation.height;
-			OS.gtk_widget_get_allocation (parent.handle, allocation);
+			GTK.gtk_widget_get_allocation (parent.handle, allocation);
 			int parentWidth = allocation.width;
 			int parentHeight = allocation.height;
 			int newX = lastX, newY = lastY;
@@ -376,13 +376,13 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr
 	}
 	if ((eventState & OS.GDK_BUTTON1_MASK) == 0) return 0;
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	int width = allocation.width;
 	int height = allocation.height;
 	int parentBorder = 0;
-	OS.gtk_widget_get_allocation (parent.handle, allocation);
+	GTK.gtk_widget_get_allocation (parent.handle, allocation);
 	int parentWidth = allocation.width;
 	int parentHeight = allocation.height;
 	int newX = lastX, newY = lastY;
@@ -428,7 +428,7 @@ long /*int*/ gtk_realize (long /*int*/ widget) {
 @Override
 void hookEvents () {
 	super.hookEvents ();
-	OS.gtk_widget_add_events (handle, OS.GDK_POINTER_MOTION_HINT_MASK);
+	GTK.gtk_widget_add_events (handle, OS.GDK_POINTER_MOTION_HINT_MASK);
 }
 
 @Override
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
index d1d7b88b05..edacb4f8bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
@@ -127,18 +127,18 @@ void createHandle (int index) {
 	state |= HANDLE | THEME_BACKGROUND;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	long /*int*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	long /*int*/ hAdjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
 	if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
 	if ((style & SWT.HORIZONTAL) != 0) {
-		handle = gtk_scale_new (OS.GTK_ORIENTATION_HORIZONTAL, hAdjustment);
+		handle = gtk_scale_new (GTK.GTK_ORIENTATION_HORIZONTAL, hAdjustment);
 	} else {
-		handle = gtk_scale_new (OS.GTK_ORIENTATION_VERTICAL, hAdjustment);
+		handle = gtk_scale_new (GTK.GTK_ORIENTATION_VERTICAL, hAdjustment);
 	}
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (fixedHandle, handle);
-	OS.gtk_scale_set_digits (handle, 0);
-	OS.gtk_scale_set_draw_value (handle, false);
+	GTK.gtk_container_add (fixedHandle, handle);
+	GTK.gtk_scale_set_digits (handle, 0);
+	GTK.gtk_scale_set_draw_value (handle, false);
 }
 
 @Override
@@ -161,8 +161,8 @@ void hookEvents () {
  */
 public int getIncrement () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_step_increment (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_step_increment (hAdjustment);
 }
 
 /**
@@ -177,8 +177,8 @@ public int getIncrement () {
  */
 public int getMaximum () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_upper (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_upper (hAdjustment);
 }
 
 /**
@@ -193,8 +193,8 @@ public int getMaximum () {
  */
 public int getMinimum () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_lower (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_lower (hAdjustment);
 }
 
 /**
@@ -211,8 +211,8 @@ public int getMinimum () {
  */
 public int getPageIncrement () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_page_increment (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_page_increment (hAdjustment);
 }
 
 /**
@@ -227,8 +227,8 @@ public int getPageIncrement () {
  */
 public int getSelection () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_value (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_value (hAdjustment);
 }
 
 @Override
@@ -279,7 +279,7 @@ public void setIncrement (int increment) {
 	checkWidget ();
 	if (increment < 1) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_range_set_increments (handle, increment, getPageIncrement ());
+	GTK.gtk_range_set_increments (handle, increment, getPageIncrement ());
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -301,7 +301,7 @@ public void setMaximum (int value) {
 	int minimum = getMinimum();
 	if (value <= minimum) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_range_set_range (handle, minimum, value);
+	GTK.gtk_range_set_range (handle, minimum, value);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -324,7 +324,7 @@ public void setMinimum (int value) {
 	int maximum = getMaximum ();
 	if (value >= maximum) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_range_set_range (handle, value, maximum);
+	GTK.gtk_range_set_range (handle, value, maximum);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -345,7 +345,7 @@ public void setPageIncrement (int pageIncrement) {
 	checkWidget ();
 	if (pageIncrement < 1) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_range_set_increments (handle, getIncrement (), pageIncrement);
+	GTK.gtk_range_set_increments (handle, getIncrement (), pageIncrement);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -363,19 +363,19 @@ public void setPageIncrement (int pageIncrement) {
 public void setSelection (int value) {
 	checkWidget ();
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_range_set_value (handle, value);
+	GTK.gtk_range_set_value (handle, value);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
 long /*int*/ gtk_scale_new (int orientation, long /*int*/ adjustment) {
 	long /*int*/ scale = 0;
-	if (OS.GTK3)	{
-		scale = OS.gtk_scale_new (orientation, adjustment);
+	if (GTK.GTK3)	{
+		scale = GTK.gtk_scale_new (orientation, adjustment);
 	} else {
-		if (orientation == OS.GTK_ORIENTATION_HORIZONTAL) {
-			scale = OS.gtk_hscale_new (adjustment);
+		if (orientation == GTK.GTK_ORIENTATION_HORIZONTAL) {
+			scale = GTK.gtk_hscale_new (adjustment);
 		} else {
-			scale = OS.gtk_vscale_new (adjustment);
+			scale = GTK.gtk_vscale_new (adjustment);
 		}
 	}
 	return scale;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
index 0bdad536d7..b7c1ad9718 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
@@ -179,7 +179,7 @@ void destroyWidget () {
  */
 public boolean getEnabled () {
 	checkWidget ();
-	if (handle != 0) return OS.gtk_widget_get_sensitive (handle);
+	if (handle != 0) return GTK.gtk_widget_get_sensitive (handle);
 	return true;
 }
 
@@ -197,7 +197,7 @@ public boolean getEnabled () {
  */
 public int getIncrement () {
 	checkWidget ();
-	return (int) OS.gtk_adjustment_get_step_increment (adjustmentHandle);
+	return (int) GTK.gtk_adjustment_get_step_increment (adjustmentHandle);
 }
 
 /**
@@ -212,7 +212,7 @@ public int getIncrement () {
  */
 public int getMaximum () {
 	checkWidget ();
-	return (int) OS.gtk_adjustment_get_upper (adjustmentHandle);
+	return (int) GTK.gtk_adjustment_get_upper (adjustmentHandle);
 }
 
 /**
@@ -227,7 +227,7 @@ public int getMaximum () {
  */
 public int getMinimum () {
 	checkWidget ();
-	return (int) OS.gtk_adjustment_get_lower (adjustmentHandle);
+	return (int) GTK.gtk_adjustment_get_lower (adjustmentHandle);
 }
 
 /**
@@ -244,7 +244,7 @@ public int getMinimum () {
  */
 public int getPageIncrement () {
 	checkWidget ();
-	return (int) OS.gtk_adjustment_get_page_increment (adjustmentHandle);
+	return (int) GTK.gtk_adjustment_get_page_increment (adjustmentHandle);
 }
 
 /**
@@ -274,7 +274,7 @@ public Scrollable getParent () {
  */
 public int getSelection () {
 	checkWidget ();
-	return (int) OS.gtk_adjustment_get_value (adjustmentHandle);
+	return (int) GTK.gtk_adjustment_get_value (adjustmentHandle);
 }
 
 
@@ -318,7 +318,7 @@ Point getSizeInPixels () {
  */
 public int getThumb () {
 	checkWidget ();
-	return (int) OS.gtk_adjustment_get_page_size (adjustmentHandle);
+	return (int) GTK.gtk_adjustment_get_page_size (adjustmentHandle);
 }
 
 /**
@@ -345,7 +345,7 @@ Rectangle getThumbBoundsInPixels () {
 	gtk_range_get_slider_range (handle, slider_start, slider_end);
 	int x, y, width, height;
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	if ((style & SWT.VERTICAL) != 0) {
 		x = allocation.x;
 		y = slider_start [0];
@@ -393,16 +393,16 @@ Rectangle getThumbTrackBoundsInPixels () {
 	checkWidget();
 	int x = 0, y = 0, width, height;
 	int[] has_stepper = new int[1];
-	OS.gtk_widget_style_get (handle, OS.has_backward_stepper, has_stepper, 0);
+	GTK.gtk_widget_style_get (handle, OS.has_backward_stepper, has_stepper, 0);
 	boolean hasB = has_stepper[0] != 0;
-	OS.gtk_widget_style_get (handle, OS.has_secondary_backward_stepper, has_stepper, 0);
+	GTK.gtk_widget_style_get (handle, OS.has_secondary_backward_stepper, has_stepper, 0);
 	boolean hasB2 = has_stepper[0] != 0;
-	OS.gtk_widget_style_get (handle, OS.has_forward_stepper, has_stepper, 0);
+	GTK.gtk_widget_style_get (handle, OS.has_forward_stepper, has_stepper, 0);
 	boolean hasF = has_stepper[0] != 0;
-	OS.gtk_widget_style_get (handle, OS.has_secondary_forward_stepper, has_stepper, 0);
+	GTK.gtk_widget_style_get (handle, OS.has_secondary_forward_stepper, has_stepper, 0);
 	boolean hasF2 = has_stepper[0] != 0;
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	if ((style & SWT.VERTICAL) != 0) {
 		int stepperSize = allocation.width;
 		x = allocation.x;
@@ -468,11 +468,11 @@ public boolean getVisible () {
 	checkWidget ();
 	long /*int*/ scrolledHandle = parent.scrolledHandle;
 	int [] hsp = new int [1], vsp = new int [1];
-	OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
+	GTK.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
 	if ((style & SWT.HORIZONTAL) != 0) {
-		return hsp [0] != OS.GTK_POLICY_NEVER && hsp[0] != OS.GTK_POLICY_EXTERNAL && OS.gtk_widget_get_visible (handle);
+		return hsp [0] != GTK.GTK_POLICY_NEVER && hsp[0] != GTK.GTK_POLICY_EXTERNAL && GTK.gtk_widget_get_visible (handle);
 	} else {
-		return vsp [0] != OS.GTK_POLICY_NEVER && vsp[0] != OS.GTK_POLICY_EXTERNAL && OS.gtk_widget_get_visible (handle);
+		return vsp [0] != GTK.GTK_POLICY_NEVER && vsp[0] != GTK.GTK_POLICY_EXTERNAL && GTK.gtk_widget_get_visible (handle);
 	}
 }
 
@@ -480,7 +480,7 @@ public boolean getVisible () {
 long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
 	long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);
 	if (result != 0) return result;
-	detail = OS.GTK_SCROLL_NONE;
+	detail = GTK.GTK_SCROLL_NONE;
 	dragSent = false;
 	return result;
 }
@@ -492,36 +492,36 @@ long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*
 }
 
 void gtk_range_get_slider_range (long /*int*/ widget, int [] slider_start, int [] slider_end) {
-	OS.gtk_range_get_slider_range (widget, slider_start, slider_end);
+	GTK.gtk_range_get_slider_range (widget, slider_start, slider_end);
 }
 
 @Override
 long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
 	Event event = new Event ();
-	dragSent = detail == OS.GTK_SCROLL_JUMP;
+	dragSent = detail == GTK.GTK_SCROLL_JUMP;
 	switch (detail) {
-		case OS.GTK_SCROLL_NONE:			event.detail = SWT.NONE; break;
-		case OS.GTK_SCROLL_JUMP:			event.detail = SWT.DRAG; break;
-		case OS.GTK_SCROLL_START:			event.detail = SWT.HOME; break;
-		case OS.GTK_SCROLL_END:				event.detail = SWT.END; break;
-		case OS.GTK_SCROLL_PAGE_DOWN:
-		case OS.GTK_SCROLL_PAGE_RIGHT:
-		case OS.GTK_SCROLL_PAGE_FORWARD:	event.detail = SWT.PAGE_DOWN; break;
-		case OS.GTK_SCROLL_PAGE_UP:
-		case OS.GTK_SCROLL_PAGE_LEFT:
-		case OS.GTK_SCROLL_PAGE_BACKWARD:	event.detail = SWT.PAGE_UP; break;
-		case OS.GTK_SCROLL_STEP_DOWN:
-		case OS.GTK_SCROLL_STEP_RIGHT:
-		case OS.GTK_SCROLL_STEP_FORWARD:	event.detail = SWT.ARROW_DOWN; break;
-		case OS.GTK_SCROLL_STEP_UP:
-		case OS.GTK_SCROLL_STEP_LEFT:
-		case OS.GTK_SCROLL_STEP_BACKWARD:	event.detail = SWT.ARROW_UP; break;
+		case GTK.GTK_SCROLL_NONE:			event.detail = SWT.NONE; break;
+		case GTK.GTK_SCROLL_JUMP:			event.detail = SWT.DRAG; break;
+		case GTK.GTK_SCROLL_START:			event.detail = SWT.HOME; break;
+		case GTK.GTK_SCROLL_END:				event.detail = SWT.END; break;
+		case GTK.GTK_SCROLL_PAGE_DOWN:
+		case GTK.GTK_SCROLL_PAGE_RIGHT:
+		case GTK.GTK_SCROLL_PAGE_FORWARD:	event.detail = SWT.PAGE_DOWN; break;
+		case GTK.GTK_SCROLL_PAGE_UP:
+		case GTK.GTK_SCROLL_PAGE_LEFT:
+		case GTK.GTK_SCROLL_PAGE_BACKWARD:	event.detail = SWT.PAGE_UP; break;
+		case GTK.GTK_SCROLL_STEP_DOWN:
+		case GTK.GTK_SCROLL_STEP_RIGHT:
+		case GTK.GTK_SCROLL_STEP_FORWARD:	event.detail = SWT.ARROW_DOWN; break;
+		case GTK.GTK_SCROLL_STEP_UP:
+		case GTK.GTK_SCROLL_STEP_LEFT:
+		case GTK.GTK_SCROLL_STEP_BACKWARD:	event.detail = SWT.ARROW_UP; break;
 	}
-	if (!dragSent) detail = OS.GTK_SCROLL_NONE;
+	if (!dragSent) detail = GTK.GTK_SCROLL_NONE;
 	sendSelectionEvent (SWT.Selection, event, false);
 	parent.updateScrollBarValue (this);
-	if (OS.GTK3) {
-		OS.gtk_widget_queue_draw(parent.handle);
+	if (GTK.GTK3) {
+		GTK.gtk_widget_queue_draw(parent.handle);
 	}
 	return 0;
 }
@@ -534,7 +534,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 		case OS.GDK_BUTTON_RELEASE: {
 			GdkEventButton gdkEventButton = new GdkEventButton ();
 			OS.memmove (gdkEventButton, gdkEvent, GdkEventButton.sizeof);
-			if (gdkEventButton.button == 1 && detail == OS.GTK_SCROLL_JUMP) {
+			if (gdkEventButton.button == 1 && detail == GTK.GTK_SCROLL_JUMP) {
 				if (!dragSent) {
 					Event event = new Event ();
 					event.detail = SWT.DRAG;
@@ -542,7 +542,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 				}
 				sendSelectionEvent (SWT.Selection);
 			}
-			detail = OS.GTK_SCROLL_NONE;
+			detail = GTK.GTK_SCROLL_NONE;
 			dragSent = false;
 			break;
 		}
@@ -657,7 +657,7 @@ public void removeSelectionListener (SelectionListener listener) {
  */
 public void setEnabled (boolean enabled) {
 	checkWidget ();
-	if (handle != 0) OS.gtk_widget_set_sensitive (handle, enabled);
+	if (handle != 0) GTK.gtk_widget_set_sensitive (handle, enabled);
 }
 
 /**
@@ -677,7 +677,7 @@ public void setIncrement (int value) {
 	checkWidget ();
 	if (value < 1) return;
 	OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_set_step_increment (adjustmentHandle, value);
+	GTK.gtk_adjustment_set_step_increment (adjustmentHandle, value);
 	OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -704,7 +704,7 @@ public void setMaximum (int value) {
 	adjustment.page_size = Math.min ((int)adjustment.page_size, value - minimum);
 	adjustment.value = Math.min ((int)adjustment.value, (int)(value - adjustment.page_size));
 	OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
@@ -733,7 +733,7 @@ public void setMinimum (int value) {
 	adjustment.page_size = Math.min ((int)adjustment.page_size, maximum - value);
 	adjustment.value = Math.max ((int)adjustment.value, value);
 	OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
@@ -744,7 +744,7 @@ void setOrientation (boolean create) {
 	if ((parent.style & SWT.MIRRORED) != 0 || !create) {
 		if ((parent.state & CANVAS) != 0) {
 			if ((style & SWT.HORIZONTAL) != 0) {
-				OS.gtk_range_set_inverted (handle, (parent.style & SWT.RIGHT_TO_LEFT) != 0);
+				GTK.gtk_range_set_inverted (handle, (parent.style & SWT.RIGHT_TO_LEFT) != 0);
 			}
 		}
 	}
@@ -767,7 +767,7 @@ public void setPageIncrement (int value) {
 	checkWidget ();
 	if (value < 1) return;
 	OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_set_page_increment (adjustmentHandle, value);
+	GTK.gtk_adjustment_set_page_increment (adjustmentHandle, value);
 	OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -787,7 +787,7 @@ public void setSelection (int selection) {
 	checkWidget ();
 	selection = Math.min (selection, getMaximum() - getThumb());
 	OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_set_value (adjustmentHandle, selection);
+	GTK.gtk_adjustment_set_value (adjustmentHandle, selection);
 	OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -817,7 +817,7 @@ public void setThumb (int value) {
 	adjustment.page_size = (double) value;
 	adjustment.value = Math.min ((int)adjustment.value, (int)(adjustment.upper - value));
 	OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
@@ -859,15 +859,15 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
 	adjustment.page_size = thumb;
 	adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);
 	OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(adjustmentHandle, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	/*
 	 * gtk_adujustment_value_changed is deprecated on GTK3.18+.
 	 * GTK+ will emit "value-changed" itself whenever the value changes.
 	 * See bug 495413.
 	 */
-	if (OS.GTK_VERSION < OS.VERSION(3, 18, 0))
-		OS.gtk_adjustment_value_changed (adjustmentHandle);
+	if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0))
+		GTK.gtk_adjustment_value_changed (adjustmentHandle);
 	OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
index b65ea083da..bbb9d3e17e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
@@ -115,14 +115,14 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
 Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	checkWidget();
 	int border = 0;
-	if (fixedHandle != 0) border += OS.gtk_container_get_border_width (fixedHandle);
-	if (scrolledHandle != 0) border += OS.gtk_container_get_border_width (scrolledHandle);
+	if (fixedHandle != 0) border += GTK.gtk_container_get_border_width (fixedHandle);
+	if (scrolledHandle != 0) border += GTK.gtk_container_get_border_width (scrolledHandle);
 	int trimX = x - border, trimY = y - border;
 	int trimWidth = width + (border * 2), trimHeight = height + (border * 2);
 	trimHeight += hScrollBarWidth ();
 	trimWidth  += vScrollBarWidth ();
 	if (scrolledHandle != 0) {
-		if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {
+		if (GTK.gtk_scrolled_window_get_shadow_type (scrolledHandle) != GTK.GTK_SHADOW_NONE) {
 			Point thickness = getThickness (scrolledHandle);
 			int xthickness = thickness.x;
 			int ythickness = thickness.y;
@@ -143,11 +143,11 @@ ScrollBar createScrollBar (int style) {
 	bar.display = display;
 	bar.state |= HANDLE;
 	if ((style & SWT.H_SCROLL) != 0) {
-		bar.handle = OS.gtk_scrolled_window_get_hscrollbar (scrolledHandle);
-		bar.adjustmentHandle = OS.gtk_scrolled_window_get_hadjustment (scrolledHandle);
+		bar.handle = GTK.gtk_scrolled_window_get_hscrollbar (scrolledHandle);
+		bar.adjustmentHandle = GTK.gtk_scrolled_window_get_hadjustment (scrolledHandle);
 	} else {
-		bar.handle = OS.gtk_scrolled_window_get_vscrollbar (scrolledHandle);
-		bar.adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (scrolledHandle);
+		bar.handle = GTK.gtk_scrolled_window_get_vscrollbar (scrolledHandle);
+		bar.adjustmentHandle = GTK.gtk_scrolled_window_get_vadjustment (scrolledHandle);
 	}
 	bar.setOrientation (true);
 	bar.hookEvents ();
@@ -199,10 +199,10 @@ void destroyScrollBar (ScrollBar bar) {
 int getBorderWidthInPixels () {
 	checkWidget();
 	int border = 0;
-	if (fixedHandle != 0) border += OS.gtk_container_get_border_width (fixedHandle);
+	if (fixedHandle != 0) border += GTK.gtk_container_get_border_width (fixedHandle);
 	if (scrolledHandle != 0) {
-		border += OS.gtk_container_get_border_width (scrolledHandle);
-		if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {
+		border += GTK.gtk_container_get_border_width (scrolledHandle);
+		if (GTK.gtk_scrolled_window_get_shadow_type (scrolledHandle) != GTK.GTK_SHADOW_NONE) {
 			border += getThickness (scrolledHandle).x;
 		}
 	}
@@ -232,7 +232,7 @@ Rectangle getClientAreaInPixels () {
 	forceResize ();
 	long /*int*/ clientHandle = clientHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (clientHandle, allocation);
+	GTK.gtk_widget_get_allocation (clientHandle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -277,7 +277,7 @@ public ScrollBar getHorizontalBar () {
  */
 public int getScrollbarsMode () {
 	checkWidget();
-	if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0) && OS.gtk_scrolled_window_get_overlay_scrolling(scrolledHandle)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0) && GTK.gtk_scrolled_window_get_overlay_scrolling(scrolledHandle)) {
 		return SWT.SCROLLBAR_OVERLAY;
 	}
 	return SWT.NONE;
@@ -316,25 +316,25 @@ long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) {
 			if (OS.gdk_event_get_scroll_deltas (eventPtr, delta_x, delta_y)) {
 				if (delta_x [0] != 0) {
 					scrollBar = horizontalBar;
-					if (scrollBar != null && !OS.gtk_widget_get_visible (scrollBar.handle) && scrollBar.getEnabled()) {
+					if (scrollBar != null && !GTK.gtk_widget_get_visible (scrollBar.handle) && scrollBar.getEnabled()) {
 						GtkAdjustment adjustment = new GtkAdjustment ();
 						gtk_adjustment_get (scrollBar.adjustmentHandle, adjustment);
 						double delta = Math.pow(adjustment.page_size, 2.0 / 3.0) * delta_x [0];
 						int value = (int) Math.max(adjustment.lower,
 								Math.min(adjustment.upper - adjustment.page_size, adjustment.value + delta));
-						OS.gtk_adjustment_set_value (scrollBar.adjustmentHandle, value);
+						GTK.gtk_adjustment_set_value (scrollBar.adjustmentHandle, value);
 						result = 1;
 					}
 				}
 				if (delta_y [0] != 0) {
 					scrollBar = verticalBar;
-					if (scrollBar != null && !OS.gtk_widget_get_visible (scrollBar.handle) && scrollBar.getEnabled()) {
+					if (scrollBar != null && !GTK.gtk_widget_get_visible (scrollBar.handle) && scrollBar.getEnabled()) {
 						GtkAdjustment adjustment = new GtkAdjustment ();
 						gtk_adjustment_get (scrollBar.adjustmentHandle, adjustment);
 						double delta = Math.pow(adjustment.page_size, 2.0 / 3.0) * delta_y [0];
 						int value = (int) Math.max(adjustment.lower,
 								Math.min(adjustment.upper - adjustment.page_size, adjustment.value + delta));
-						OS.gtk_adjustment_set_value (scrollBar.adjustmentHandle, value);
+						GTK.gtk_adjustment_set_value (scrollBar.adjustmentHandle, value);
 						result = 1;
 					}
 				}
@@ -345,7 +345,7 @@ long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) {
 			} else {
 				scrollBar = horizontalBar;
 			}
-			if (scrollBar != null && !OS.gtk_widget_get_visible (scrollBar.handle) && scrollBar.getEnabled()) {
+			if (scrollBar != null && !GTK.gtk_widget_get_visible (scrollBar.handle) && scrollBar.getEnabled()) {
 				GtkAdjustment adjustment = new GtkAdjustment ();
 				gtk_adjustment_get (scrollBar.adjustmentHandle, adjustment);
 				/* Calculate wheel delta to match GTK+ 2.4 and higher */
@@ -354,7 +354,7 @@ long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) {
 					wheel_delta = -wheel_delta;
 				int value = (int) Math.max(adjustment.lower,
 						Math.min(adjustment.upper - adjustment.page_size, adjustment.value + wheel_delta));
-				OS.gtk_adjustment_set_value (scrollBar.adjustmentHandle, value);
+				GTK.gtk_adjustment_set_value (scrollBar.adjustmentHandle, value);
 				return 1;
 			}
 		}
@@ -365,7 +365,7 @@ long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) {
 int hScrollBarWidth() {
 	if (horizontalBar==null) return 0;
 	long /*int*/ hBarHandle = 0;
-	hBarHandle = OS.gtk_scrolled_window_get_hscrollbar (scrolledHandle);
+	hBarHandle = GTK.gtk_scrolled_window_get_hscrollbar (scrolledHandle);
 	if (hBarHandle==0) return 0;
 	GtkRequisition requisition = new GtkRequisition();
 	/*
@@ -373,12 +373,12 @@ int hScrollBarWidth() {
 	 * Calling gtk_widget_queue_resize() before querying the size
 	 * fixes this issue.
 	 */
-	if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
-		OS.gtk_widget_queue_resize (hBarHandle);
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+		GTK.gtk_widget_queue_resize (hBarHandle);
 	}
 	gtk_widget_get_preferred_size (hBarHandle, requisition);
 	int [] padding = new int [1];
-	OS.gtk_widget_style_get(scrolledHandle, OS.scrollbar_spacing, padding, 0);
+	GTK.gtk_widget_style_get(scrolledHandle, OS.scrollbar_spacing, padding, 0);
 	int spacing = padding[0];
 	return requisition.height + spacing;
 }
@@ -399,9 +399,9 @@ boolean sendLeaveNotify () {
 void setOrientation (boolean create) {
 	super.setOrientation (create);
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
+		int dir = (style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
 		if (scrolledHandle != 0) {
-			OS.gtk_widget_set_direction (scrolledHandle, dir);
+			GTK.gtk_widget_set_direction (scrolledHandle, dir);
 		}
 	}
 	if (horizontalBar != null) horizontalBar.setOrientation (create);
@@ -411,10 +411,10 @@ void setOrientation (boolean create) {
 boolean setScrollBarVisible (ScrollBar bar, boolean visible) {
 	if (scrolledHandle == 0) return false;
 	int [] hsp = new int [1], vsp = new int [1];
-	OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
-	int policy = visible ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-	if (OS.GTK_VERSION >= OS.VERSION(3, 16, 0) && !visible) {
-		policy = OS.GTK_POLICY_EXTERNAL;
+	GTK.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
+	int policy = visible ? GTK.GTK_POLICY_ALWAYS : GTK.GTK_POLICY_NEVER;
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 16, 0) && !visible) {
+		policy = GTK.GTK_POLICY_EXTERNAL;
 	}
 	if ((bar.style & SWT.HORIZONTAL) != 0) {
 		if (hsp [0] == policy) return false;
@@ -423,7 +423,7 @@ boolean setScrollBarVisible (ScrollBar bar, boolean visible) {
 		if (vsp [0] == policy) return false;
 		vsp [0] = policy;
 	}
-	OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp [0], vsp [0]);
+	GTK.gtk_scrolled_window_set_policy (scrolledHandle, hsp [0], vsp [0]);
 	return true;
 }
 
@@ -433,7 +433,7 @@ void redrawBackgroundImage () {
 @Override
 void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boolean all, boolean trim) {
 	super.redrawWidget (x, y, width, height, redrawAll, all, trim);
-	if (!OS.gtk_widget_get_realized (handle)) return;
+	if (!GTK.gtk_widget_get_realized (handle)) return;
 	if (!trim) return;
 	long /*int*/ topHandle = topHandle (), paintHandle = paintHandle ();
 	if (topHandle == paintHandle) return;
@@ -441,12 +441,12 @@ void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boole
 	GdkRectangle rect = new GdkRectangle ();
 	if (redrawAll) {
 		GtkAllocation allocation = new GtkAllocation ();
-		OS.gtk_widget_get_allocation (topHandle, allocation);
+		GTK.gtk_widget_get_allocation (topHandle, allocation);
 		rect.width = allocation.width;
 		rect.height = allocation.height;
 	} else {
 		int [] destX = new int [1], destY = new int [1];
-		OS.gtk_widget_translate_coordinates (paintHandle, topHandle, x, y, destX, destY);
+		GTK.gtk_widget_translate_coordinates (paintHandle, topHandle, x, y, destX, destY);
 		rect.x = destX [0];
 		rect.y = destY [0];
 		rect.width = Math.max (0, width);
@@ -482,25 +482,25 @@ void releaseChildren (boolean destroy) {
 
 @Override
 void resizeHandle (int width, int height) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		if (fixedHandle != 0) {
-			OS.swt_fixed_resize (OS.gtk_widget_get_parent(fixedHandle), fixedHandle, width, height);
+			OS.swt_fixed_resize (GTK.gtk_widget_get_parent(fixedHandle), fixedHandle, width, height);
 		}
 		long /*int*/ child = scrolledHandle != 0 ? scrolledHandle : handle;
 		Point sizes = resizeCalculationsGTK3 (child, width, height);
 		width = sizes.x;
 		height = sizes.y;
-		OS.swt_fixed_resize (OS.gtk_widget_get_parent(child), child, width, height);
+		OS.swt_fixed_resize (GTK.gtk_widget_get_parent(child), child, width, height);
 	} else {
-		if (fixedHandle != 0) OS.gtk_widget_set_size_request (fixedHandle, width, height);
-		OS.gtk_widget_set_size_request (scrolledHandle != 0 ? scrolledHandle : handle, width, height);
+		if (fixedHandle != 0) GTK.gtk_widget_set_size_request (fixedHandle, width, height);
+		GTK.gtk_widget_set_size_request (scrolledHandle != 0 ? scrolledHandle : handle, width, height);
 	}
 }
 
 @Override
 void showWidget () {
 	super.showWidget ();
-	if (scrolledHandle != 0) OS.gtk_widget_show (scrolledHandle);
+	if (scrolledHandle != 0) GTK.gtk_widget_show (scrolledHandle);
 }
 
 @Override
@@ -517,12 +517,12 @@ void updateScrollBarValue (ScrollBar bar) {
 int vScrollBarWidth() {
 	if (verticalBar == null) return 0;
 	long /*int*/ vBarHandle = 0;
-	vBarHandle = OS.gtk_scrolled_window_get_vscrollbar (scrolledHandle);
+	vBarHandle = GTK.gtk_scrolled_window_get_vscrollbar (scrolledHandle);
 	if (vBarHandle == 0) return 0;
 	GtkRequisition requisition = new GtkRequisition();
 	gtk_widget_get_preferred_size (vBarHandle, requisition);
 	int [] padding = new int [1];
-	OS.gtk_widget_style_get(scrolledHandle, OS.scrollbar_spacing, padding, 0);
+	GTK.gtk_widget_style_get(scrolledHandle, OS.scrollbar_spacing, padding, 0);
 	int spacing = padding[0];
 	return requisition.width + spacing;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index 435ae1093e..15977a82d1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -475,7 +475,7 @@ void addToolTip (ToolTip toolTip) {
 void adjustTrim () {
 	if (display.ignoreTrim) return;
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (shellHandle, allocation);
+	GTK.gtk_widget_get_allocation (shellHandle, allocation);
 	int width = allocation.width;
 	int height = allocation.height;
 	long /*int*/ window = gtk_widget_get_window (shellHandle);
@@ -514,7 +514,7 @@ void adjustTrim () {
 	} else {
 		trimStyle = Display.TRIM_NONE;
 	}
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		/*
 		 * The workaround for bug 445900 seems to cause problems for some
 		 * users on GTK2, see bug 492695. The fix is to only adjust the
@@ -538,15 +538,15 @@ void adjustTrim () {
 }
 
 void bringToTop (boolean force) {
-	if (!OS.gtk_widget_get_visible (shellHandle)) return;
+	if (!GTK.gtk_widget_get_visible (shellHandle)) return;
 	Display display = this.display;
 	Shell activeShell = display.activeShell;
 	if (activeShell == this) return;
 	if (!force) {
 		if (activeShell == null) return;
 		if (!display.activePending) {
-			long /*int*/ focusHandle = OS.gtk_window_get_focus (activeShell.shellHandle);
-			if (focusHandle != 0 && !OS.gtk_widget_has_focus (focusHandle)) return;
+			long /*int*/ focusHandle = GTK.gtk_window_get_focus (activeShell.shellHandle);
+			if (focusHandle != 0 && !GTK.gtk_widget_has_focus (focusHandle)) return;
 		}
 	}
 	/*
@@ -575,7 +575,7 @@ void bringToTop (boolean force) {
 		if (OS.isX11()) {
 			long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window));
 			long /*int*/ xWindow;
-			if (OS.GTK3) {
+			if (GTK.GTK3) {
 				xWindow = OS.gdk_x11_window_get_xid (window);
 			} else {
 				xWindow = OS.gdk_x11_drawable_get_xid (window);
@@ -585,14 +585,14 @@ void bringToTop (boolean force) {
 			OS.XSetInputFocus (xDisplay, xWindow, OS.RevertToParent, OS.CurrentTime);
 			OS.gdk_error_trap_pop ();
 		} else {
-			if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
-				if(OS.gtk_widget_get_visible(shellHandle)) {
-					OS.gtk_widget_hide(shellHandle);
+			if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+				if(GTK.gtk_widget_get_visible(shellHandle)) {
+					GTK.gtk_widget_hide(shellHandle);
 				}
 				Callback gdkSeatGrabCallback = new Callback(this, "GdkSeatGrabPrepareFunc", 3); //$NON-NLS-1$
 				long /*int*/ gdkSeatGrabPrepareFunc = gdkSeatGrabCallback.getAddress();
 				if (gdkSeatGrabPrepareFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-				OS.gtk_grab_add(shellHandle);
+				GTK.gtk_grab_add(shellHandle);
 				long /*int*/ seat = OS.gdk_display_get_default_seat(OS.gdk_window_get_display(window));
 				OS.gdk_seat_grab(seat, window, 1, true, 0, 0, gdkSeatGrabPrepareFunc, shellHandle);
 			}
@@ -680,10 +680,10 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	Rectangle trim = super.computeTrimInPixels (x, y, width, height);
 	int border = 0;
 	if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) == 0) {
-		border = OS.gtk_container_get_border_width (shellHandle);
+		border = GTK.gtk_container_get_border_width (shellHandle);
 	}
 	if (isCustomResize ()) {
-		border = OS.gtk_container_get_border_width (shellHandle);
+		border = GTK.gtk_container_get_border_width (shellHandle);
 	}
 	int trimWidth = trimWidth (), trimHeight = trimHeight ();
 	trim.x -= (trimWidth / 2) + border;
@@ -693,7 +693,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	if (menuBar != null) {
 		forceResize ();
 		GtkAllocation allocation = new GtkAllocation ();
-		OS.gtk_widget_get_allocation (menuBar.handle, allocation);
+		GTK.gtk_widget_get_allocation (menuBar.handle, allocation);
 		int menuBarHeight = allocation.height;
 		trim.y -= menuBarHeight;
 		trim.height += menuBarHeight;
@@ -706,20 +706,20 @@ void createHandle (int index) {
 	state |= HANDLE | CANVAS;
 	if (shellHandle == 0) {
 		if (handle == 0) {
-			int type = OS.GTK_WINDOW_TOPLEVEL;
-			if ((style & SWT.ON_TOP) != 0) type = OS.GTK_WINDOW_POPUP;
-			shellHandle = OS.gtk_window_new (type);
+			int type = GTK.GTK_WINDOW_TOPLEVEL;
+			if ((style & SWT.ON_TOP) != 0) type = GTK.GTK_WINDOW_POPUP;
+			shellHandle = GTK.gtk_window_new (type);
 		} else {
-			shellHandle = OS.gtk_plug_new (handle);
+			shellHandle = GTK.gtk_plug_new (handle);
 		}
 		if (shellHandle == 0) error (SWT.ERROR_NO_HANDLES);
 		if (parent != null) {
-			OS.gtk_window_set_transient_for (shellHandle, parent.topHandle ());
-			OS.gtk_window_set_destroy_with_parent (shellHandle, true);
+			GTK.gtk_window_set_transient_for (shellHandle, parent.topHandle ());
+			GTK.gtk_window_set_destroy_with_parent (shellHandle, true);
 			// if child shells are minimizable, we want them to have a
 			// taskbar icon, so they can be unminimized
 			if ((style & SWT.MIN) == 0) {
-				OS.gtk_window_set_skip_taskbar_hint(shellHandle, true);
+				GTK.gtk_window_set_skip_taskbar_hint(shellHandle, true);
 			}
 
 			/*
@@ -739,37 +739,37 @@ void createHandle (int index) {
 		* initial size by the user.  The fix is to set the size to zero.
 		*/
 		if ((style & SWT.RESIZE) != 0) {
-			OS.gtk_widget_set_size_request (shellHandle, 0, 0);
-			OS.gtk_window_set_resizable (shellHandle, true);
+			GTK.gtk_widget_set_size_request (shellHandle, 0, 0);
+			GTK.gtk_window_set_resizable (shellHandle, true);
 		} else {
-			OS.gtk_window_set_resizable (shellHandle, false);
+			GTK.gtk_window_set_resizable (shellHandle, false);
 		}
-		OS.gtk_window_set_title (shellHandle, new byte [1]);
+		GTK.gtk_window_set_title (shellHandle, new byte [1]);
 		if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) == 0) {
-			OS.gtk_container_set_border_width (shellHandle, 1);
-			if (OS.GTK3) {
-				if (OS.GTK_VERSION < OS.VERSION (3, 14, 0)) {
-					OS.gtk_widget_override_background_color (shellHandle, OS.GTK_STATE_FLAG_NORMAL, new GdkRGBA());
+			GTK.gtk_container_set_border_width (shellHandle, 1);
+			if (GTK.GTK3) {
+				if (GTK.GTK_VERSION < OS.VERSION (3, 14, 0)) {
+					GTK.gtk_widget_override_background_color (shellHandle, GTK.GTK_STATE_FLAG_NORMAL, new GdkRGBA());
 				}
 			} else {
 				GdkColor color = new GdkColor ();
-				OS.gtk_style_get_black (OS.gtk_widget_get_style (shellHandle), color);
-				OS.gtk_widget_modify_bg (shellHandle, OS.GTK_STATE_NORMAL, color);
+				GTK.gtk_style_get_black (GTK.gtk_widget_get_style (shellHandle), color);
+				GTK.gtk_widget_modify_bg (shellHandle, GTK.GTK_STATE_NORMAL, color);
 			}
 		}
 		if ((style & SWT.NO_TRIM) != 0 ) {
-			OS.gtk_window_set_decorated(shellHandle, false);
+			GTK.gtk_window_set_decorated(shellHandle, false);
 		}
 		if (isCustomResize ()) {
-			OS.gtk_container_set_border_width (shellHandle, BORDER);
+			GTK.gtk_container_set_border_width (shellHandle, BORDER);
 		}
 	}
-	vboxHandle = gtk_box_new (OS.GTK_ORIENTATION_VERTICAL, false, 0);
+	vboxHandle = gtk_box_new (GTK.GTK_ORIENTATION_VERTICAL, false, 0);
 	if (vboxHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	createHandle (index, false, true);
-	OS.gtk_container_add (vboxHandle, scrolledHandle);
-	OS.gtk_box_set_child_packing (vboxHandle, scrolledHandle, true, true, 0, OS.GTK_PACK_END);
-	group = OS.gtk_window_group_new ();
+	GTK.gtk_container_add (vboxHandle, scrolledHandle);
+	GTK.gtk_box_set_child_packing (vboxHandle, scrolledHandle, true, true, 0, GTK.GTK_PACK_END);
+	group = GTK.gtk_window_group_new ();
 	if (group == 0) error (SWT.ERROR_NO_HANDLES);
 	/*
 	* Feature in GTK.  Realizing the shell triggers a size allocate event,
@@ -777,7 +777,7 @@ void createHandle (int index) {
 	* received too late.  The fix is to realize the window during creation
 	* to avoid confusion.
 	*/
-	OS.gtk_widget_realize (shellHandle);
+	GTK.gtk_widget_realize (shellHandle);
 }
 
 @Override
@@ -877,7 +877,7 @@ void hookEvents () {
 	OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [MAP_EVENT], 0, display.shellMapProcClosure, false);
 	OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.getClosure (ENTER_NOTIFY_EVENT), false);
 	OS.g_signal_connect_closure (shellHandle, OS.move_focus, display.getClosure (MOVE_FOCUS), false);
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		long /*int*/ window = gtk_widget_get_window (shellHandle);
 		OS.gdk_window_add_filter  (window, display.filterProc, shellHandle);
 	} else {
@@ -886,7 +886,7 @@ void hookEvents () {
 	}
 	if (isCustomResize ()) {
 		int mask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK | OS.GDK_BUTTON_PRESS_MASK |  OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK;
-		OS.gtk_widget_add_events (shellHandle, mask);
+		GTK.gtk_widget_add_events (shellHandle, mask);
 		OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [EXPOSE_EVENT], 0, display.getClosure (EXPOSE_EVENT), false);
 		OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [LEAVE_NOTIFY_EVENT], 0, display.getClosure (LEAVE_NOTIFY_EVENT), false);
 		OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.getClosure (MOTION_NOTIFY_EVENT), false);
@@ -980,27 +980,27 @@ void fixStyle (long /*int*/ handle) {
 @Override
 void forceResize () {
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (vboxHandle, allocation);
+	GTK.gtk_widget_get_allocation (vboxHandle, allocation);
 	forceResize (allocation.width, allocation.height);
 }
 
 void forceResize (int width, int height) {
 	int clientWidth = 0;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		if ((style & SWT.MIRRORED) != 0) clientWidth = getClientWidth ();
 	}
 	GtkRequisition requisition = new GtkRequisition ();
 	GtkAllocation allocation = new GtkAllocation ();
-	int border = OS.gtk_container_get_border_width (shellHandle);
+	int border = GTK.gtk_container_get_border_width (shellHandle);
 	allocation.x = border;
 	allocation.y = border;
 	allocation.width = width;
 	allocation.height = height;
 	// Call gtk_widget_get_preferred_size() on GTK 3.20+ to prevent warnings.
 	// See bug 486068.
-	if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) gtk_widget_get_preferred_size (vboxHandle, requisition);
-	OS.gtk_widget_size_allocate (vboxHandle, allocation);
-	if (OS.GTK3) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) gtk_widget_get_preferred_size (vboxHandle, requisition);
+	GTK.gtk_widget_size_allocate (vboxHandle, allocation);
+	if (GTK.GTK3) {
 		if ((style & SWT.MIRRORED) != 0) moveChildren (clientWidth);
 	}
 }
@@ -1020,22 +1020,22 @@ void forceResize (int width, int height) {
  */
 public int getAlpha () {
 	checkWidget ();
-	if (OS.gtk_widget_is_composited (shellHandle)) {
+	if (GTK.gtk_widget_is_composited (shellHandle)) {
 		/*
 		 * Feature in GTK: gtk_window_get_opacity() is deprecated on GTK3.8
 		 * onward. Use gtk_widget_get_opacity() instead.
 		 */
-		return (int) (OS.GTK_VERSION > OS.VERSION (3, 8, 0) ? OS.gtk_widget_get_opacity(shellHandle) * 255 : OS.gtk_window_get_opacity (shellHandle) * 255);
+		return (int) (GTK.GTK_VERSION > OS.VERSION (3, 8, 0) ? GTK.gtk_widget_get_opacity(shellHandle) * 255 : GTK.gtk_window_get_opacity (shellHandle) * 255);
 	}
 	return 255;
 }
 
 int getResizeMode (double x, double y) {
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (shellHandle, allocation);
+	GTK.gtk_widget_get_allocation (shellHandle, allocation);
 	int width = allocation.width;
 	int height = allocation.height;
-	int border = OS.gtk_container_get_border_width (shellHandle);
+	int border = GTK.gtk_container_get_border_width (shellHandle);
 	int mode = 0;
 	if (y >= height - border) {
 		mode = OS.GDK_BOTTOM_SIDE ;
@@ -1080,7 +1080,7 @@ public boolean getFullScreen () {
 Point getLocationInPixels () {
 	checkWidget ();
 	int [] x = new int [1], y = new int [1];
-	OS.gtk_window_get_position (shellHandle, x,y);
+	GTK.gtk_window_get_position (shellHandle, x,y);
 	return new Point (x [0], y [0]);
 }
 
@@ -1166,12 +1166,12 @@ public boolean getModified () {
 Point getSizeInPixels () {
 	checkWidget ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (vboxHandle, allocation);
+	GTK.gtk_widget_get_allocation (vboxHandle, allocation);
 	int width = allocation.width;
 	int height = allocation.height;
 	int border = 0;
 	if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) == 0) {
-		border = OS.gtk_container_get_border_width (shellHandle);
+		border = GTK.gtk_container_get_border_width (shellHandle);
 	}
 	return new Point (width + trimWidth () + 2*border, height + trimHeight () + 2*border);
 }
@@ -1179,7 +1179,7 @@ Point getSizeInPixels () {
 @Override
 public boolean getVisible () {
 	checkWidget();
-	return OS.gtk_widget_get_visible (shellHandle);
+	return GTK.gtk_widget_get_visible (shellHandle);
 }
 
 /**
@@ -1279,11 +1279,11 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 				display.resizeLocationX = gdkEvent.x_root;
 				display.resizeLocationY = gdkEvent.y_root;
 				int [] x = new int [1], y = new int [1];
-				OS.gtk_window_get_position (shellHandle, x, y);
+				GTK.gtk_window_get_position (shellHandle, x, y);
 				display.resizeBoundsX = x [0];
 				display.resizeBoundsY = y [0];
 				GtkAllocation allocation = new GtkAllocation ();
-				OS.gtk_widget_get_allocation (shellHandle, allocation);
+				GTK.gtk_widget_get_allocation (shellHandle, allocation);
 				display.resizeBoundsWidth = allocation.width;
 				display.resizeBoundsHeight = allocation.height;
 			}
@@ -1292,11 +1292,11 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 		 *  Feature in GTK: This handles ungrabbing the keyboard focus from a SWT.ON_TOP window
 		 *  if it has editable fields and is running Wayland. Refer to bug 515773.
 		 */
-		if (!OS.isX11() && OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+		if (!OS.isX11() && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 			if ((style & SWT.ON_TOP) != 0 && (style & SWT.NO_FOCUS) == 0) {
-				OS.gtk_grab_remove(shellHandle);
+				GTK.gtk_grab_remove(shellHandle);
 				OS.gdk_seat_ungrab(OS.gdk_event_get_seat(event));
-				OS.gtk_widget_hide(shellHandle);
+				GTK.gtk_widget_hide(shellHandle);
 			}
 		}
 		return 0;
@@ -1307,7 +1307,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 @Override
 long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) {
 	int [] x = new int [1], y = new int [1];
-	OS.gtk_window_get_position (shellHandle, x, y);
+	GTK.gtk_window_get_position (shellHandle, x, y);
 
 	if (!isVisible ()) {
 		return 0; //We shouldn't handle move/resize events if shell is hidden.
@@ -1345,16 +1345,16 @@ long /*int*/ gtk_draw (long /*int*/ widget, long /*int*/ cairo) {
 			int [] height = new int [1];
 			long /*int*/ window = gtk_widget_get_window (widget);
 			gdk_window_get_size (window, width, height);
-			int border = OS.gtk_container_get_border_width (widget);
-			long /*int*/ context = OS.gtk_widget_get_style_context (shellHandle);
+			int border = GTK.gtk_container_get_border_width (widget);
+			long /*int*/ context = GTK.gtk_widget_get_style_context (shellHandle);
 			//TODO draw shell frame on GTK3
-			OS.gtk_style_context_save (context);
-			OS.gtk_render_frame (context, cairo, 0, 0, width [0], border);
-			OS.gtk_render_frame (context, cairo, 0, height [0] - border, width [0], border);
-			OS.gtk_render_frame (context, cairo, 0, border, border, height [0] - border - border);
-			OS.gtk_render_frame (context, cairo, width [0] - border, border, border, height [0] - border - border);
-			OS.gtk_render_frame (context, cairo, 0 + 10, 0 + 10, width [0] - 20, height [0] - 20);
-			OS.gtk_style_context_restore (context);
+			GTK.gtk_style_context_save (context);
+			GTK.gtk_render_frame (context, cairo, 0, 0, width [0], border);
+			GTK.gtk_render_frame (context, cairo, 0, height [0] - border, width [0], border);
+			GTK.gtk_render_frame (context, cairo, 0, border, border, height [0] - border - border);
+			GTK.gtk_render_frame (context, cairo, width [0] - border, border, border, height [0] - border - border);
+			GTK.gtk_render_frame (context, cairo, 0 + 10, 0 + 10, width [0] - 20, height [0] - 20);
+			GTK.gtk_style_context_restore (context);
 			return 1;
 		}
 		return 0;
@@ -1368,7 +1368,7 @@ long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {
 		if (isCustomResize ()) {
 			GdkEventExpose gdkEventExpose = new GdkEventExpose ();
 			OS.memmove (gdkEventExpose, event, GdkEventExpose.sizeof);
-			long /*int*/ style = OS.gtk_widget_get_style (widget);
+			long /*int*/ style = GTK.gtk_widget_get_style (widget);
 			long /*int*/ window = gtk_widget_get_window (widget);
 			int [] width = new int [1];
 			int [] height = new int [1];
@@ -1379,13 +1379,13 @@ long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {
 			area.width = gdkEventExpose.area_width;
 			area.height = gdkEventExpose.area_height;
 			byte [] detail = Converter.wcsToMbcs ("base", true); //$NON-NLS-1$
-			int border = OS.gtk_container_get_border_width (widget);
-			int state = display.activeShell == this ? OS.GTK_STATE_SELECTED : OS.GTK_STATE_PRELIGHT;
-			OS.gtk_paint_flat_box (style, window, state, OS.GTK_SHADOW_NONE, area, widget, detail, 0, 0, width [0], border);
-			OS.gtk_paint_flat_box (style, window, state, OS.GTK_SHADOW_NONE, area, widget, detail, 0, height [0] - border, width [0], border);
-			OS.gtk_paint_flat_box (style, window, state, OS.GTK_SHADOW_NONE, area, widget, detail, 0, border, border, height [0] - border - border);
-			OS.gtk_paint_flat_box (style, window, state, OS.GTK_SHADOW_NONE, area, widget, detail, width [0] - border, border, border, height [0] - border - border);
-			OS.gtk_paint_box (style, window, state, OS.GTK_SHADOW_OUT, area, widget, detail, 0, 0, width [0], height [0]);
+			int border = GTK.gtk_container_get_border_width (widget);
+			int state = display.activeShell == this ? GTK.GTK_STATE_SELECTED : GTK.GTK_STATE_PRELIGHT;
+			GTK.gtk_paint_flat_box (style, window, state, GTK.GTK_SHADOW_NONE, area, widget, detail, 0, 0, width [0], border);
+			GTK.gtk_paint_flat_box (style, window, state, GTK.GTK_SHADOW_NONE, area, widget, detail, 0, height [0] - border, width [0], border);
+			GTK.gtk_paint_flat_box (style, window, state, GTK.GTK_SHADOW_NONE, area, widget, detail, 0, border, border, height [0] - border - border);
+			GTK.gtk_paint_flat_box (style, window, state, GTK.GTK_SHADOW_NONE, area, widget, detail, width [0] - border, border, border, height [0] - border - border);
+			GTK.gtk_paint_box (style, window, state, GTK.GTK_SHADOW_OUT, area, widget, detail, 0, 0, width [0], height [0]);
 			return 1;
 		}
 		return 0;
@@ -1396,12 +1396,12 @@ long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {
 @Override
 long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {
 	switch ((int)/*64*/directionType) {
-		case OS.GTK_DIR_TAB_FORWARD:
-		case OS.GTK_DIR_TAB_BACKWARD:
+		case GTK.GTK_DIR_TAB_FORWARD:
+		case GTK.GTK_DIR_TAB_BACKWARD:
 			Control control = display.getFocusControl ();
 			if (control != null) {
 				if ((control.state & CANVAS) != 0 && (control.style & SWT.EMBEDDED) != 0 && control.getShell () == this) {
-					int traversal = directionType == OS.GTK_DIR_TAB_FORWARD ? SWT.TRAVERSE_TAB_NEXT : SWT.TRAVERSE_TAB_PREVIOUS;
+					int traversal = directionType == GTK.GTK_DIR_TAB_FORWARD ? SWT.TRAVERSE_TAB_NEXT : SWT.TRAVERSE_TAB_PREVIOUS;
 					control.traverse (traversal);
 					return 1;
 				}
@@ -1459,7 +1459,7 @@ long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ directionType) {
 	Control control = display.getFocusControl ();
 	if (control != null) {
 		long /*int*/ focusHandle = control.focusHandle ();
-		OS.gtk_widget_child_focus (focusHandle, (int)/*64*/directionType);
+		GTK.gtk_widget_child_focus (focusHandle, (int)/*64*/directionType);
 	}
 	OS.g_signal_stop_emission_by_name (shellHandle, OS.move_focus);
 	return 1;
@@ -1472,7 +1472,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
 			GdkEventMotion gdkEvent = new GdkEventMotion ();
 			OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
 			if ((gdkEvent.state & OS.GDK_BUTTON1_MASK) != 0) {
-				int border = OS.gtk_container_get_border_width (shellHandle);
+				int border = GTK.gtk_container_get_border_width (shellHandle);
 				int dx = (int)(gdkEvent.x_root - display.resizeLocationX);
 				int dy = (int)(gdkEvent.y_root - display.resizeLocationY);
 				int x = display.resizeBoundsX;
@@ -1520,7 +1520,7 @@ long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
 				if (x != display.resizeBoundsX || y != display.resizeBoundsY) {
 					OS.gdk_window_move_resize (gtk_widget_get_window (shellHandle), x, y, width, height);
 				} else {
-					OS.gtk_window_resize (shellHandle, width, height);
+					GTK.gtk_window_resize (shellHandle, width, height);
 				}
 			} else {
 				int mode = getResizeMode (gdkEvent.x, gdkEvent.y);
@@ -1548,17 +1548,17 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
 			Control focusControl = display.getFocusControl ();
 			if (focusControl != null && (focusControl.hooks (SWT.KeyDown) || focusControl.filters (SWT.KeyDown))) {
 				long /*int*/ [] accel = new long /*int*/ [1];
-				long /*int*/ setting = OS.gtk_settings_get_default ();
-				OS.g_object_get (setting, OS.gtk_menu_bar_accel, accel, 0);
+				long /*int*/ setting = GTK.gtk_settings_get_default ();
+				OS.g_object_get (setting, GTK.gtk_menu_bar_accel, accel, 0);
 				if (accel [0] != 0) {
 					int [] keyval = new int [1];
 					int [] mods = new int [1];
-					OS.gtk_accelerator_parse (accel [0], keyval, mods);
+					GTK.gtk_accelerator_parse (accel [0], keyval, mods);
 					OS.g_free (accel [0]);
 					if (keyval [0] != 0) {
 						GdkEventKey keyEvent = new GdkEventKey ();
 						OS.memmove (keyEvent, event, GdkEventKey.sizeof);
-						int mask = OS.gtk_accelerator_get_default_mod_mask ();
+						int mask = GTK.gtk_accelerator_get_default_mod_mask ();
 						if (keyEvent.keyval == keyval [0] && (keyEvent.state & mask) == (mods [0] & mask)) {
 							return focusControl.gtk_key_press_event (focusControl.focusHandle (), event);
 						}
@@ -1574,15 +1574,15 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
 @Override
 long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
 	int width, height;
-	if (OS.GTK_VERSION >= OS.VERSION(3, 6, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 6, 0)) {
 		int[] widthA = new int [1];
 		int[] heightA = new int [1];
-		OS.gtk_window_get_size(shellHandle, widthA, heightA);
+		GTK.gtk_window_get_size(shellHandle, widthA, heightA);
 		width = widthA[0];
 		height = heightA[0];
 	} else {
 		GtkAllocation widgetAllocation = new GtkAllocation ();
-		OS.gtk_widget_get_allocation (shellHandle, widgetAllocation);
+		GTK.gtk_widget_get_allocation (shellHandle, widgetAllocation);
 		width = widgetAllocation.width;
 		height = widgetAllocation.height;
 	}
@@ -1591,7 +1591,7 @@ long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
 	//  infinitely recursive resize call. This causes non-resizable Shells/Dialogs to
 	//  crash. Fix: only call resizeBounds() on resizable Shells.
 	if ((!resized || oldWidth != width || oldHeight != height)
-			&& (OS.GTK3 && !OS.isX11() ? ((style & SWT.RESIZE) != 0) : true)) {  //Wayland
+			&& (GTK.GTK3 && !OS.isX11() ? ((style & SWT.RESIZE) != 0) : true)) {  //Wayland
 		oldWidth = width;
 		oldHeight = height;
 		resizeBounds (width, height, true); //this is called to resize child widgets when the shell is resized.
@@ -1873,16 +1873,16 @@ void setActiveControl (Control control, int type) {
  */
 public void setAlpha (int alpha) {
 	checkWidget ();
-	if (OS.gtk_widget_is_composited (shellHandle)) {
+	if (GTK.gtk_widget_is_composited (shellHandle)) {
 		/*
 		 * Feature in GTK: gtk_window_set_opacity() is deprecated on GTK3.8
 		 * onward. Use gtk_widget_set_opacity() instead.
 		 */
-		if (OS.GTK_VERSION > OS.VERSION (3, 8, 0)) {
-			OS.gtk_widget_set_opacity (shellHandle, (double) alpha / 255);
+		if (GTK.GTK_VERSION > OS.VERSION (3, 8, 0)) {
+			GTK.gtk_widget_set_opacity (shellHandle, (double) alpha / 255);
 		} else {
 			alpha &= 0xFF;
-			OS.gtk_window_set_opacity (shellHandle, alpha / 255f);
+			GTK.gtk_window_set_opacity (shellHandle, alpha / 255f);
 		}
 	}
 }
@@ -1894,11 +1894,11 @@ void resizeBounds (int width, int height, boolean notify) {
 	if (enableWindow != 0) {
 		OS.gdk_window_resize (enableWindow, width, height);
 	}
-	int border = OS.gtk_container_get_border_width (shellHandle);
+	int border = GTK.gtk_container_get_border_width (shellHandle);
 	int boxWidth = width - 2*border;
 	int boxHeight = height - 2*border;
-	if (!OS.GTK3 || (style & SWT.RESIZE) == 0) {
-		OS.gtk_widget_set_size_request (vboxHandle, boxWidth, boxHeight);
+	if (!GTK.GTK3 || (style & SWT.RESIZE) == 0) {
+		GTK.gtk_widget_set_size_request (vboxHandle, boxWidth, boxHeight);
 	}
 	forceResize (boxWidth, boxHeight);
 	if (notify) {
@@ -1936,8 +1936,8 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	int result = 0;
 	if (move) {
 		int [] x_pos = new int [1], y_pos = new int [1];
-		OS.gtk_window_get_position (shellHandle, x_pos, y_pos);
-		OS.gtk_window_move (shellHandle, x, y);
+		GTK.gtk_window_get_position (shellHandle, x_pos, y_pos);
+		GTK.gtk_window_move (shellHandle, x, y);
 		/*
 		 * Bug in GTK: gtk_window_get_position () is not always up-to-date right after
 		 * gtk_window_move (). The random delays cause problems like bug 445900.
@@ -1948,7 +1948,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 		 */
 		for (int i = 0; i < 1000; i++) {
 			int [] x2_pos = new int [1], y2_pos = new int [1];
-			OS.gtk_window_get_position (shellHandle, x2_pos, y2_pos);
+			GTK.gtk_window_get_position (shellHandle, x2_pos, y2_pos);
 			if (x2_pos[0] == x && y2_pos[0] == y) {
 				break;
 			}
@@ -1969,7 +1969,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 		* If the shell is created without a RESIZE style bit, and the
 		* minWidth/minHeight has been set, allow the resize.
 		*/
-		if ((style & SWT.RESIZE) != 0 || (minHeight != 0 || minWidth != 0)) OS.gtk_window_resize (shellHandle, width, height);
+		if ((style & SWT.RESIZE) != 0 || (minHeight != 0 || minWidth != 0)) GTK.gtk_window_resize (shellHandle, width, height);
 		boolean changed = width != oldWidth || height != oldHeight;
 		if (changed) {
 			oldWidth = width;
@@ -2021,7 +2021,7 @@ public void setEnabled (boolean enabled) {
 		}
 	} else {
 		long /*int*/ parentHandle = shellHandle;
-		OS.gtk_widget_realize (parentHandle);
+		GTK.gtk_widget_realize (parentHandle);
 		long /*int*/ window = gtk_widget_get_window (parentHandle);
 		Rectangle rect = getBoundsInPixels ();
 		GdkWindowAttr attributes = new GdkWindowAttr ();
@@ -2084,9 +2084,9 @@ public void setEnabled (boolean enabled) {
 public void setFullScreen (boolean fullScreen) {
 	checkWidget();
 	if (fullScreen) {
-		OS.gtk_window_fullscreen (shellHandle);
+		GTK.gtk_window_fullscreen (shellHandle);
 	} else {
-		OS.gtk_window_unfullscreen (shellHandle);
+		GTK.gtk_window_unfullscreen (shellHandle);
 		if (maximized) {
 			setMaximized (true);
 		}
@@ -2119,7 +2119,7 @@ void setInitialBounds () {
 	int width, height;
 	if ((state & FOREIGN_HANDLE) != 0) {
 		GtkAllocation allocation = new GtkAllocation ();
-		OS.gtk_widget_get_allocation (shellHandle, allocation);
+		GTK.gtk_widget_get_allocation (shellHandle, allocation);
 		width = allocation.width;
 		height = allocation.height;
 	} else {
@@ -2136,7 +2136,7 @@ void setInitialBounds () {
 			}
 		}
 		if ((style & SWT.RESIZE) != 0) {
-			OS.gtk_window_resize (shellHandle, width, height);
+			GTK.gtk_window_resize (shellHandle, width, height);
 		}
 	}
 	resizeBounds (width, height, false);
@@ -2147,9 +2147,9 @@ public void setMaximized (boolean maximized) {
 	checkWidget();
 	super.setMaximized (maximized);
 	if (maximized) {
-		OS.gtk_window_maximize (shellHandle);
+		GTK.gtk_window_maximize (shellHandle);
 	} else {
-		OS.gtk_window_unmaximize (shellHandle);
+		GTK.gtk_window_unmaximize (shellHandle);
 	}
 }
 
@@ -2164,18 +2164,18 @@ public void setMenuBar (Menu menu) {
 	}
 	if (menuBar != null) {
 		long /*int*/ menuHandle = menuBar.handle;
-		OS.gtk_widget_hide (menuHandle);
+		GTK.gtk_widget_hide (menuHandle);
 		destroyAccelGroup ();
 	}
 	menuBar = menu;
 	if (menuBar != null) {
 		long /*int*/ menuHandle = menu.handle;
-		OS.gtk_widget_show (menuHandle);
+		GTK.gtk_widget_show (menuHandle);
 		createAccelGroup ();
 		menuBar.addAccelerators (accelGroup);
 	}
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (vboxHandle, allocation);
+	GTK.gtk_widget_get_allocation (vboxHandle, allocation);
 	int width = allocation.width;
 	int height = allocation.height;
 	resizeBounds (width, height, !both);
@@ -2186,13 +2186,13 @@ public void setMinimized (boolean minimized) {
 	checkWidget();
 	if (this.minimized == minimized) return;
 	super.setMinimized (minimized);
-	if(OS.GTK_VERSION >= OS.VERSION (3, 8, 0) && !OS.gtk_widget_get_visible(shellHandle)) {
-		OS.gtk_widget_show(shellHandle);
+	if(GTK.GTK_VERSION >= OS.VERSION (3, 8, 0) && !GTK.gtk_widget_get_visible(shellHandle)) {
+		GTK.gtk_widget_show(shellHandle);
 	}
 	if (minimized) {
-		OS.gtk_window_iconify (shellHandle);
+		GTK.gtk_window_iconify (shellHandle);
 	} else {
-		OS.gtk_window_deiconify (shellHandle);
+		GTK.gtk_window_deiconify (shellHandle);
 		bringToTop (false);
 	}
 }
@@ -2222,7 +2222,7 @@ void setMinimumSizeInPixels (int width, int height) {
 	GdkGeometry geometry = new GdkGeometry ();
 	minWidth = geometry.min_width = Math.max (width, trimWidth ()) - trimWidth ();
 	minHeight = geometry.min_height = Math.max (height, trimHeight ()) - trimHeight ();
-	OS.gtk_window_set_geometry_hints (shellHandle, 0, geometry, OS.GDK_HINT_MIN_SIZE);
+	GTK.gtk_window_set_geometry_hints (shellHandle, 0, geometry, OS.GDK_HINT_MIN_SIZE);
 }
 
 /**
@@ -2318,7 +2318,7 @@ public void setRegion (Region region) {
 
 //copied from Region:
 static void gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles) {
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		OS.gdk_region_get_rectangles (region, rectangles, n_rectangles);
 		return;
 	}
@@ -2373,7 +2373,7 @@ public void setText (String string) {
 	string.getChars (0, length , chars, 0);
 	for (int i=length; i<chars.length; i++)  chars [i] = ' ';
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	OS.gtk_window_set_title (shellHandle, buffer);
+	GTK.gtk_window_set_title (shellHandle, buffer);
 }
 
 @Override
@@ -2387,10 +2387,10 @@ public void setVisible (boolean visible) {
 	if ((style & mask) != 0) {
 		if (visible) {
 			display.setModalShell (this);
-			OS.gtk_window_set_modal (shellHandle, true);
+			GTK.gtk_window_set_modal (shellHandle, true);
 		} else {
 			display.clearModal (this);
-			OS.gtk_window_set_modal (shellHandle, false);
+			GTK.gtk_window_set_modal (shellHandle, false);
 		}
 		/*
 		 * When in full-screen mode, the OS will always consider it to be the top of the display stack unless it is a dialog.
@@ -2398,13 +2398,13 @@ public void setVisible (boolean visible) {
 		 * up in front of the full-screen window.
 		 */
 		if (parent!=null && parent.getShell().getFullScreen()) {
-			OS.gtk_window_set_type_hint(shellHandle, OS.GDK_WINDOW_TYPE_HINT_DIALOG);
+			GTK.gtk_window_set_type_hint(shellHandle, OS.GDK_WINDOW_TYPE_HINT_DIALOG);
 		}
 	} else {
 		updateModal ();
 	}
 	showWithParent = visible;
-	if (OS.gtk_widget_get_mapped (shellHandle) == visible) return;
+	if (GTK.gtk_widget_get_mapped (shellHandle) == visible) return;
 	if (visible) {
 		if (center && !moved) {
 			center ();
@@ -2429,10 +2429,10 @@ public void setVisible (boolean visible) {
 		 *  Feature in GTK: This handles grabbing the keyboard focus from a SWT.ON_TOP window
 		 *  if it has editable fields and is running Wayland. Refer to bug 515773.
 		 */
-		OS.gtk_widget_show (shellHandle);
+		GTK.gtk_widget_show (shellHandle);
 		if (enableWindow != 0) OS.gdk_window_raise (enableWindow);
 		if (isDisposed ()) return;
-		if (!(OS.isX11() && OS.GTK_IS_PLUG (shellHandle))) {
+		if (!(OS.isX11() && GTK.GTK_IS_PLUG (shellHandle))) {
 			display.dispatchEvents = new int [] {
 				OS.GDK_EXPOSE,
 				OS.GDK_FOCUS_CHANGE,
@@ -2469,7 +2469,7 @@ public void setVisible (boolean visible) {
 		mapped = true;
 
 		if ((style & mask) != 0) {
-			gdk_pointer_ungrab (OS.gtk_widget_get_window (shellHandle), OS.GDK_CURRENT_TIME);
+			gdk_pointer_ungrab (GTK.gtk_widget_get_window (shellHandle), OS.GDK_CURRENT_TIME);
 		}
 		opened = true;
 		if (!moved) {
@@ -2496,14 +2496,14 @@ public void setVisible (boolean visible) {
 		fixActiveShell ();
 		// Feature in Wayland: If the shell item is ON_TOP, remove its grab before hiding it, otherwise focus is locked to
 		// the hidden widget and can never be returned.
-		if (!OS.isX11() && OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+		if (!OS.isX11() && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 			if ((style & SWT.ON_TOP) != 0 && (style & SWT.NO_FOCUS) == 0) {
-				OS.gtk_grab_remove(shellHandle);
+				GTK.gtk_grab_remove(shellHandle);
 				OS.gdk_seat_ungrab(OS.gdk_display_get_default_seat(
-							OS.gdk_window_get_display(OS.gtk_widget_get_window(shellHandle))));
+							OS.gdk_window_get_display(GTK.gtk_widget_get_window(shellHandle))));
 			}
 		}
-		OS.gtk_widget_hide (shellHandle);
+		GTK.gtk_widget_hide (shellHandle);
 		sendEvent (SWT.Hide);
 	}
 }
@@ -2536,21 +2536,21 @@ void showWidget () {
 		* no focusIn events are generated on the window until the window loses
 		* and gain focus.
 		*/
-		if (OS.gtk_window_is_active (shellHandle)) {
+		if (GTK.gtk_window_is_active (shellHandle)) {
 			display.activeShell = this;
 			display.activePending = true;
 		}
-		long /*int*/ children = OS.gtk_container_get_children (shellHandle), list = children;
+		long /*int*/ children = GTK.gtk_container_get_children (shellHandle), list = children;
 		while (list != 0) {
-			OS.gtk_container_remove (shellHandle, OS.g_list_data (list));
+			GTK.gtk_container_remove (shellHandle, OS.g_list_data (list));
 			list = OS.g_list_next(list);
 		}
 		OS.g_list_free (list);
 	}
-	OS.gtk_container_add (shellHandle, vboxHandle);
-	if (scrolledHandle != 0) OS.gtk_widget_show (scrolledHandle);
-	if (handle != 0) OS.gtk_widget_show (handle);
-	if (vboxHandle != 0) OS.gtk_widget_show (vboxHandle);
+	GTK.gtk_container_add (shellHandle, vboxHandle);
+	if (scrolledHandle != 0) GTK.gtk_widget_show (scrolledHandle);
+	if (handle != 0) GTK.gtk_widget_show (handle);
+	if (vboxHandle != 0) GTK.gtk_widget_show (vboxHandle);
 }
 
 @Override
@@ -2565,7 +2565,7 @@ long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*in
 		GdkRectangle dest = new GdkRectangle ();
 		OS.gdk_screen_get_monitor_geometry (screen, monitorNumber, dest);
 		GtkAllocation allocation = new GtkAllocation ();
-		OS.gtk_widget_get_allocation (handle, allocation);
+		GTK.gtk_widget_get_allocation (handle, allocation);
 		int width = allocation.width;
 		int height = allocation.height;
 		if (x[0] + width > dest.x + dest.width) {
@@ -2575,13 +2575,13 @@ long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*in
 			y[0] = (dest.y + dest.height) - height;
 		}
 	}
-	OS.gtk_window_move (handle, x [0], y [0]);
+	GTK.gtk_window_move (handle, x [0], y [0]);
 	return 0;
 }
 
 @Override
 long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
-	OS.gtk_widget_hide (handle);
+	GTK.gtk_widget_hide (handle);
 	return 0;
 }
 
@@ -2627,7 +2627,7 @@ int trimWidth () {
 }
 
 void updateModal () {
-	if (OS.isX11() && OS.GTK_IS_PLUG (shellHandle)) return;
+	if (OS.isX11() && GTK.GTK_IS_PLUG (shellHandle)) return;
 	long /*int*/ group = 0;
 	boolean isModalShell = false;
 	if (display.getModalDialog () == null) {
@@ -2645,8 +2645,8 @@ void updateModal () {
 				* into a different group and then, set back after it
 				* assigned into new group.
 				*/
-				isModalShell = OS.gtk_window_get_modal (shellHandle);
-				if (isModalShell) OS.gtk_window_set_modal (shellHandle, false);
+				isModalShell = GTK.gtk_window_get_modal (shellHandle);
+				if (isModalShell) GTK.gtk_window_set_modal (shellHandle, false);
 			}
 		} else {
 			shell = modal;
@@ -2677,14 +2677,14 @@ void updateModal () {
 		* get the handle of the default group and add windows to the
 		* group.
 		*/
-		group = OS.gtk_window_get_group(0);
+		group = GTK.gtk_window_get_group(0);
 	}
 	if (group != 0) {
-		OS.gtk_window_group_add_window (group, shellHandle);
-		if (isModalShell) OS.gtk_window_set_modal (shellHandle, true);
+		GTK.gtk_window_group_add_window (group, shellHandle);
+		if (isModalShell) GTK.gtk_window_set_modal (shellHandle, true);
 	} else {
 		if (modalGroup != 0) {
-			OS.gtk_window_group_remove_window (modalGroup, shellHandle);
+			GTK.gtk_window_group_remove_window (modalGroup, shellHandle);
 		}
 	}
 	modalGroup = group;
@@ -2703,12 +2703,12 @@ void updateMinimized (boolean minimized) {
 			if (minimized) {
 				if (shells[i].isVisible ()) {
 					shells[i].showWithParent = true;
-					OS.gtk_widget_hide(shells[i].shellHandle);
+					GTK.gtk_widget_hide(shells[i].shellHandle);
 				}
 			} else {
 				if (shells[i].showWithParent) {
 					shells[i].showWithParent = false;
-					OS.gtk_widget_show(shells[i].shellHandle);
+					GTK.gtk_widget_show(shells[i].shellHandle);
 				}
 			}
 		}
@@ -2729,14 +2729,14 @@ public void dispose () {
 	*/
 	if (isDisposed()) return;
 	fixActiveShell ();
-	if (!OS.isX11() && OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+	if (!OS.isX11() && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 		if ((style & SWT.ON_TOP) != 0 && (style & SWT.NO_FOCUS) == 0) {
-			OS.gtk_grab_remove(shellHandle);
+			GTK.gtk_grab_remove(shellHandle);
 			OS.gdk_seat_ungrab(OS.gdk_display_get_default_seat(
-				OS.gdk_window_get_display(OS.gtk_widget_get_window(shellHandle))));
+				OS.gdk_window_get_display(GTK.gtk_widget_get_window(shellHandle))));
 		}
 	}
-	OS.gtk_widget_hide (shellHandle);
+	GTK.gtk_widget_hide (shellHandle);
 	super.dispose ();
 }
 
@@ -2771,17 +2771,17 @@ Rectangle getBoundsInPixels () {
 	checkWidget ();
 	int [] x = new int [1], y = new int [1];
 	if ((state & Widget.DISPOSE_SENT) == 0) {
-		OS.gtk_window_get_position (shellHandle, x, y);
+		GTK.gtk_window_get_position (shellHandle, x, y);
 	} else {
-		OS.gdk_window_get_root_origin(OS.gtk_widget_get_window(shellHandle), x, y);
+		OS.gdk_window_get_root_origin(GTK.gtk_widget_get_window(shellHandle), x, y);
 	}
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (vboxHandle, allocation);
+	GTK.gtk_widget_get_allocation (vboxHandle, allocation);
 	int width = allocation.width;
 	int height = allocation.height;
 	int border = 0;
 	if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.SHELL_TRIM)) == 0) {
-		border = OS.gtk_container_get_border_width (shellHandle);
+		border = GTK.gtk_container_get_border_width (shellHandle);
 	}
 	return new Rectangle (x [0], y [0], width + trimWidth () + 2*border, height + trimHeight () + 2*border);
 }
@@ -2825,7 +2825,7 @@ void releaseWidget () {
 	tooltipsHandle = 0;
 	if (group != 0) OS.g_object_unref (group);
 	group = modalGroup = 0;
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		long /*int*/ window = gtk_widget_get_window (shellHandle);
 		OS.gdk_window_remove_filter(window, display.filterProc, shellHandle);
 	}
@@ -2845,7 +2845,7 @@ void setToolTipText (long /*int*/ rootWidget, long /*int*/ tipWidget, String str
 		char [] chars = fixMnemonic (string, false);
 		buffer = Converter.wcsToMbcs (chars, true);
 	}
-	long /*int*/ oldTooltip = OS.gtk_widget_get_tooltip_text (rootWidget);
+	long /*int*/ oldTooltip = GTK.gtk_widget_get_tooltip_text (rootWidget);
 	boolean same = false;
 	if (buffer == null && oldTooltip == 0) {
 		same = true;
@@ -2855,7 +2855,7 @@ void setToolTipText (long /*int*/ rootWidget, long /*int*/ tipWidget, String str
 	if (oldTooltip != 0) OS.g_free(oldTooltip);
 	if (same) return;
 
-	OS.gtk_widget_set_tooltip_text (rootWidget, buffer);
+	GTK.gtk_widget_set_tooltip_text (rootWidget, buffer);
 }
 @Override
 Point getWindowOrigin () {
@@ -2874,7 +2874,7 @@ Point getWindowOrigin () {
 }
 
 long /*int*/ GdkSeatGrabPrepareFunc (long /*int*/ seat, long /*int*/ window, long /*int*/ data) {
-	OS.gtk_widget_show(data);
+	GTK.gtk_widget_show(data);
 	return 0;
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
index d79f0f0bdf..8b67a8b99d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
@@ -153,13 +153,13 @@ void createHandle (int index) {
 	state |= HANDLE;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	long /*int*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	long /*int*/ hAdjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
 	if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
 	if ((style & SWT.HORIZONTAL) != 0) {
-		handle = gtk_scrollbar_new (OS.GTK_ORIENTATION_HORIZONTAL, hAdjustment);
+		handle = gtk_scrollbar_new (GTK.GTK_ORIENTATION_HORIZONTAL, hAdjustment);
 	} else {
-		handle = gtk_scrollbar_new (OS.GTK_ORIENTATION_VERTICAL, hAdjustment);
+		handle = gtk_scrollbar_new (GTK.GTK_ORIENTATION_VERTICAL, hAdjustment);
 	}
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 	/*
@@ -171,16 +171,16 @@ void createHandle (int index) {
 	* (http://bugzilla.gnome.org/show_bug.cgi?id=475909)
 	*/
 	if ((style & SWT.VERTICAL) != 0) {
-		OS.gtk_widget_set_can_focus (handle, true);
+		GTK.gtk_widget_set_can_focus (handle, true);
 	}
-	OS.gtk_container_add (fixedHandle, handle);
+	GTK.gtk_container_add (fixedHandle, handle);
 }
 
 @Override
 long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
 	long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);
 	if (result != 0) return result;
-	detail = OS.GTK_SCROLL_NONE;
+	detail = GTK.GTK_SCROLL_NONE;
 	dragSent = false;
 	return result;
 }
@@ -194,26 +194,26 @@ long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*
 @Override
 long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
 	Event event = new Event ();
-	dragSent = detail == OS.GTK_SCROLL_JUMP;
+	dragSent = detail == GTK.GTK_SCROLL_JUMP;
 	switch (detail) {
-		case OS.GTK_SCROLL_NONE:			event.detail = SWT.NONE; break;
-		case OS.GTK_SCROLL_JUMP:			event.detail = SWT.DRAG; break;
-		case OS.GTK_SCROLL_START:			event.detail = SWT.HOME; break;
-		case OS.GTK_SCROLL_END:				event.detail = SWT.END; break;
-		case OS.GTK_SCROLL_PAGE_DOWN:
-		case OS.GTK_SCROLL_PAGE_RIGHT:
-		case OS.GTK_SCROLL_PAGE_FORWARD:	event.detail = SWT.PAGE_DOWN; break;
-		case OS.GTK_SCROLL_PAGE_UP:
-		case OS.GTK_SCROLL_PAGE_LEFT:
-		case OS.GTK_SCROLL_PAGE_BACKWARD:	event.detail = SWT.PAGE_UP; break;
-		case OS.GTK_SCROLL_STEP_DOWN:
-		case OS.GTK_SCROLL_STEP_RIGHT:
-		case OS.GTK_SCROLL_STEP_FORWARD:	event.detail = SWT.ARROW_DOWN; break;
-		case OS.GTK_SCROLL_STEP_UP:
-		case OS.GTK_SCROLL_STEP_LEFT:
-		case OS.GTK_SCROLL_STEP_BACKWARD:	event.detail = SWT.ARROW_UP; break;
+		case GTK.GTK_SCROLL_NONE:			event.detail = SWT.NONE; break;
+		case GTK.GTK_SCROLL_JUMP:			event.detail = SWT.DRAG; break;
+		case GTK.GTK_SCROLL_START:			event.detail = SWT.HOME; break;
+		case GTK.GTK_SCROLL_END:				event.detail = SWT.END; break;
+		case GTK.GTK_SCROLL_PAGE_DOWN:
+		case GTK.GTK_SCROLL_PAGE_RIGHT:
+		case GTK.GTK_SCROLL_PAGE_FORWARD:	event.detail = SWT.PAGE_DOWN; break;
+		case GTK.GTK_SCROLL_PAGE_UP:
+		case GTK.GTK_SCROLL_PAGE_LEFT:
+		case GTK.GTK_SCROLL_PAGE_BACKWARD:	event.detail = SWT.PAGE_UP; break;
+		case GTK.GTK_SCROLL_STEP_DOWN:
+		case GTK.GTK_SCROLL_STEP_RIGHT:
+		case GTK.GTK_SCROLL_STEP_FORWARD:	event.detail = SWT.ARROW_DOWN; break;
+		case GTK.GTK_SCROLL_STEP_UP:
+		case GTK.GTK_SCROLL_STEP_LEFT:
+		case GTK.GTK_SCROLL_STEP_BACKWARD:	event.detail = SWT.ARROW_UP; break;
 	}
-	if (!dragSent) detail = OS.GTK_SCROLL_NONE;
+	if (!dragSent) detail = GTK.GTK_SCROLL_NONE;
 	sendSelectionEvent (SWT.Selection, event, false);
 	return 0;
 }
@@ -234,7 +234,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 				}
 				sendSelectionEvent (SWT.Selection);
 			}
-			detail = OS.GTK_SCROLL_NONE;
+			detail = GTK.GTK_SCROLL_NONE;
 			dragSent = false;
 			break;
 		}
@@ -252,21 +252,21 @@ void hookEvents () {
 @Override
 void register () {
 	super.register ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
 	display.addWidget (hAdjustment, this);
 }
 
 @Override
 void deregister () {
 	super.deregister ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
 	display.removeWidget (hAdjustment);
 }
 
 @Override
 Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	checkWidget();
-	OS.gtk_widget_realize(handle);
+	GTK.gtk_widget_realize(handle);
 	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
 	Point size = computeNativeSize(handle, wHint, hHint, changed);
@@ -292,8 +292,8 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
  */
 public int getIncrement () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_step_increment (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_step_increment (hAdjustment);
 }
 
 /**
@@ -308,8 +308,8 @@ public int getIncrement () {
  */
 public int getMaximum () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_upper (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_upper (hAdjustment);
 }
 
 /**
@@ -324,8 +324,8 @@ public int getMaximum () {
  */
 public int getMinimum () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_lower (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_lower (hAdjustment);
 }
 
 /**
@@ -342,8 +342,8 @@ public int getMinimum () {
  */
 public int getPageIncrement () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_page_increment (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_page_increment (hAdjustment);
 }
 
 /**
@@ -358,8 +358,8 @@ public int getPageIncrement () {
  */
 public int getSelection () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_value (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_value (hAdjustment);
 }
 
 /**
@@ -374,8 +374,8 @@ public int getSelection () {
  */
 public int getThumb () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
-	return (int) OS.gtk_adjustment_get_page_size (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
+	return (int) GTK.gtk_adjustment_get_page_size (hAdjustment);
 }
 
 /**
@@ -420,7 +420,7 @@ public void setIncrement (int value) {
 	checkWidget ();
 	if (value < 1) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_range_set_increments (handle, value, getPageIncrement ());
+	GTK.gtk_range_set_increments (handle, value, getPageIncrement ());
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -439,7 +439,7 @@ public void setIncrement (int value) {
  */
 public void setMaximum (int value) {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
 	GtkAdjustment adjustment = new GtkAdjustment ();
 	gtk_adjustment_get (hAdjustment, adjustment);
 	int minimum = (int) adjustment.lower;
@@ -448,7 +448,7 @@ public void setMaximum (int value) {
 	adjustment.page_size = Math.min ((int)adjustment.page_size, value - minimum);
 	adjustment.value = Math.min ((int)adjustment.value, (int)(value - adjustment.page_size));
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
@@ -469,7 +469,7 @@ public void setMaximum (int value) {
 public void setMinimum (int value) {
 	checkWidget ();
 	if (value < 0) return;
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
 	GtkAdjustment adjustment = new GtkAdjustment ();
 	gtk_adjustment_get (hAdjustment, adjustment);
 	int maximum = (int) adjustment.upper;
@@ -478,7 +478,7 @@ public void setMinimum (int value) {
 	adjustment.page_size = Math.min ((int)adjustment.page_size, maximum - value);
 	adjustment.value = Math.max ((int)adjustment.value, value);
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
@@ -488,7 +488,7 @@ void setOrientation (boolean create) {
 	super.setOrientation (create);
 	if ((style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
 		if ((style & SWT.HORIZONTAL) != 0) {
-			OS.gtk_range_set_inverted (handle, (style & SWT.RIGHT_TO_LEFT) != 0);
+			GTK.gtk_range_set_inverted (handle, (style & SWT.RIGHT_TO_LEFT) != 0);
 		}
 	}
 }
@@ -510,7 +510,7 @@ public void setPageIncrement (int value) {
 	checkWidget ();
 	if (value < 1) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_range_set_increments (handle, getIncrement (), value);
+	GTK.gtk_range_set_increments (handle, getIncrement (), value);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -529,7 +529,7 @@ public void setPageIncrement (int value) {
 public void setSelection (int value) {
 	checkWidget ();
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_range_set_value (handle, value);
+	GTK.gtk_range_set_value (handle, value);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -553,14 +553,14 @@ public void setSelection (int value) {
 public void setThumb (int value) {
 	checkWidget ();
 	if (value < 1) return;
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
 	GtkAdjustment adjustment = new GtkAdjustment ();
 	gtk_adjustment_get (hAdjustment, adjustment);
 	value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower));
 	adjustment.page_size = (double) value;
 	adjustment.value = Math.min ((int)adjustment.value, (int)(adjustment.upper - value));
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
@@ -594,7 +594,7 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
 	if (increment < 1) return;
 	if (pageIncrement < 1) return;
 	thumb = Math.min (thumb, maximum - minimum);
-	long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+	long /*int*/ hAdjustment = GTK.gtk_range_get_adjustment (handle);
 	GtkAdjustment adjustment = new GtkAdjustment ();
 	adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);
 	adjustment.lower = (double) minimum;
@@ -603,27 +603,27 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
 	adjustment.step_increment = (double) increment;
 	adjustment.page_increment = (double) pageIncrement;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	/*
 	 * gtk_adujustment_value_changed is deprecated on GTK3.18+.
 	 * GTK+ will emit "value-changed" itself whenever the value changes.
 	 * See bug 495413.
 	 */
-	if (OS.GTK_VERSION < OS.VERSION(3, 18, 0))
-		OS.gtk_adjustment_value_changed (hAdjustment);
+	if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0))
+		GTK.gtk_adjustment_value_changed (hAdjustment);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
 long /*int*/ gtk_scrollbar_new (int orientation, long /*int*/ adjustment) {
 	long /*int*/ scrollbar = 0;
-	if (OS.GTK3) {
-		scrollbar = OS.gtk_scrollbar_new (orientation, adjustment);
+	if (GTK.GTK3) {
+		scrollbar = GTK.gtk_scrollbar_new (orientation, adjustment);
 	} else {
-		if (orientation == OS.GTK_ORIENTATION_HORIZONTAL) {
-			scrollbar = OS.gtk_hscrollbar_new (adjustment);
+		if (orientation == GTK.GTK_ORIENTATION_HORIZONTAL) {
+			scrollbar = GTK.gtk_hscrollbar_new (adjustment);
 		} else {
-			scrollbar = OS.gtk_vscrollbar_new (adjustment);
+			scrollbar = GTK.gtk_vscrollbar_new (adjustment);
 		}
 	}
 	return scrollbar;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
index 9853b05330..5c783fba4c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
@@ -209,11 +209,11 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
 	int[] w = new int [1], h = new int [1];
-	OS.gtk_widget_realize (handle);
-	long /*int*/ layout = OS.gtk_entry_get_layout (handle);
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	double upper = OS.gtk_adjustment_get_upper (hAdjustment);
-	int digits = OS.gtk_spin_button_get_digits (handle);
+	GTK.gtk_widget_realize (handle);
+	long /*int*/ layout = GTK.gtk_entry_get_layout (handle);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	double upper = GTK.gtk_adjustment_get_upper (hAdjustment);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
 	for (int i = 0; i < digits; i++) upper *= 10;
 	String string = String.valueOf ((int) upper);
 	if (digits > 0) {
@@ -234,11 +234,11 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	C.memmove (buffer2, ptr, length);
 	OS.pango_layout_set_text (layout, buffer1, buffer1.length);
 	int width, height = 0 ;
-	OS.gtk_widget_realize (handle);
-	if (OS.GTK3) {
-		OS.gtk_widget_set_size_request (handle, wHint, hHint);
+	GTK.gtk_widget_realize (handle);
+	if (GTK.GTK3) {
+		GTK.gtk_widget_set_size_request (handle, wHint, hHint);
 		GtkRequisition requisition = new GtkRequisition ();
-		OS.gtk_widget_get_preferred_size (handle, requisition, null);
+		GTK.gtk_widget_get_preferred_size (handle, requisition, null);
 		width = wHint == SWT.DEFAULT ? requisition.width : wHint;
 		height = hHint == SWT.DEFAULT ? requisition.height : hHint;
 	} else {
@@ -256,19 +256,19 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	checkWidget ();
 	int xborder = 0, yborder = 0;
 	Rectangle trim = super.computeTrimInPixels (x, y, width, height);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GtkBorder tmp = new GtkBorder();
-		long /*int*/ context = OS.gtk_widget_get_style_context (handle);
-		if (OS.GTK_VERSION < OS.VERSION(3, 18, 0)) {
-			OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
+		if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0)) {
+			GTK.gtk_style_context_get_padding (context, GTK.GTK_STATE_FLAG_NORMAL, tmp);
 		} else {
-			OS.gtk_style_context_get_padding (context, OS.gtk_widget_get_state_flags(handle), tmp);
+			GTK.gtk_style_context_get_padding (context, GTK.gtk_widget_get_state_flags(handle), tmp);
 		}
 		if ((style & SWT.BORDER) != 0) {
-			if (OS.GTK_VERSION < OS.VERSION(3, 18, 0)) {
-				OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+			if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0)) {
+				GTK.gtk_style_context_get_border (context, GTK.GTK_STATE_FLAG_NORMAL, tmp);
 			} else {
-				OS.gtk_style_context_get_border (context, OS.gtk_widget_get_state_flags(handle), tmp);
+				GTK.gtk_style_context_get_border (context, GTK.gtk_widget_get_state_flags(handle), tmp);
 			}
 			trim.x -= tmp.left;
 			trim.y -= tmp.top;
@@ -288,9 +288,9 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 		trim.width += arrowSize + (2 * thickness.x);
 	}
 	int [] property = new int [1];
-	OS.gtk_widget_style_get (handle, OS.interior_focus, property, 0);
+	GTK.gtk_widget_style_get (handle, OS.interior_focus, property, 0);
 	if (property [0] == 0) {
-		OS.gtk_widget_style_get (handle, OS.focus_line_width, property, 0);
+		GTK.gtk_widget_style_get (handle, OS.focus_line_width, property, 0);
 		xborder += property [0];
 		yborder += property [0];
 	}
@@ -319,7 +319,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
  */
 public void copy () {
 	checkWidget ();
-	OS.gtk_editable_copy_clipboard (handle);
+	GTK.gtk_editable_copy_clipboard (handle);
 }
 
 @Override
@@ -327,23 +327,23 @@ void createHandle (int index) {
 	state |= HANDLE | MENU;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	long /*int*/ adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	long /*int*/ adjustment = GTK.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
 	if (adjustment == 0) error (SWT.ERROR_NO_HANDLES);
-	handle = OS.gtk_spin_button_new (adjustment, climbRate, 0);
+	handle = GTK.gtk_spin_button_new (adjustment, climbRate, 0);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (fixedHandle, handle);
-	OS.gtk_editable_set_editable (handle, (style & SWT.READ_ONLY) == 0);
-	if (OS.GTK_VERSION <= OS.VERSION(3, 20, 0)) {
-		OS.gtk_entry_set_has_frame (handle, (style & SWT.BORDER) != 0);
+	GTK.gtk_container_add (fixedHandle, handle);
+	GTK.gtk_editable_set_editable (handle, (style & SWT.READ_ONLY) == 0);
+	if (GTK.GTK_VERSION <= OS.VERSION(3, 20, 0)) {
+		GTK.gtk_entry_set_has_frame (handle, (style & SWT.BORDER) != 0);
 	}
-	OS.gtk_spin_button_set_wrap (handle, (style & SWT.WRAP) != 0);
-	if (OS.GTK3) {
+	GTK.gtk_spin_button_set_wrap (handle, (style & SWT.WRAP) != 0);
+	if (GTK.GTK3) {
 		imContext = OS.imContextLast();
 	}
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont().handle);
 	}
 }
@@ -362,7 +362,7 @@ void createHandle (int index) {
  */
 public void cut () {
 	checkWidget ();
-	OS.gtk_editable_cut_clipboard (handle);
+	GTK.gtk_editable_cut_clipboard (handle);
 }
 
 @Override
@@ -394,7 +394,7 @@ boolean filterKey (int keyval, long /*int*/ event) {
 		lastEventTime = time;
 		long /*int*/ imContext = imContext ();
 		if (imContext != 0) {
-			return OS.gtk_im_context_filter_keypress (imContext, event);
+			return GTK.gtk_im_context_filter_keypress (imContext, event);
 		}
 	}
 	gdkEventKey = event;
@@ -413,7 +413,7 @@ void fixIM () {
 	if (gdkEventKey != 0 && gdkEventKey != -1) {
 		long /*int*/ imContext = imContext ();
 		if (imContext != 0) {
-			OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
+			GTK.gtk_im_context_filter_keypress (imContext, gdkEventKey);
 			gdkEventKey = -1;
 			return;
 		}
@@ -423,7 +423,7 @@ void fixIM () {
 
 @Override
 GdkColor getBackgroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getBaseGdkColor ();
 }
 
@@ -438,7 +438,7 @@ int getBorderWidthInPixels () {
 
 @Override
 GdkColor getForegroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getTextColor ();
 }
 
@@ -455,9 +455,9 @@ GdkColor getForegroundGdkColor () {
  */
 public int getIncrement () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	int digits = OS.gtk_spin_button_get_digits (handle);
-	double value = OS.gtk_adjustment_get_step_increment (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
+	double value = GTK.gtk_adjustment_get_step_increment (hAdjustment);
 	for (int i = 0; i < digits; i++) value *= 10;
 	return (int) (value > 0 ? value + 0.5 : value - 0.5);
 }
@@ -474,9 +474,9 @@ public int getIncrement () {
  */
 public int getMaximum () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	int digits = OS.gtk_spin_button_get_digits (handle);
-	double value = OS.gtk_adjustment_get_upper (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
+	double value = GTK.gtk_adjustment_get_upper (hAdjustment);
 	for (int i = 0; i < digits; i++) value *= 10;
 	return (int) (value > 0 ? value + 0.5 : value - 0.5);
 }
@@ -493,9 +493,9 @@ public int getMaximum () {
  */
 public int getMinimum () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	int digits = OS.gtk_spin_button_get_digits (handle);
-	double value = OS.gtk_adjustment_get_lower (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
+	double value = GTK.gtk_adjustment_get_lower (hAdjustment);
 	for (int i = 0; i < digits; i++) value *= 10;
 	return (int) (value > 0 ? value + 0.5 : value - 0.5);
 }
@@ -513,9 +513,9 @@ public int getMinimum () {
  */
 public int getPageIncrement () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	int digits = OS.gtk_spin_button_get_digits (handle);
-	double value = OS.gtk_adjustment_get_page_increment (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
+	double value = GTK.gtk_adjustment_get_page_increment (hAdjustment);
 	for (int i = 0; i < digits; i++) value *= 10;
 	return (int) (value > 0 ? value + 0.5 : value - 0.5);
 }
@@ -532,9 +532,9 @@ public int getPageIncrement () {
  */
 public int getSelection () {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	int digits = OS.gtk_spin_button_get_digits (handle);
-	double value = OS.gtk_adjustment_get_value (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
+	double value = GTK.gtk_adjustment_get_value (hAdjustment);
 	for (int i = 0; i < digits; i++) value *= 10;
 	return (int) (value > 0 ? value + 0.5 : value - 0.5);
 }
@@ -555,7 +555,7 @@ public int getSelection () {
  */
 public String getText () {
 	checkWidget ();
-	long /*int*/ str = OS.gtk_entry_get_text (handle);
+	long /*int*/ str = GTK.gtk_entry_get_text (handle);
 	if (str == 0) return "";
 	int length = C.strlen (str);
 	byte [] buffer = new byte [length];
@@ -582,7 +582,7 @@ public String getText () {
  */
 public int getTextLimit () {
 	checkWidget ();
-	int limit = OS.gtk_entry_get_max_length (handle);
+	int limit = GTK.gtk_entry_get_max_length (handle);
 	return limit == 0 ? LIMIT : limit;
 }
 
@@ -598,7 +598,7 @@ public int getTextLimit () {
  */
 public int getDigits () {
 	checkWidget ();
-	return OS.gtk_spin_button_get_digits (handle);
+	return GTK.gtk_spin_button_get_digits (handle);
 }
 
 String getDecimalSeparator () {
@@ -617,18 +617,18 @@ long /*int*/ gtk_activate (long /*int*/ widget) {
 
 @Override
 long /*int*/ gtk_changed (long /*int*/ widget) {
-	long /*int*/ str = OS.gtk_entry_get_text (handle);
+	long /*int*/ str = GTK.gtk_entry_get_text (handle);
 	int length = C.strlen (str);
 	if (length > 0) {
 		long /*int*/ [] endptr = new long /*int*/ [1];
 		double value = OS.g_strtod (str, endptr);
 		int valueLength = (getDigits() == 0) ? String.valueOf((int)value).length() : String.valueOf(value).length();
 		if ((endptr [0] == str + length) && valueLength == length) {
-			long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+			long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
 			GtkAdjustment adjustment = new GtkAdjustment ();
 			gtk_adjustment_get (hAdjustment, adjustment);
 			if (value != adjustment.value && adjustment.lower <= value && value <= adjustment.upper) {
-				OS.gtk_spin_button_update (handle);
+				GTK.gtk_spin_button_update (handle);
 			}
 		}
 	}
@@ -641,7 +641,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) {
 	* is to post the modify event when the user is typing.
 	*/
 	boolean keyPress = false;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventKey gdkEvent = new GdkEventKey ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -663,7 +663,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) {
 @Override
 long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	if (text == 0) return 0;
-	if (!OS.gtk_editable_get_editable (handle)) return 0;
+	if (!GTK.gtk_editable_get_editable (handle)) return 0;
 	int length = C.strlen (text);
 	if (length == 0) return 0;
 	byte [] buffer = new byte [length];
@@ -680,7 +680,7 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	*/
 	fixStart = fixEnd = -1;
 	OS.g_signal_handlers_block_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, COMMIT);
-	int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
+	int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ());
 	int mask =  OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
 	OS.g_signal_handlers_unblock_matched (imContext, mask, id, 0, 0, 0, handle);
 	if (newChars == chars) {
@@ -692,8 +692,8 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	OS.g_signal_handlers_unblock_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, COMMIT);
 	OS.g_signal_handlers_block_matched (imContext, mask, id, 0, 0, 0, handle);
 	if (fixStart != -1 && fixEnd != -1) {
-		OS.gtk_editable_set_position (handle, fixStart);
-		OS.gtk_editable_select_region (handle, fixStart, fixEnd);
+		GTK.gtk_editable_set_position (handle, fixStart);
+		GTK.gtk_editable_select_region (handle, fixStart, fixEnd);
 	}
 	fixStart = fixEnd = -1;
 	return 0;
@@ -702,7 +702,7 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 @Override
 long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {
 	if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
-	long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+	long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 	if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1);
 	int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos);
 	int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos);
@@ -716,10 +716,10 @@ long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long
 			byte [] buffer = Converter.wcsToMbcs (newText, false);
 			OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-			OS.gtk_editable_insert_text (handle, buffer, buffer.length, pos);
+			GTK.gtk_editable_insert_text (handle, buffer, buffer.length, pos);
 			OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
 			OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-			OS.gtk_editable_set_position (handle, pos [0]);
+			GTK.gtk_editable_set_position (handle, pos [0]);
 		}
 	}
 	return 0;
@@ -746,24 +746,24 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /
 	String oldText = new String (Converter.mbcsToWcs (buffer));
 	int [] pos = new int [1];
 	C.memmove (pos, position, 4);
-	long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+	long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 	if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
 	int start = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, pos [0]);
 	String newText = verifyText (oldText, start, start);
 	if (newText != oldText) {
 		int [] newStart = new int [1], newEnd = new int [1];
-		OS.gtk_editable_get_selection_bounds (handle, newStart, newEnd);
+		GTK.gtk_editable_get_selection_bounds (handle, newStart, newEnd);
 		if (newText != null) {
 			if (newStart [0] != newEnd [0]) {
 				OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 				OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_editable_delete_selection (handle);
+				GTK.gtk_editable_delete_selection (handle);
 				OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 				OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			}
 			byte [] buffer3 = Converter.wcsToMbcs (newText, false);
 			OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-			OS.gtk_editable_insert_text (handle, buffer3, buffer3.length, pos);
+			GTK.gtk_editable_insert_text (handle, buffer3, buffer3.length, pos);
 			OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
 			newStart [0] = newEnd [0] = pos [0];
 		}
@@ -790,8 +790,8 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
 @Override
 long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
-		OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
-		OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
+		GTK.gtk_widget_set_direction (menu, GTK.GTK_TEXT_DIR_RTL);
+		GTK.gtk_container_forall (menu, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL);
 	}
 	return 0;
 }
@@ -814,7 +814,7 @@ void hookEvents () {
 	long /*int*/ imContext = imContext ();
 	if (imContext != 0) {
 		OS.g_signal_connect_closure (imContext, OS.commit, display.getClosure (COMMIT), false);
-		int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
+		int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ());
 		int mask =  OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
 		OS.g_signal_handlers_block_matched (imContext, mask, id, 0, 0, 0, handle);
 	}
@@ -822,7 +822,7 @@ void hookEvents () {
 
 long /*int*/ imContext () {
 	if (imContext != 0) return imContext;
-	return OS.GTK_ENTRY_IM_CONTEXT (handle);
+	return GTK.GTK_ENTRY_IM_CONTEXT (handle);
 }
 
 @Override
@@ -848,7 +848,7 @@ long /*int*/ paintWindow () {
  */
 public void paste () {
 	checkWidget ();
-	OS.gtk_editable_paste_clipboard (handle);
+	GTK.gtk_editable_paste_clipboard (handle);
 }
 
 @Override
@@ -939,7 +939,7 @@ void removeVerifyListener (VerifyListener listener) {
 
 @Override
 GdkRGBA getContextBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (background != null && (state & BACKGROUND) != 0) {
 		return background;
 	}
@@ -948,16 +948,16 @@ GdkRGBA getContextBackgroundGdkRGBA () {
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	background = rgba;
 	setBackgroundGradientGdkRGBA (context, handle, rgba);
 }
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
-	OS.gtk_widget_modify_base (handle, 0, color);
+	GTK.gtk_widget_modify_base (handle, 0, color);
 }
 
 @Override
@@ -970,7 +970,7 @@ void setCursor (long /*int*/ cursor) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (handle, color, false);
 }
 
@@ -989,13 +989,13 @@ void setForegroundGdkColor (GdkColor color) {
 public void setIncrement (int value) {
 	checkWidget ();
 	if (value < 1) return;
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	double page_increment = OS.gtk_adjustment_get_page_increment (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	double page_increment = GTK.gtk_adjustment_get_page_increment (hAdjustment);
 	double newValue = value;
-	int digits = OS.gtk_spin_button_get_digits (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
 	for (int i = 0; i < digits; i++) newValue /= 10;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_spin_button_set_increments (handle, newValue, page_increment);
+	GTK.gtk_spin_button_set_increments (handle, newValue, page_increment);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -1014,14 +1014,14 @@ public void setIncrement (int value) {
  */
 public void setMaximum (int value) {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	double lower = OS.gtk_adjustment_get_lower (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	double lower = GTK.gtk_adjustment_get_lower (hAdjustment);
 	double newValue = value;
-	int digits = OS.gtk_spin_button_get_digits (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
 	for (int i = 0; i < digits; i++) newValue /= 10;
 	if (newValue < lower) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_spin_button_set_range (handle, lower, newValue);
+	GTK.gtk_spin_button_set_range (handle, lower, newValue);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -1040,14 +1040,14 @@ public void setMaximum (int value) {
  */
 public void setMinimum (int value) {
 	checkWidget ();
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	double upper = OS.gtk_adjustment_get_upper (hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	double upper = GTK.gtk_adjustment_get_upper (hAdjustment);
 	double newValue = value;
-	int digits = OS.gtk_spin_button_get_digits (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
 	for (int i = 0; i < digits; i++) newValue /= 10;
 	if (newValue > upper) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_spin_button_set_range (handle, newValue, upper);
+	GTK.gtk_spin_button_set_range (handle, newValue, upper);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -1066,13 +1066,13 @@ public void setMinimum (int value) {
 public void setPageIncrement (int value) {
 	checkWidget ();
 	if (value < 1) return;
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-	double step_increment = OS.gtk_adjustment_get_step_increment(hAdjustment);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+	double step_increment = GTK.gtk_adjustment_get_step_increment(hAdjustment);
 	double newValue = value;
-	int digits = OS.gtk_spin_button_get_digits (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
 	for (int i = 0; i < digits; i++) newValue /= 10;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_spin_button_set_increments (handle, step_increment, newValue);
+	GTK.gtk_spin_button_set_increments (handle, step_increment, newValue);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -1092,10 +1092,10 @@ public void setPageIncrement (int value) {
 public void setSelection (int value) {
 	checkWidget ();
 	double newValue = value;
-	int digits = OS.gtk_spin_button_get_digits (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
 	for (int i = 0; i < digits; i++) newValue /= 10;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_spin_button_set_value (handle, newValue);
+	GTK.gtk_spin_button_set_value (handle, newValue);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -1124,7 +1124,7 @@ public void setSelection (int value) {
 public void setTextLimit (int limit) {
 	checkWidget ();
 	if (limit == 0) error (SWT.ERROR_CANNOT_BE_ZERO);
-	OS.gtk_entry_set_max_length (handle, limit);
+	GTK.gtk_entry_set_max_length (handle, limit);
 }
 
 /**
@@ -1150,9 +1150,9 @@ public void setTextLimit (int limit) {
 public void setDigits (int value) {
 	checkWidget ();
 	if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT);
-	int digits = OS.gtk_spin_button_get_digits (handle);
+	int digits = GTK.gtk_spin_button_get_digits (handle);
 	if (value == digits) return;
-	long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+	long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
 	GtkAdjustment adjustment = new GtkAdjustment ();
 	gtk_adjustment_get (hAdjustment, adjustment);
 	int diff = Math.abs (value - digits);
@@ -1173,10 +1173,10 @@ public void setDigits (int value) {
 		adjustment.page_increment /= factor;
 		climbRate /= factor;
 	}
-	OS.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
+	GTK.gtk_adjustment_configure(hAdjustment, adjustment.value, adjustment.lower, adjustment.upper,
 		adjustment.step_increment, adjustment.page_increment, adjustment.page_size);
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
-	OS.gtk_spin_button_configure (handle, hAdjustment, climbRate, value);
+	GTK.gtk_spin_button_configure (handle, hAdjustment, climbRate, value);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -1220,12 +1220,12 @@ public void setValues (int selection, int minimum, int maximum, int digits, int
 	*/
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 	climbRate = 1.0 / factor;
-	long /*int*/ adjustment = OS.gtk_spin_button_get_adjustment(handle);
-	OS.gtk_spin_button_configure (handle, adjustment, climbRate, digits);
+	long /*int*/ adjustment = GTK.gtk_spin_button_get_adjustment(handle);
+	GTK.gtk_spin_button_configure (handle, adjustment, climbRate, digits);
 
-	OS.gtk_spin_button_set_range (handle, minimum / factor, maximum / factor);
-	OS.gtk_spin_button_set_increments (handle, increment / factor, pageIncrement / factor);
-	OS.gtk_spin_button_set_value (handle, selection / factor);
+	GTK.gtk_spin_button_set_range (handle, minimum / factor, maximum / factor);
+	GTK.gtk_spin_button_set_increments (handle, increment / factor, pageIncrement / factor);
+	GTK.gtk_spin_button_set_value (handle, selection / factor);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
 }
 
@@ -1243,7 +1243,7 @@ boolean translateTraversal (GdkEventKey keyEvent) {
 			long /*int*/ imContext =  imContext ();
 			if (imContext != 0) {
 				long /*int*/ [] preeditString = new long /*int*/ [1];
-				OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
+				GTK.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
 				if (preeditString [0] != 0) {
 					int length = C.strlen (preeditString [0]);
 					OS.g_free (preeditString [0]);
@@ -1261,7 +1261,7 @@ String verifyText (String string, int start, int end) {
 	event.text = string;
 	event.start = start;
 	event.end = end;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventKey gdkEvent = new GdkEventKey ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -1273,7 +1273,7 @@ String verifyText (String string, int start, int end) {
 		OS.gdk_event_free (eventPtr);
 	}
 	int index = 0;
-	if (OS.gtk_spin_button_get_digits (handle) > 0) {
+	if (GTK.gtk_spin_button_get_digits (handle) > 0) {
 		String decimalSeparator = getDecimalSeparator ();
 		index = string.indexOf (decimalSeparator);
 		if (index != -1) {
@@ -1282,8 +1282,8 @@ String verifyText (String string, int start, int end) {
 		index = 0;
 	}
 	if (string.length () > 0) {
-		long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
-		double lower = OS.gtk_adjustment_get_lower (hAdjustment);
+		long /*int*/ hAdjustment = GTK.gtk_spin_button_get_adjustment (handle);
+		double lower = GTK.gtk_adjustment_get_lower (hAdjustment);
 		if (lower < 0 && string.charAt (0) == '-') index++;
 	}
 	while (index < string.length ()) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
index f2a1126d30..7e54d4c9db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
@@ -141,10 +141,10 @@ protected void checkSubclass () {
 
 @Override
 long /*int*/ childStyle () {
-	long /*int*/ rcStyle = OS.gtk_widget_get_modifier_style (handle);
-	if ((OS.gtk_rc_style_get_color_flags (rcStyle, 0) & OS.GTK_RC_BG) != 0) return 0;
-	OS.gtk_widget_realize (handle);
-	return OS.gtk_widget_get_style (handle);
+	long /*int*/ rcStyle = GTK.gtk_widget_get_modifier_style (handle);
+	if ((GTK.gtk_rc_style_get_color_flags (rcStyle, 0) & GTK.GTK_RC_BG) != 0) return 0;
+	GTK.gtk_widget_realize (handle);
+	return GTK.gtk_widget_get_style (handle);
 }
 
 /**
@@ -181,7 +181,7 @@ public void addSelectionListener(SelectionListener listener) {
 
 @Override
 long /*int*/ clientHandle () {
-	int index = OS.gtk_notebook_get_current_page (handle);
+	int index = GTK.gtk_notebook_get_current_page (handle);
 	if (index != -1 && items [index] != null) {
 		return items [index].pageHandle;
 	}
@@ -194,13 +194,13 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	Point size = super.computeSizeInPixels (wHint, hHint, changed);
 	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
-	boolean scrollable = OS.gtk_notebook_get_scrollable (handle);
-	OS.gtk_notebook_set_scrollable (handle, false);
+	boolean scrollable = GTK.gtk_notebook_get_scrollable (handle);
+	GTK.gtk_notebook_set_scrollable (handle, false);
 	Point notebookSize = computeNativeSize (handle, wHint, hHint, changed);
-	OS.gtk_notebook_set_scrollable (handle, scrollable);
-	if (OS.GTK_VERSION >= OS.VERSION (3, 2, 0)) {
+	GTK.gtk_notebook_set_scrollable (handle, scrollable);
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 2, 0)) {
 		int[] initialGap = new int[1];
-		OS.gtk_widget_style_get (handle, OS.initial_gap, initialGap, 0);
+		GTK.gtk_widget_style_get (handle, OS.initial_gap, initialGap, 0);
 		notebookSize.x += initialGap[0]*2;
 	}
 	size.x = Math.max (notebookSize.x, size.x);
@@ -214,7 +214,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	forceResize ();
 	long /*int*/ clientHandle = clientHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (clientHandle, allocation);
+	GTK.gtk_widget_get_allocation (clientHandle, allocation);
 	int clientX = allocation.x;
 	int clientY = allocation.y;
 	x -= clientX;
@@ -222,7 +222,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	width +=  clientX + clientX;
 	if ((style & SWT.BOTTOM) != 0) {
 		int clientHeight = allocation.height;
-		OS.gtk_widget_get_allocation (handle, allocation);
+		GTK.gtk_widget_get_allocation (handle, allocation);
 		int parentHeight = allocation.height;
 		height += parentHeight - clientHeight;
 	} else {
@@ -235,7 +235,7 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 Rectangle getClientAreaInPixels () {
 	Rectangle clientRectangle = super.getClientAreaInPixels ();
 
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		/*
 		* Bug 454936 (see also other 454936 references)
 		* SWT's calls to gtk_widget_size_allocate and gtk_widget_set_allocation
@@ -263,14 +263,14 @@ void createHandle (int index) {
 	state |= HANDLE;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	handle = OS.gtk_notebook_new ();
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	handle = GTK.gtk_notebook_new ();
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (fixedHandle, handle);
-	OS.gtk_notebook_set_show_tabs (handle, true);
-	OS.gtk_notebook_set_scrollable (handle, true);
+	GTK.gtk_container_add (fixedHandle, handle);
+	GTK.gtk_notebook_set_show_tabs (handle, true);
+	GTK.gtk_notebook_set_scrollable (handle, true);
 	if ((style & SWT.BOTTOM) != 0) {
-		OS.gtk_notebook_set_tab_pos (handle, OS.GTK_POS_BOTTOM);
+		GTK.gtk_notebook_set_tab_pos (handle, GTK.GTK_POS_BOTTOM);
 	}
 }
 
@@ -281,7 +281,7 @@ void createWidget (int index) {
 }
 
 void createItem (TabItem item, int index) {
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	int itemCount = 0;
 	if (list != 0) {
 		itemCount = OS.g_list_length (list);
@@ -293,22 +293,22 @@ void createItem (TabItem item, int index) {
 		System.arraycopy (items, 0, newItems, 0, items.length);
 		items = newItems;
 	}
-	long /*int*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 0);
+	long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 0);
 	if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
+	long /*int*/ labelHandle = GTK.gtk_label_new_with_mnemonic (null);
 	if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ imageHandle = OS.gtk_image_new ();
+	long /*int*/ imageHandle = GTK.gtk_image_new ();
 	if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (boxHandle, imageHandle);
-	OS.gtk_container_add (boxHandle, labelHandle);
+	GTK.gtk_container_add (boxHandle, imageHandle);
+	GTK.gtk_container_add (boxHandle, labelHandle);
 	long /*int*/ pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
-	OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);
+	GTK.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
-	OS.gtk_widget_show (boxHandle);
-	OS.gtk_widget_show (labelHandle);
-	OS.gtk_widget_show (pageHandle);
+	GTK.gtk_widget_show (boxHandle);
+	GTK.gtk_widget_show (labelHandle);
+	GTK.gtk_widget_show (pageHandle);
 	item.state |= HANDLE;
 	item.handle = boxHandle;
 	item.labelHandle = labelHandle;
@@ -324,7 +324,7 @@ void createItem (TabItem item, int index) {
 	}
 	if (itemCount == 1) {
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
-		OS.gtk_notebook_set_current_page (handle, 0);
+		GTK.gtk_notebook_set_current_page (handle, 0);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
 		Event event = new Event();
 		event.item = items[0];
@@ -341,14 +341,14 @@ void destroyItem (TabItem item) {
 		index++;
 	}
 	if (index == itemCount) error (SWT.ERROR_ITEM_NOT_REMOVED);
-	int oldIndex = OS.gtk_notebook_get_current_page (handle);
+	int oldIndex = GTK.gtk_notebook_get_current_page (handle);
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
-	OS.gtk_notebook_remove_page (handle, index);
+	GTK.gtk_notebook_remove_page (handle, index);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
 	System.arraycopy (items, index + 1, items, index, --itemCount - index);
 	items [itemCount] = null;
 	if (index == oldIndex) {
-		int newIndex = OS.gtk_notebook_get_current_page (handle);
+		int newIndex = GTK.gtk_notebook_get_current_page (handle);
 		if (newIndex != -1) {
 			Control control = items [newIndex].getControl ();
 			if (control != null && !control.isDisposed ()) {
@@ -371,7 +371,7 @@ long /*int*/ eventHandle () {
 @Override
 Control[] _getChildren() {
 	Control [] directChildren = super._getChildren ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		int directCount = directChildren.length;
 		int count = items == null ? 0 : items.length;
 		Control [] children = new Control [count + directCount];
@@ -380,7 +380,7 @@ Control[] _getChildren() {
 			TabItem tabItem = items[j];
 			if (tabItem != null) {
 				long /*int*/ parentHandle = tabItem.pageHandle;
-				long /*int*/ list = OS.gtk_container_get_children (parentHandle);
+				long /*int*/ list = GTK.gtk_container_get_children (parentHandle);
 				if (list != 0) {
 					long /*int*/ handle = OS.g_list_data (list);
 					if (handle != 0) {
@@ -429,7 +429,7 @@ Control[] _getChildren() {
 public TabItem getItem (int index) {
 	checkWidget();
 	if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
 	int itemCount = OS.g_list_length (list);
 	OS.g_list_free (list);
@@ -458,7 +458,7 @@ public TabItem getItem (int index) {
 public TabItem getItem(Point point) {
 	checkWidget();
 	if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) return null;
 	int itemCount = OS.g_list_length (list);
 	OS.g_list_free (list);
@@ -482,7 +482,7 @@ public TabItem getItem(Point point) {
  */
 public int getItemCount () {
 	checkWidget();
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) return 0;
 	int itemCount = OS.g_list_length (list);
 	OS.g_list_free (list);
@@ -531,7 +531,7 @@ public TabItem [] getItems () {
  */
 public TabItem [] getSelection () {
 	checkWidget();
-	int index = OS.gtk_notebook_get_current_page (handle);
+	int index = GTK.gtk_notebook_get_current_page (handle);
 	if (index == -1) return new TabItem [0];
 	return new TabItem [] {items [index]};
 }
@@ -549,7 +549,7 @@ public TabItem [] getSelection () {
  */
 public int getSelectionIndex () {
 	checkWidget();
-	return OS.gtk_notebook_get_current_page (handle);
+	return GTK.gtk_notebook_get_current_page (handle);
 }
 
 @Override
@@ -559,7 +559,7 @@ long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {
 
 @Override
 long /*int*/ gtk_switch_page (long /*int*/ widget, long /*int*/ page, long /*int*/ page_num) {
-	int index = OS.gtk_notebook_get_current_page (handle);
+	int index = GTK.gtk_notebook_get_current_page (handle);
 	if (index != -1) {
 		Control control = items [index].getControl ();
 		if (control != null && !control.isDisposed ()) {
@@ -606,7 +606,7 @@ void hookEvents () {
 public int indexOf (TabItem item) {
 	checkWidget();
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) return -1;
 	int count = OS.g_list_length (list);
 	OS.g_list_free (list);
@@ -624,7 +624,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) {
 		Control child = children [i];
 		int index = 0;
 		int count = 0;
-		long /*int*/ list = OS.gtk_container_get_children (handle);
+		long /*int*/ list = GTK.gtk_container_get_children (handle);
 		if (list != 0) {
 			count = OS.g_list_length (list);
 			OS.g_list_free (list);
@@ -729,7 +729,7 @@ public void removeSelectionListener (SelectionListener listener) {
 @Override
 void reskinChildren (int flags) {
 	if (items != null) {
-		long /*int*/ list = OS.gtk_container_get_children (handle);
+		long /*int*/ list = GTK.gtk_container_get_children (handle);
 		if (list != 0){
 			int count = OS.g_list_length (list);
 			OS.g_list_free (list);
@@ -744,10 +744,10 @@ void reskinChildren (int flags) {
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-    if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+    if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
     	// Form background string
-    	String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "notebook header" : "GtkNotebook.header";
+    	String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "notebook header" : "GtkNotebook.header";
         String css = name + " {background-color: " + display.gtk_rgba_to_css_string (rgba) + ";}";
 
         // Cache background
@@ -757,7 +757,7 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
         String finalCss = display.gtk_css_create_css_color_string (cssBackground, cssForeground, SWT.BACKGROUND);
         gtk_css_provider_load_from_css (context, finalCss);
     } else {
-            OS.gtk_widget_override_background_color (handle, OS.GTK_STATE_FLAG_NORMAL, rgba);
+            GTK.gtk_widget_override_background_color (handle, GTK.GTK_STATE_FLAG_NORMAL, rgba);
     }
 }
 
@@ -790,7 +790,7 @@ void setFontDescription (long /*int*/ font) {
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setForegroundGdkRGBA(rgba);
 	TabItem [] items = getItems ();
 	for (int i = 0; i < items.length; i++) {
@@ -802,7 +802,7 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setForegroundGdkColor (color);
 	TabItem [] items = getItems ();
 	for (int i = 0; i < items.length; i++) {
@@ -843,7 +843,7 @@ public void setSelection (int index) {
 
 void setSelection (int index, boolean notify) {
 	if (index < 0) return;
-	int oldIndex = OS.gtk_notebook_get_current_page (handle);
+	int oldIndex = GTK.gtk_notebook_get_current_page (handle);
 	if (oldIndex == index) return;
 	if (oldIndex != -1) {
 		TabItem item = items [oldIndex];
@@ -853,9 +853,9 @@ void setSelection (int index, boolean notify) {
 		}
 	}
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
-	OS.gtk_notebook_set_current_page (handle, index);
+	GTK.gtk_notebook_set_current_page (handle, index);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
-	int newIndex = OS.gtk_notebook_get_current_page (handle);
+	int newIndex = GTK.gtk_notebook_get_current_page (handle);
 	if (newIndex != -1) {
 		TabItem item = items [newIndex];
 		Control control = item.control;
@@ -924,9 +924,9 @@ public void setSelection (TabItem [] items) {
 @Override
 boolean traversePage (final boolean next) {
 	if (next) {
-		OS.gtk_notebook_next_page (handle);
+		GTK.gtk_notebook_next_page (handle);
 	} else {
-		OS.gtk_notebook_prev_page (handle);
+		GTK.gtk_notebook_prev_page (handle);
 	}
 	return true;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
index 1a43a4a2be..208a373b8c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java
@@ -160,7 +160,7 @@ public Rectangle getBounds () {
 Rectangle getBoundsInPixels () {
 	checkWidget();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -244,7 +244,7 @@ void register () {
 
 @Override
 void release (boolean destroy) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		//Since controls are now nested under the tabItem,
 		//tabItem is responsible for it's release.
 		if (control != null && !control.isDisposed ()) {
@@ -292,9 +292,9 @@ public void setControl (Control control) {
 		if (control.parent != parent) error (SWT.ERROR_INVALID_PARENT);
 	}
 
-	if (control != null && OS.GTK3) {
+	if (control != null && GTK.GTK3) {
 		// See implementation note about bug 454936 at the start of TabFolder.
-		OS.gtk_widget_reparent (control.topHandle (), pageHandle);
+		GTK.gtk_widget_reparent (control.topHandle (), pageHandle);
 	}
 
 	Control oldControl = this.control, newControl = control;
@@ -325,27 +325,27 @@ void setFontDescription (long /*int*/ font) {
 }
 
 void setForegroundRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	setForegroundGdkRGBA (labelHandle, rgba);
 	setForegroundGdkRGBA (imageHandle, rgba);
 }
 
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	/* Don't set the color in vbox handle (it doesn't draw) */
 	setForegroundColor (labelHandle, color, false);
 	setForegroundColor (imageHandle, color, false);
 }
 
 void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	GdkRGBA toSet = new GdkRGBA();
 	if (rgba != null) {
 		toSet = rgba;
 	} else {
 		toSet = display.COLOR_WIDGET_FOREGROUND_RGBA;
 	}
-	long /*int*/ context = OS.gtk_widget_get_style_context (handle);
+	long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
 	// Form foreground string
 	String color = display.gtk_rgba_to_css_string(toSet);
 	String css = "* {color: " + color + ";}";
@@ -359,11 +359,11 @@ void gtk_css_provider_load_from_css (long /*int*/ context, String css) {
 	/* Utility function. */
 	//@param css : a 'css java' string like "{\nbackground: red;\n}".
 	if (provider == 0) {
-		provider = OS.gtk_css_provider_new ();
-		OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+		provider = GTK.gtk_css_provider_new ();
+		GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 		OS.g_object_unref (provider);
 	}
-	OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
+	GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
 }
 
 @Override
@@ -381,21 +381,21 @@ public void setImage (Image image) {
 		}
 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
 		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-		OS.gtk_widget_show (imageHandle);
+		GTK.gtk_widget_show (imageHandle);
 	} else {
 		gtk_image_set_from_pixbuf (imageHandle, 0);
-		OS.gtk_widget_hide (imageHandle);
+		GTK.gtk_widget_hide (imageHandle);
 	}
 }
 
 @Override
 void setOrientation (boolean create) {
 	if ((parent.style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		if (handle != 0) OS.gtk_widget_set_direction (handle, dir);
-		if (labelHandle != 0) OS.gtk_widget_set_direction (labelHandle, dir);
-		if (imageHandle != 0) OS.gtk_widget_set_direction (imageHandle, dir);
-		if (pageHandle != 0) OS.gtk_widget_set_direction (pageHandle, dir);
+		int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		if (handle != 0) GTK.gtk_widget_set_direction (handle, dir);
+		if (labelHandle != 0) GTK.gtk_widget_set_direction (labelHandle, dir);
+		if (imageHandle != 0) GTK.gtk_widget_set_direction (imageHandle, dir);
+		if (pageHandle != 0) GTK.gtk_widget_set_direction (pageHandle, dir);
 	}
 }
 
@@ -432,11 +432,11 @@ public void setText (String string) {
 	super.setText (string);
 	char [] chars = fixMnemonic (string);
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+	GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	if (string.length () != 0) {
-		OS.gtk_widget_show (labelHandle);
+		GTK.gtk_widget_show (labelHandle);
 	} else {
-		OS.gtk_widget_hide (labelHandle);
+		GTK.gtk_widget_hide (labelHandle);
 	}
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
index 4bd5b07817..ad4f8f2e9b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -183,16 +183,16 @@ static int checkStyle (int style) {
 @Override
 long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) {
 	if (cell == ignoreCell) return 0;
-	long /*int*/ path = OS.gtk_tree_model_get_path (tree_model, iter);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (tree_model, iter);
 	int [] index = new int [1];
-	C.memmove (index, OS.gtk_tree_path_get_indices (path), 4);
+	C.memmove (index, GTK.gtk_tree_path_get_indices (path), 4);
 	TableItem item = _getItem (index[0]);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);
-	boolean isPixbuf = OS.GTK_IS_CELL_RENDERER_PIXBUF (cell);
-	boolean isText = OS.GTK_IS_CELL_RENDERER_TEXT (cell);
-	if (isText && OS.GTK3) {
-		OS.gtk_cell_renderer_set_fixed_size (cell, -1, -1);
+	boolean isPixbuf = GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell);
+	boolean isText = GTK.GTK_IS_CELL_RENDERER_TEXT (cell);
+	if (isText && GTK.GTK3) {
+		GTK.gtk_cell_renderer_set_fixed_size (cell, -1, -1);
 	}
 	if (!(isPixbuf || isText)) return 0;
 	int modelIndex = -1;
@@ -219,11 +219,11 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 	if (setData) {
 		ptr [0] = 0;
 		if (isPixbuf) {
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_PIXBUF, ptr, -1);
-			OS.g_object_set (cell, OS.GTK3 ? OS.gicon : OS.pixbuf, ptr [0], 0);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_PIXBUF, ptr, -1);
+			OS.g_object_set (cell, GTK.GTK3 ? OS.gicon : OS.pixbuf, ptr [0], 0);
 			if (ptr [0] != 0) OS.g_object_unref (ptr [0]);
 		} else {
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_TEXT, ptr, -1);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_TEXT, ptr, -1);
 			if (ptr [0] != 0) {
 				OS.g_object_set (cell, OS.text, ptr [0], 0);
 				OS.g_free (ptr [0]);
@@ -233,9 +233,9 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 	if (customDraw) {
 		if (!ownerDraw) {
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_BACKGROUND, ptr, -1);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_BACKGROUND, ptr, -1);
 			if (ptr [0] != 0) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					OS.g_object_set (cell, OS.cell_background_rgba, ptr[0], 0);
 					OS.gdk_rgba_free (ptr [0]);
 				} else {
@@ -246,9 +246,9 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 		}
 		if (!isPixbuf) {
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FOREGROUND, ptr, -1);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FOREGROUND, ptr, -1);
 			if (ptr [0] != 0) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					OS.g_object_set (cell, OS.foreground_rgba, ptr [0], 0);
 					OS.gdk_rgba_free (ptr [0]);
 				} else {
@@ -257,7 +257,7 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 				}
 			}
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FONT, ptr, -1);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FONT, ptr, -1);
 			if (ptr [0] != 0) {
 				OS.g_object_set (cell, OS.font_desc, ptr [0], 0);
 				OS.pango_font_description_free (ptr [0]);
@@ -280,7 +280,7 @@ boolean checkData (TableItem item) {
 		event.item = item;
 		event.index = indexOf (item);
 		int mask = OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
-		int signal_id = OS.g_signal_lookup (OS.row_changed, OS.gtk_tree_model_get_type ());
+		int signal_id = OS.g_signal_lookup (OS.row_changed, GTK.gtk_tree_model_get_type ());
 		OS.g_signal_handlers_block_matched (modelHandle, mask, signal_id, 0, 0, 0, handle);
 		currentItem = item;
 		sendEvent (SWT.SetData, event);
@@ -334,7 +334,7 @@ public void addSelectionListener (SelectionListener listener) {
 }
 
 int calculateWidth (long /*int*/ column, long /*int*/ iter) {
-	OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
+	GTK.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
 
 	/*
 	* Bug in GTK.  The width calculated by gtk_tree_view_column_cell_get_size()
@@ -343,16 +343,16 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter) {
 	*/
 
 	//This workaround is causing the problem Bug 459834 in GTK3. So reverting the workaround for GTK3
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		int [] width = new int [1];
-		OS.gtk_tree_view_column_cell_get_size (column, null, null, null, width, null);
+		GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, width, null);
 		return width [0];
 	} else {
 		int width = 0;
 		int [] w = new int [1];
-		OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
+		GTK.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
 		width += 2 * w [0];
-		long /*int*/ list = OS.gtk_cell_layout_get_cells(column);
+		long /*int*/ list = GTK.gtk_cell_layout_get_cells(column);
 		if (list == 0) return 0;
 		long /*int*/ temp = list;
 		while (temp != 0) {
@@ -364,8 +364,8 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter) {
 			temp = OS.g_list_next (temp);
 		}
 		OS.g_list_free (list);
-		if (OS.gtk_tree_view_get_grid_lines(handle) > OS.GTK_TREE_VIEW_GRID_LINES_NONE) {
-			OS.gtk_widget_style_get (handle, OS.grid_line_width, w, 0) ;
+		if (GTK.gtk_tree_view_get_grid_lines(handle) > GTK.GTK_TREE_VIEW_GRID_LINES_NONE) {
+			GTK.gtk_widget_style_get (handle, OS.grid_line_width, w, 0) ;
 			width += 2 * w [0];
 		}
 		return width;
@@ -508,7 +508,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
 	Point size = computeNativeSize (handle, wHint, hHint, changed);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		/*
 		 * In GTK 3, computeNativeSize(..) sometimes just returns the header
 		 * height as height. In that case, calculate the table height based on
@@ -543,7 +543,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 void createColumn (TableColumn column, int index) {
 	int modelIndex = FIRST_COLUMN;
 	if (columnCount != 0) {
-		int modelLength = OS.gtk_tree_model_get_n_columns (modelHandle);
+		int modelLength = GTK.gtk_tree_model_get_n_columns (modelHandle);
 		boolean [] usedColumns = new boolean [modelLength];
 		for (int i=0; i<columnCount; i++) {
 			int columnIndex = columns [i].modelIndex;
@@ -558,27 +558,27 @@ void createColumn (TableColumn column, int index) {
 		if (modelIndex == modelLength) {
 			long /*int*/ oldModel = modelHandle;
 			long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
-			long /*int*/ newModel = OS.gtk_list_store_newv (types.length, types);
+			long /*int*/ newModel = GTK.gtk_list_store_newv (types.length, types);
 			if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
 			long /*int*/ [] ptr = new long /*int*/ [1];
 			int [] ptr1 = new int [1];
 			for (int i=0; i<itemCount; i++) {
-				long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+				long /*int*/ newItem = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 				if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
-				OS.gtk_list_store_append (newModel, newItem);
+				GTK.gtk_list_store_append (newModel, newItem);
 				TableItem item = items [i];
 				if (item != null) {
 					long /*int*/ oldItem = item.handle;
 					/* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
 					for (int j=0; j<FOREGROUND_COLUMN; j++) {
-						OS.gtk_tree_model_get (oldModel, oldItem, j, ptr1, -1);
-						OS.gtk_list_store_set (newModel, newItem, j, ptr1 [0], -1);
+						GTK.gtk_tree_model_get (oldModel, oldItem, j, ptr1, -1);
+						GTK.gtk_list_store_set (newModel, newItem, j, ptr1 [0], -1);
 					}
 					for (int j=FOREGROUND_COLUMN; j<modelLength; j++) {
-						OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
-						OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
+						GTK.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
+						GTK.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
 						if (ptr [0] != 0) {
-							if (OS.GTK3) {
+							if (GTK.GTK3) {
 								if (types[j] == OS.GDK_TYPE_RGBA()) {
 									OS.gdk_rgba_free(ptr[0]);
 								}
@@ -596,18 +596,18 @@ void createColumn (TableColumn column, int index) {
 							}
 						}
 					}
-					OS.gtk_list_store_remove (oldModel, oldItem);
+					GTK.gtk_list_store_remove (oldModel, oldItem);
 					OS.g_free (oldItem);
 					item.handle = newItem;
 				} else {
 					OS.g_free (newItem);
 				}
 			}
-			OS.gtk_tree_view_set_model (handle, newModel);
+			GTK.gtk_tree_view_set_model (handle, newModel);
 			setModel (newModel);
 		}
 	}
-	long /*int*/ columnHandle = OS.gtk_tree_view_column_new ();
+	long /*int*/ columnHandle = GTK.gtk_tree_view_column_new ();
 	if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	if (index == 0 && columnCount > 0) {
 		TableColumn checkColumn = columns [0];
@@ -615,30 +615,30 @@ void createColumn (TableColumn column, int index) {
 	}
 	createRenderers (columnHandle, modelIndex, index == 0, column == null ? 0 : column.style);
 	if ((style & SWT.VIRTUAL) == 0 && columnCount == 0) {
-		OS.gtk_tree_view_column_set_sizing (columnHandle, OS.GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+		GTK.gtk_tree_view_column_set_sizing (columnHandle, GTK.GTK_TREE_VIEW_COLUMN_GROW_ONLY);
 	} else {
-		OS.gtk_tree_view_column_set_sizing (columnHandle, OS.GTK_TREE_VIEW_COLUMN_FIXED);
+		GTK.gtk_tree_view_column_set_sizing (columnHandle, GTK.GTK_TREE_VIEW_COLUMN_FIXED);
 	}
-	OS.gtk_tree_view_column_set_resizable (columnHandle, true);
-	OS.gtk_tree_view_column_set_clickable (columnHandle, true);
-	OS.gtk_tree_view_column_set_min_width (columnHandle, 0);
-	OS.gtk_tree_view_insert_column (handle, columnHandle, index);
+	GTK.gtk_tree_view_column_set_resizable (columnHandle, true);
+	GTK.gtk_tree_view_column_set_clickable (columnHandle, true);
+	GTK.gtk_tree_view_column_set_min_width (columnHandle, 0);
+	GTK.gtk_tree_view_insert_column (handle, columnHandle, index);
 	/*
 	* Bug in GTK3.  The column header has the wrong CSS styling if it is hidden
 	* when inserting to the tree widget.  The fix is to hide the column only
 	* after it is inserted.
 	*/
-	if (columnCount != 0) OS.gtk_tree_view_column_set_visible (columnHandle, false);
+	if (columnCount != 0) GTK.gtk_tree_view_column_set_visible (columnHandle, false);
 	if (column != null) {
 		column.handle = columnHandle;
 		column.modelIndex = modelIndex;
 	}
 	if (!searchEnabled ()) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	} else {
 		/* Set the search column whenever the model changes */
 		int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex;
-		OS.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
+		GTK.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
 	}
 }
 
@@ -647,31 +647,31 @@ void createHandle (int index) {
 	state |= HANDLE;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	scrolledHandle = GTK.gtk_scrolled_window_new (0, 0);
 	if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	long /*int*/ [] types = getColumnTypes (1);
-	modelHandle = OS.gtk_list_store_newv (types.length, types);
+	modelHandle = GTK.gtk_list_store_newv (types.length, types);
 	if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	handle = OS.gtk_tree_view_new_with_model (modelHandle);
+	handle = GTK.gtk_tree_view_new_with_model (modelHandle);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 	if ((style & SWT.CHECK) != 0) {
-		checkRenderer = OS.gtk_cell_renderer_toggle_new ();
+		checkRenderer = GTK.gtk_cell_renderer_toggle_new ();
 		if (checkRenderer == 0) error (SWT.ERROR_NO_HANDLES);
 		OS.g_object_ref (checkRenderer);
 	}
 	createColumn (null, 0);
-	OS.gtk_container_add (fixedHandle, scrolledHandle);
-	OS.gtk_container_add (scrolledHandle, handle);
-
-	int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
-	long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
-	OS.gtk_tree_selection_set_mode (selectionHandle, mode);
-	OS.gtk_tree_view_set_headers_visible (handle, false);
-	int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-	int vsp = (style & SWT.V_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-	OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
-	if ((style & SWT.BORDER) != 0) OS.gtk_scrolled_window_set_shadow_type (scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
+	GTK.gtk_container_add (fixedHandle, scrolledHandle);
+	GTK.gtk_container_add (scrolledHandle, handle);
+
+	int mode = (style & SWT.MULTI) != 0 ? GTK.GTK_SELECTION_MULTIPLE : GTK.GTK_SELECTION_BROWSE;
+	long /*int*/ selectionHandle = GTK.gtk_tree_view_get_selection (handle);
+	GTK.gtk_tree_selection_set_mode (selectionHandle, mode);
+	GTK.gtk_tree_view_set_headers_visible (handle, false);
+	int hsp = (style & SWT.H_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER;
+	int vsp = (style & SWT.V_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER;
+	GTK.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
+	if ((style & SWT.BORDER) != 0) GTK.gtk_scrolled_window_set_shadow_type (scrolledHandle, GTK.GTK_SHADOW_ETCHED_IN);
 	/*
 	 * We enable fixed-height-mode for performance reasons (see bug 490203).
 	 */
@@ -679,16 +679,16 @@ void createHandle (int index) {
 		OS.g_object_set (handle, OS.fixed_height_mode, true, 0);
 	}
 	if (!searchEnabled ()) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	}
 }
 
 void createItem (TableColumn column, int index) {
 	if (!(0 <= index && index <= columnCount)) error (SWT.ERROR_INVALID_RANGE);
 	if (columnCount == 0) {
-		column.handle = OS.gtk_tree_view_get_column (handle, 0);
-		OS.gtk_tree_view_column_set_sizing (column.handle, OS.GTK_TREE_VIEW_COLUMN_FIXED);
-		OS.gtk_tree_view_column_set_visible (column.handle, false);
+		column.handle = GTK.gtk_tree_view_get_column (handle, 0);
+		GTK.gtk_tree_view_column_set_sizing (column.handle, GTK.GTK_TREE_VIEW_COLUMN_FIXED);
+		GTK.gtk_tree_view_column_set_visible (column.handle, false);
 		column.modelIndex = FIRST_COLUMN;
 		createRenderers (column.handle, column.modelIndex, true, column.style);
 		column.customDraw = firstCustomDraw;
@@ -696,29 +696,29 @@ void createItem (TableColumn column, int index) {
 	} else {
 		createColumn (column, index);
 	}
-	long /*int*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 3);
+	long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 3);
 	if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
+	long /*int*/ labelHandle = GTK.gtk_label_new_with_mnemonic (null);
 	if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ imageHandle = OS.gtk_image_new ();
+	long /*int*/ imageHandle = GTK.gtk_image_new ();
 	if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (boxHandle, imageHandle);
-	OS.gtk_container_add (boxHandle, labelHandle);
-	OS.gtk_widget_show (boxHandle);
-	OS.gtk_widget_show (labelHandle);
+	GTK.gtk_container_add (boxHandle, imageHandle);
+	GTK.gtk_container_add (boxHandle, labelHandle);
+	GTK.gtk_widget_show (boxHandle);
+	GTK.gtk_widget_show (labelHandle);
 	column.labelHandle = labelHandle;
 	column.imageHandle = imageHandle;
-	OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
-	if (OS.GTK3) {
-		column.buttonHandle = OS.gtk_tree_view_column_get_button(column.handle);
+	GTK.gtk_tree_view_column_set_widget (column.handle, boxHandle);
+	if (GTK.GTK3) {
+		column.buttonHandle = GTK.gtk_tree_view_column_get_button(column.handle);
 	} else {
-		long /*int*/ widget = OS.gtk_widget_get_parent (boxHandle);
+		long /*int*/ widget = GTK.gtk_widget_get_parent (boxHandle);
 		while (widget != handle) {
-			if (OS.GTK_IS_BUTTON (widget)) {
+			if (GTK.GTK_IS_BUTTON (widget)) {
 				column.buttonHandle = widget;
 				break;
 			}
-			widget = OS.gtk_widget_get_parent (widget);
+			widget = GTK.gtk_widget_get_parent (widget);
 		}
 	}
 	if (columnCount == columns.length) {
@@ -773,50 +773,50 @@ void createItem (TableItem item, int index) {
 		System.arraycopy (items, 0, newItems, 0, items.length);
 		items = newItems;
 	}
-	item.handle = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	item.handle = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (item.handle == 0) error (SWT.ERROR_NO_HANDLES);
 	/*
 	* Feature in GTK.  It is much faster to append to a list store
 	* than to insert at the end using gtk_list_store_insert().
 	*/
 	if (index == itemCount) {
-		OS.gtk_list_store_append (modelHandle, item.handle);
+		GTK.gtk_list_store_append (modelHandle, item.handle);
 	} else {
-		OS.gtk_list_store_insert (modelHandle, item.handle, index);
+		GTK.gtk_list_store_insert (modelHandle, item.handle, index);
 	}
 	System.arraycopy (items, index, items, index + 1, itemCount++ - index);
 	items [index] = item;
 }
 
 void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) {
-	OS.gtk_tree_view_column_clear (columnHandle);
+	GTK.gtk_tree_view_column_clear (columnHandle);
 	if ((style & SWT.CHECK) != 0 && check) {
-		OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-		OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.active, CHECKED_COLUMN);
-		OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.inconsistent, GRAYED_COLUMN);
+		GTK.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
+		GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.active, CHECKED_COLUMN);
+		GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.inconsistent, GRAYED_COLUMN);
 		if (ownerDraw) {
-			OS.gtk_tree_view_column_set_cell_data_func (columnHandle, checkRenderer, display.cellDataProc, handle, 0);
+			GTK.gtk_tree_view_column_set_cell_data_func (columnHandle, checkRenderer, display.cellDataProc, handle, 0);
 			OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
 		} else {
-			if (OS.GTK3) {
-				OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
+			if (GTK.GTK3) {
+				GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
 			} else {
-				OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+				GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
 			}
 		}
 	}
-	long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();
+	long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : GTK.gtk_cell_renderer_pixbuf_new ();
 	if (pixbufRenderer == 0) {
 		error (SWT.ERROR_NO_HANDLES);
 	} else {
 		// set default size this size is used for calculating the icon and text positions in a table
-		if ((!ownerDraw) && (OS.GTK3)) {
+		if ((!ownerDraw) && (GTK.GTK3)) {
 			// Set render size to 0x0 until we actually add images, fix for
 			// Bug 457196 (this applies to Tables as well).
-			OS.gtk_cell_renderer_set_fixed_size(pixbufRenderer, 0, 0);
+			GTK.gtk_cell_renderer_set_fixed_size(pixbufRenderer, 0, 0);
 		}
 	}
-	long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();
+	long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : GTK.gtk_cell_renderer_text_new ();
 	if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
 
 	if (ownerDraw) {
@@ -831,24 +831,24 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check,
 	* to be activatable.
 	*/
 	if ((style & SWT.CHECK) != 0 && check) {
-		OS.g_object_set (pixbufRenderer, OS.mode, OS.GTK_CELL_RENDERER_MODE_ACTIVATABLE, 0);
+		OS.g_object_set (pixbufRenderer, OS.mode, GTK.GTK_CELL_RENDERER_MODE_ACTIVATABLE, 0);
 	}
 
 	/* Set alignment */
 	if ((columnStyle & SWT.RIGHT) != 0) {
 		OS.g_object_set(textRenderer, OS.xalign, 1f, 0);
-		OS.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
-		OS.gtk_tree_view_column_pack_end (columnHandle, pixbufRenderer, false);
-		OS.gtk_tree_view_column_set_alignment (columnHandle, 1f);
+		GTK.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
+		GTK.gtk_tree_view_column_pack_end (columnHandle, pixbufRenderer, false);
+		GTK.gtk_tree_view_column_set_alignment (columnHandle, 1f);
 	} else if ((columnStyle & SWT.CENTER) != 0) {
 		OS.g_object_set(textRenderer, OS.xalign, 0.5f, 0);
-		OS.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
-		OS.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
-		OS.gtk_tree_view_column_set_alignment (columnHandle, 0.5f);
+		GTK.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
+		GTK.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
+		GTK.gtk_tree_view_column_set_alignment (columnHandle, 0.5f);
 	} else {
-		OS.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
-		OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
-		OS.gtk_tree_view_column_set_alignment (columnHandle, 0f);
+		GTK.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
+		GTK.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
+		GTK.gtk_tree_view_column_set_alignment (columnHandle, 0f);
 	}
 
 	/* Add attributes */
@@ -857,23 +857,23 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check,
 	 * no images. Fix for Bug 457196. NOTE: this change has been ported to Tables since Tables/Trees both
 	 * use the same underlying GTK structure.
 	 */
-	OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.pixbuf, modelIndex + CELL_PIXBUF);
+	GTK.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.pixbuf, modelIndex + CELL_PIXBUF);
 	if (!ownerDraw) {
-		if (OS.GTK3) {
-			OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
-			OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
+		if (GTK.GTK3) {
+			GTK.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
+			GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
 		} else {
-			OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
-			OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+			GTK.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+			GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
 		}
 	}
-	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, modelIndex + CELL_TEXT);
-	if (OS.GTK3) {
-		OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_rgba, FOREGROUND_COLUMN);
+	GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, modelIndex + CELL_TEXT);
+	if (GTK.GTK3) {
+		GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_rgba, FOREGROUND_COLUMN);
 	} else {
-		OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_gdk, FOREGROUND_COLUMN);
+		GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_gdk, FOREGROUND_COLUMN);
 	}
-	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.font_desc, FONT_COLUMN);
+	GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.font_desc, FONT_COLUMN);
 
 	boolean customDraw = firstCustomDraw;
 	if (columnCount != 0) {
@@ -885,8 +885,8 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check,
 		}
 	}
 	if ((style & SWT.VIRTUAL) != 0 || customDraw || ownerDraw) {
-		OS.gtk_tree_view_column_set_cell_data_func (columnHandle, textRenderer, display.cellDataProc, handle, 0);
-		OS.gtk_tree_view_column_set_cell_data_func (columnHandle, pixbufRenderer, display.cellDataProc, handle, 0);
+		GTK.gtk_tree_view_column_set_cell_data_func (columnHandle, textRenderer, display.cellDataProc, handle, 0);
+		GTK.gtk_tree_view_column_set_cell_data_func (columnHandle, pixbufRenderer, display.cellDataProc, handle, 0);
 	}
 }
 
@@ -898,7 +898,7 @@ void createWidget (int index) {
 	itemCount = columnCount = 0;
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont().handle);
 	}
 }
@@ -916,7 +916,7 @@ GdkRGBA defaultBackground () {
 @Override
 void deregister () {
 	super.deregister ();
-	display.removeWidget (OS.gtk_tree_view_get_selection (handle));
+	display.removeWidget (GTK.gtk_tree_view_get_selection (handle));
 	if (checkRenderer != 0) display.removeWidget (checkRenderer);
 	display.removeWidget (modelHandle);
 }
@@ -937,9 +937,9 @@ public void deselect (int index) {
 	checkWidget();
 	if (index < 0 || index >= itemCount) return;
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
+	GTK.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
 }
@@ -962,11 +962,11 @@ public void deselect (int index) {
 public void deselect (int start, int end) {
 	checkWidget();
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=start; index<=end; index++) {
 		if (index < 0 || index >= itemCount) continue;
-		OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
+		GTK.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
@@ -993,12 +993,12 @@ public void deselect (int [] indices) {
 	checkWidget();
 	if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int i=0; i<indices.length; i++) {
 		int index = indices[i];
 		if (index < 0 || index >= itemCount) continue;
-		OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
+		GTK.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
@@ -1015,9 +1015,9 @@ public void deselect (int [] indices) {
 public void deselectAll () {
 	checkWidget();
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_unselect_all (selection);
+	GTK.gtk_tree_selection_unselect_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
 }
@@ -1035,32 +1035,32 @@ void destroyItem (TableColumn column) {
 	}
 	System.arraycopy (columns, index + 1, columns, index, --columnCount - index);
 	columns [columnCount] = null;
-	OS.gtk_tree_view_remove_column (handle, columnHandle);
+	GTK.gtk_tree_view_remove_column (handle, columnHandle);
 	if (columnCount == 0) {
 		long /*int*/ oldModel = modelHandle;
 		long /*int*/[] types = getColumnTypes (1);
-		long /*int*/ newModel = OS.gtk_list_store_newv (types.length, types);
+		long /*int*/ newModel = GTK.gtk_list_store_newv (types.length, types);
 		if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
 		long /*int*/ [] ptr = new long /*int*/ [1];
 		int [] ptr1 = new int [1];
 		for (int i=0; i<itemCount; i++) {
-			long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+			long /*int*/ newItem = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 			if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
-			OS.gtk_list_store_append (newModel, newItem);
+			GTK.gtk_list_store_append (newModel, newItem);
 			TableItem item = items [i];
 			if (item != null) {
 				long /*int*/ oldItem = item.handle;
 				/* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
 				for (int j=0; j<FOREGROUND_COLUMN; j++) {
-					OS.gtk_tree_model_get (oldModel, oldItem, j, ptr1, -1);
-					OS.gtk_list_store_set (newModel, newItem, j, ptr1 [0], -1);
+					GTK.gtk_tree_model_get (oldModel, oldItem, j, ptr1, -1);
+					GTK.gtk_list_store_set (newModel, newItem, j, ptr1 [0], -1);
 				}
 				for (int j=FOREGROUND_COLUMN; j<FIRST_COLUMN; j++) {
-					OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
-					OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
+					GTK.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
+					GTK.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
 					if (ptr [0] != 0) {
 						if (j == FOREGROUND_COLUMN || j == BACKGROUND_COLUMN) {
-							if (OS.GTK3) {
+							if (GTK.GTK3) {
 								OS.gdk_rgba_free (ptr [0]);
 							} else {
 								OS.gdk_color_free (ptr [0]);
@@ -1070,41 +1070,41 @@ void destroyItem (TableColumn column) {
 						}
 					}
 				}
-				OS.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_PIXBUF, ptr, -1);
-				OS.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_PIXBUF, ptr [0], -1);
+				GTK.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_PIXBUF, ptr, -1);
+				GTK.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_PIXBUF, ptr [0], -1);
 				if (ptr [0] != 0) OS.g_object_unref (ptr [0]);
-				OS.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_TEXT, ptr, -1);
-				OS.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_TEXT, ptr [0], -1);
+				GTK.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_TEXT, ptr, -1);
+				GTK.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_TEXT, ptr [0], -1);
 				OS.g_free (ptr [0]);
-				OS.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_FOREGROUND, ptr, -1);
-				OS.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_FOREGROUND, ptr [0], -1);
+				GTK.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_FOREGROUND, ptr, -1);
+				GTK.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_FOREGROUND, ptr [0], -1);
 				if (ptr [0] != 0) {
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						OS.gdk_rgba_free (ptr [0]);
 					} else {
 						OS.gdk_color_free (ptr [0]);
 					}
 				}
-				OS.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_BACKGROUND, ptr, -1);
-				OS.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_BACKGROUND, ptr [0], -1);
+				GTK.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_BACKGROUND, ptr, -1);
+				GTK.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_BACKGROUND, ptr [0], -1);
 				if (ptr [0] != 0) {
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						OS.gdk_rgba_free (ptr [0]);
 					} else {
 						OS.gdk_color_free (ptr [0]);
 					}
 				}
-				OS.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_FONT, ptr, -1);
-				OS.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_FONT, ptr [0], -1);
+				GTK.gtk_tree_model_get (oldModel, oldItem, column.modelIndex + CELL_FONT, ptr, -1);
+				GTK.gtk_list_store_set (newModel, newItem, FIRST_COLUMN + CELL_FONT, ptr [0], -1);
 				if (ptr [0] != 0) OS.pango_font_description_free (ptr [0]);
-				OS.gtk_list_store_remove (oldModel, oldItem);
+				GTK.gtk_list_store_remove (oldModel, oldItem);
 				OS.g_free (oldItem);
 				item.handle = newItem;
 			} else {
 				OS.g_free (newItem);
 			}
 		}
-		OS.gtk_tree_view_set_model (handle, newModel);
+		GTK.gtk_tree_view_set_model (handle, newModel);
 		setModel (newModel);
 		createColumn (null, 0);
 	} else {
@@ -1113,11 +1113,11 @@ void destroyItem (TableColumn column) {
 			if (item != null) {
 				long /*int*/ iter = item.handle;
 				int modelIndex = column.modelIndex;
-				OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long /*int*/)0, -1);
-				OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long /*int*/)0, -1);
-				OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long /*int*/)0, -1);
-				OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long /*int*/)0, -1);
-				OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long /*int*/)0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long /*int*/)0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long /*int*/)0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long /*int*/)0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long /*int*/)0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long /*int*/)0, -1);
 
 				Font [] cellFont = item.cellFont;
 				if (cellFont != null) {
@@ -1138,11 +1138,11 @@ void destroyItem (TableColumn column) {
 		}
 	}
 	if (!searchEnabled ()) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	} else {
 		/* Set the search column whenever the model changes */
 		int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex;
-		OS.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
+		GTK.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
 	}
 }
 
@@ -1153,9 +1153,9 @@ void destroyItem (TableItem item) {
 		index++;
 	}
 	if (index == itemCount) return;
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_list_store_remove (modelHandle, item.handle);
+	GTK.gtk_list_store_remove (modelHandle, item.handle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	System.arraycopy (items, index + 1, items, index, --itemCount - index);
 	items [itemCount] = null;
@@ -1168,11 +1168,11 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 	if (OS.isX11()) { // Wayland
 		if (filter) {
 			long /*int*/ [] path = new long /*int*/ [1];
-			if (OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {
 				if (path [0] != 0) {
-					long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-					if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
-					OS.gtk_tree_path_free (path [0]);
+					long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+					if (GTK.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
+					GTK.gtk_tree_path_free (path [0]);
 				}
 			} else {
 				return false;
@@ -1185,11 +1185,11 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 		double [] startX = new double[1];
 		double [] startY = new double [1];
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_gesture_drag_get_start_point(dragGesture, startX, startY)) {
+		if (GTK.gtk_gesture_drag_get_start_point(dragGesture, startX, startY)) {
 			if (getHeaderVisible()) {
 				startY[0]-= getHeaderHeightInPixels();
 			}
-			if (OS.gtk_tree_view_get_path_at_pos (handle, (int) startX[0], (int) startY[0], path, null, null, null)) {
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, (int) startX[0], (int) startY[0], path, null, null, null)) {
 				if (path [0] != 0) {
 					boolean dragDetect = super.dragDetect (x, y, filter, false, consume);
 					if (dragDetect && selected && consume != null) consume [0] = true;
@@ -1245,20 +1245,20 @@ GdkColor getBackgroundGdkColor () {
 Rectangle getClientAreaInPixels () {
 	checkWidget ();
 	forceResize ();
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	long /*int*/ fixedWindow = gtk_widget_get_window (fixedHandle);
-	long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);
+	long /*int*/ binWindow = GTK.gtk_tree_view_get_bin_window (handle);
 	int [] binX = new int [1], binY = new int [1];
 	OS.gdk_window_get_origin (binWindow, binX, binY);
 	int [] fixedX = new int [1], fixedY = new int [1];
 	OS.gdk_window_get_origin (fixedWindow, fixedX, fixedY);
 	long /*int*/ clientHandle = clientHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (clientHandle, allocation);
+	GTK.gtk_widget_get_allocation (clientHandle, allocation);
 	int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
 	int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height;
 	Rectangle rect = new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-	if (getHeaderVisible() && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (getHeaderVisible() && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		rect.y += getHeaderHeightInPixels();
 	}
 	return rect;
@@ -1267,8 +1267,8 @@ Rectangle getClientAreaInPixels () {
 @Override
 int getClientWidth () {
 	int [] w = new int [1], h = new int [1];
-	OS.gtk_widget_realize (handle);
-	gdk_window_get_size(OS.gtk_tree_view_get_bin_window(handle), w, h);
+	GTK.gtk_widget_realize (handle);
+	gdk_window_get_size(GTK.gtk_tree_view_get_bin_window(handle), w, h);
 	return w[0];
 }
 
@@ -1329,15 +1329,15 @@ long /*int*/[] getColumnTypes (int columnCount) {
 	// per row data
 	types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
 	types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-	types [FOREGROUND_COLUMN] = OS.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
-	types [BACKGROUND_COLUMN] = OS.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
+	types [FOREGROUND_COLUMN] = GTK.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
+	types [BACKGROUND_COLUMN] = GTK.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
 	types [FONT_COLUMN] = OS.PANGO_TYPE_FONT_DESCRIPTION ();
 	// per cell data
 	for (int i=FIRST_COLUMN; i<types.length; i+=CELL_TYPES) {
 		types [i + CELL_PIXBUF] = OS.GDK_TYPE_PIXBUF ();
 		types [i + CELL_TEXT] = OS.G_TYPE_STRING ();
-		types [i + CELL_FOREGROUND] = OS.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
-		types [i + CELL_BACKGROUND] = OS.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
+		types [i + CELL_FOREGROUND] = GTK.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
+		types [i + CELL_BACKGROUND] = GTK.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
 		types [i + CELL_FONT] = OS.PANGO_TYPE_FONT_DESCRIPTION ();
 	}
 	return types;
@@ -1374,7 +1374,7 @@ long /*int*/[] getColumnTypes (int columnCount) {
 public int [] getColumnOrder () {
 	checkWidget ();
 	if (columnCount == 0) return new int [0];
-	long /*int*/ list = OS.gtk_tree_view_get_columns (handle);
+	long /*int*/ list = GTK.gtk_tree_view_get_columns (handle);
 	if (list == 0) return new int [0];
 	int  i = 0, count = OS.g_list_length (list);
 	int [] order = new int [count];
@@ -1431,7 +1431,7 @@ public TableColumn [] getColumns () {
 
 @Override
 GdkRGBA getContextBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (background != null) {
 			return background;
 	} else {
@@ -1443,8 +1443,8 @@ GdkRGBA getContextBackgroundGdkRGBA () {
 
 @Override
 GdkRGBA getContextColorGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		if (foreground != null) {
 			return foreground;
 		} else {
@@ -1457,22 +1457,22 @@ GdkRGBA getContextColorGdkRGBA () {
 
 TableItem getFocusItem () {
 	long /*int*/ [] path = new long /*int*/ [1];
-	OS.gtk_tree_view_get_cursor (handle, path, null);
+	GTK.gtk_tree_view_get_cursor (handle, path, null);
 	if (path [0] == 0) return null;
 	TableItem item = null;
-	long /*int*/ indices = OS.gtk_tree_path_get_indices (path [0]);
+	long /*int*/ indices = GTK.gtk_tree_path_get_indices (path [0]);
 	if (indices != 0) {
 		int [] index = new int []{-1};
 		C.memmove (index, indices, 4);
 		item = _getItem (index [0]);
 	}
-	OS.gtk_tree_path_free (path [0]);
+	GTK.gtk_tree_path_free (path [0]);
 	return item;
 }
 
 @Override
 GdkColor getForegroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getTextColor ();
 }
 
@@ -1547,17 +1547,17 @@ public int getHeaderHeight () {
 
 int getHeaderHeightInPixels () {
 	checkWidget ();
-	if (!OS.gtk_tree_view_get_headers_visible (handle)) return 0;
+	if (!GTK.gtk_tree_view_get_headers_visible (handle)) return 0;
 	if (columnCount > 0) {
 		GtkRequisition requisition = new GtkRequisition ();
 		int height = 0;
 		for (int i=0; i<columnCount; i++) {
 			long /*int*/ buttonHandle = columns [i].buttonHandle;
 			if (buttonHandle != 0) {
-				if (OS.GTK_VERSION >= OS.VERSION (3, 8, 0) && !OS.gtk_widget_get_visible(buttonHandle))  {
-					OS.gtk_widget_show(buttonHandle);
+				if (GTK.GTK_VERSION >= OS.VERSION (3, 8, 0) && !GTK.gtk_widget_get_visible(buttonHandle))  {
+					GTK.gtk_widget_show(buttonHandle);
 					gtk_widget_get_preferred_size (buttonHandle, requisition);
-					OS.gtk_widget_hide(buttonHandle);
+					GTK.gtk_widget_hide(buttonHandle);
 				} else {
 					gtk_widget_get_preferred_size (buttonHandle, requisition);
 				}
@@ -1566,9 +1566,9 @@ int getHeaderHeightInPixels () {
 		}
 		return height;
 	}
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	long /*int*/ fixedWindow = gtk_widget_get_window (fixedHandle);
-	long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);
+	long /*int*/ binWindow = GTK.gtk_tree_view_get_bin_window (handle);
 	int [] binY = new int [1];
 	OS.gdk_window_get_origin (binWindow, null, binY);
 	int [] fixedY = new int [1];
@@ -1595,7 +1595,7 @@ int getHeaderHeightInPixels () {
  */
 public boolean getHeaderVisible () {
 	checkWidget();
-	return OS.gtk_tree_view_get_headers_visible (handle);
+	return GTK.gtk_tree_view_get_headers_visible (handle);
 }
 
 /**
@@ -1651,21 +1651,21 @@ TableItem getItemInPixels (Point point) {
 	checkWidget();
 	if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
 	long /*int*/ [] path = new long /*int*/ [1];
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	int y = point.y;
-	if (getHeaderVisible() && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (getHeaderVisible() && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		y -= getHeaderHeightInPixels();
 	}
-	if (!OS.gtk_tree_view_get_path_at_pos (handle, point.x, y, path, null, null, null)) return null;
+	if (!GTK.gtk_tree_view_get_path_at_pos (handle, point.x, y, path, null, null, null)) return null;
 	if (path [0] == 0) return null;
-	long /*int*/ indices = OS.gtk_tree_path_get_indices (path [0]);
+	long /*int*/ indices = GTK.gtk_tree_path_get_indices (path [0]);
 	TableItem item = null;
 	if (indices != 0) {
 		int [] index = new int [1];
 		C.memmove (index, indices, 4);
 		item = _getItem (index [0]);
 	}
-	OS.gtk_tree_path_free (path [0]);
+	GTK.gtk_tree_path_free (path [0]);
 	return item;
 }
 
@@ -1703,28 +1703,28 @@ public int getItemHeight () {
 int getItemHeightInPixels () {
 	checkWidget();
 	if (itemCount == 0) {
-		long /*int*/ column = OS.gtk_tree_view_get_column (handle, 0);
+		long /*int*/ column = GTK.gtk_tree_view_get_column (handle, 0);
 		int [] w = new int [1], h = new int [1];
 		ignoreSize = true;
-		OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
+		GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
 		int height = h [0];
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			long /*int*/ textRenderer = getTextRenderer (column);
-			OS.gtk_cell_renderer_get_preferred_height_for_width (textRenderer, handle, 0, h, null);
+			GTK.gtk_cell_renderer_get_preferred_height_for_width (textRenderer, handle, 0, h, null);
 			height += h [0];
 		}
 		ignoreSize = false;
 		return height;
 	} else {
 		int height = 0;
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		OS.gtk_tree_model_get_iter_first (modelHandle, iter);
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		GTK.gtk_tree_model_get_iter_first (modelHandle, iter);
 		int columnCount = Math.max (1, this.columnCount);
 		for (int i=0; i<columnCount; i++) {
-			long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);
-			OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
+			long /*int*/ column = GTK.gtk_tree_view_get_column (handle, i);
+			GTK.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
 			int [] w = new int [1], h = new int [1];
-			OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
+			GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
 			height = Math.max (height, h [0]);
 		}
 		OS.g_free (iter);
@@ -1781,21 +1781,21 @@ public TableItem [] getItems () {
  */
 public boolean getLinesVisible() {
 	checkWidget();
-	if (OS.GTK3) {
-		return OS.gtk_tree_view_get_grid_lines(handle) > OS.GTK_TREE_VIEW_GRID_LINES_NONE;
+	if (GTK.GTK3) {
+		return GTK.gtk_tree_view_get_grid_lines(handle) > GTK.GTK_TREE_VIEW_GRID_LINES_NONE;
 	} else  {
-		return OS.gtk_tree_view_get_rules_hint (handle);
+		return GTK.gtk_tree_view_get_rules_hint (handle);
 	}
 }
 
 long /*int*/ getPixbufRenderer (long /*int*/ column) {
-	long /*int*/ list = OS.gtk_cell_layout_get_cells(column);
+	long /*int*/ list = GTK.gtk_cell_layout_get_cells(column);
 	if (list == 0) return 0;
 	long /*int*/ originalList = list;
 	long /*int*/ pixbufRenderer = 0;
 	while (list != 0) {
 		long /*int*/ renderer = OS.g_list_data (list);
-		if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
+		if (GTK.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
 			pixbufRenderer = renderer;
 			break;
 		}
@@ -1823,8 +1823,8 @@ long /*int*/ getPixbufRenderer (long /*int*/ column) {
  */
 public TableItem [] getSelection () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, null);
 	long /*int*/ originalList = list;
 	if (list != 0) {
 		int count = OS.g_list_length (list);
@@ -1832,14 +1832,14 @@ public TableItem [] getSelection () {
 		int length = 0;
 		for (int i=0; i<count; i++) {
 			long /*int*/ data = OS.g_list_data (list);
-			long /*int*/ indices = OS.gtk_tree_path_get_indices (data);
+			long /*int*/ indices = GTK.gtk_tree_path_get_indices (data);
 			if (indices != 0) {
 				int [] index = new int [1];
 				C.memmove (index, indices, 4);
 				treeSelection [length] = index [0];
 				length++;
 			}
-			OS.gtk_tree_path_free (data);
+			GTK.gtk_tree_path_free (data);
 			list = OS.g_list_next (list);
 		}
 		OS.g_list_free (originalList);
@@ -1862,8 +1862,8 @@ public TableItem [] getSelection () {
  */
 public int getSelectionCount () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	return OS.gtk_tree_selection_count_selected_rows (selection);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	return GTK.gtk_tree_selection_count_selected_rows (selection);
 }
 
 /**
@@ -1879,8 +1879,8 @@ public int getSelectionCount () {
  */
 public int getSelectionIndex () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, null);
 	long /*int*/ originalList = list;
 	if (list != 0) {
 		int [] index = new int [1];
@@ -1888,14 +1888,14 @@ public int getSelectionIndex () {
 		while (list != 0) {
 			long /*int*/ data = OS.g_list_data (list);
 			if (foundIndex == false) {
-				long /*int*/ indices = OS.gtk_tree_path_get_indices (data);
+				long /*int*/ indices = GTK.gtk_tree_path_get_indices (data);
 				if (indices != 0) {
 					C.memmove (index, indices, 4);
 					foundIndex = true;
 				}
 			}
 			list = OS.g_list_next (list);
-			OS.gtk_tree_path_free (data);
+			GTK.gtk_tree_path_free (data);
 		}
 		OS.g_list_free (originalList);
 		return index [0];
@@ -1921,8 +1921,8 @@ public int getSelectionIndex () {
  */
 public int [] getSelectionIndices () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, null);
 	long /*int*/ originalList = list;
 	if (list != 0) {
 		int count = OS.g_list_length (list);
@@ -1930,7 +1930,7 @@ public int [] getSelectionIndices () {
 		int length = 0;
 		for (int i=0; i<count; i++) {
 			long /*int*/ data = OS.g_list_data (list);
-			long /*int*/ indices = OS.gtk_tree_path_get_indices (data);
+			long /*int*/ indices = GTK.gtk_tree_path_get_indices (data);
 			if (indices != 0) {
 				int [] index = new int [1];
 				C.memmove (index, indices, 4);
@@ -1938,7 +1938,7 @@ public int [] getSelectionIndices () {
 				length++;
 			}
 			list = OS.g_list_next (list);
-			OS.gtk_tree_path_free (data);
+			GTK.gtk_tree_path_free (data);
 		}
 		OS.g_list_free (originalList);
 		int [] result = new int [length];
@@ -1991,13 +1991,13 @@ public int getSortDirection () {
 }
 
 long /*int*/ getTextRenderer (long /*int*/ column) {
-	long /*int*/ list = OS.gtk_cell_layout_get_cells(column);
+	long /*int*/ list = GTK.gtk_cell_layout_get_cells(column);
 	if (list == 0) return 0;
 	long /*int*/ originalList = list;
 	long /*int*/ textRenderer = 0;
 	while (list != 0) {
 		long /*int*/ renderer = OS.g_list_data (list);
-		 if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
+		 if (GTK.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
 			textRenderer = renderer;
 			break;
 		}
@@ -2027,23 +2027,23 @@ public int getTopIndex () {
 	 * using the UI. Otherwise, fetch topIndex using GtkTreeView API.
 	 */
 	long /*int*/ vAdjustment;
-	if (OS.GTK3){
-		vAdjustment = OS.gtk_scrollable_get_vadjustment(handle);
+	if (GTK.GTK3){
+		vAdjustment = GTK.gtk_scrollable_get_vadjustment(handle);
 	} else {
-		vAdjustment = OS.gtk_tree_view_get_vadjustment(handle);
+		vAdjustment = GTK.gtk_tree_view_get_vadjustment(handle);
 	}
-	currentAdjustment = OS.gtk_adjustment_get_value(vAdjustment);
+	currentAdjustment = GTK.gtk_adjustment_get_value(vAdjustment);
 	if (cachedAdjustment == currentAdjustment){
 		return topIndex;
 	} else {
 		long /*int*/ [] path = new long /*int*/ [1];
-		OS.gtk_widget_realize (handle);
-		if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return 0;
+		GTK.gtk_widget_realize (handle);
+		if (!GTK.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return 0;
 		if (path [0] == 0) return 0;
-		long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]);
+		long /*int*/ indices = GTK.gtk_tree_path_get_indices (path[0]);
 		int[] index = new int [1];
 		if (indices != 0) C.memmove (index, indices, 4);
-		OS.gtk_tree_path_free (path [0]);
+		GTK.gtk_tree_path_free (path [0]);
 		return index [0];
 	}
 }
@@ -2052,7 +2052,7 @@ public int getTopIndex () {
 long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-	if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
+	if (gdkEvent.window != GTK.gtk_tree_view_get_bin_window (handle)) return 0;
 	long /*int*/ result = super.gtk_button_press_event (widget, event);
 	if (result != 0) return result;
 	/*
@@ -2067,12 +2067,12 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 		long /*int*/ nextEvent = OS.gdk_event_peek ();
 		if (nextEvent == 0) {
 			long /*int*/ [] path = new long /*int*/ [1];
-			long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-			if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
+			long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
 					path[0] != 0) {
 				//  selection count is used in the case of clicking an already selected item while holding Control
 				selectionCountOnPress = getSelectionCount();
-				if (OS.gtk_tree_selection_path_is_selected (selection, path[0])) {
+				if (GTK.gtk_tree_selection_path_is_selected (selection, path[0])) {
 					if (((gdkEvent.state & (OS.GDK_CONTROL_MASK|OS.GDK_SHIFT_MASK)) == 0) ||
 							((gdkEvent.state & OS.GDK_CONTROL_MASK) != 0)) {
 						/**
@@ -2082,8 +2082,8 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 						 * E.g to reproduce: Open DNDExample, select "Tree", select multiple items, try dragging.
 						 *   without line below, only one item is selected for drag.
 						 */
-						long /*int*/ gtk_false_funcPtr = OS.GET_FUNCTION_POINTER_gtk_false();
-						OS.gtk_tree_selection_set_select_function(selection, gtk_false_funcPtr, 0, 0);
+						long /*int*/ gtk_false_funcPtr = GTK.GET_FUNCTION_POINTER_gtk_false();
+						GTK.gtk_tree_selection_set_select_function(selection, gtk_false_funcPtr, 0, 0);
 					}
 				}
 			}
@@ -2102,11 +2102,11 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	int button = gdkEvent.button;
 	if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-				if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
-				OS.gtk_tree_path_free (path [0]);
+				long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+				if (GTK.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
+				GTK.gtk_tree_path_free (path [0]);
 			}
 		}
 	}
@@ -2120,13 +2120,13 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	*/
 	if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+				long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 				OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
+				GTK.gtk_tree_view_set_cursor (handle, path [0], 0, false);
 				OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_tree_path_free (path [0]);
+				GTK.gtk_tree_path_free (path [0]);
 			}
 		}
 	}
@@ -2188,7 +2188,7 @@ void sendTreeDefaultSelection() {
 long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
 	GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-	if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
+	if (gdkEvent.window != GTK.gtk_tree_view_get_bin_window (handle)) return 0;
 	/*
 	 * Feature in GTK. In multi-select tree view there is a problem with using DnD operations while also selecting multiple items.
 	 * When doing a DnD, GTK de-selects all other items except for the widget being dragged from. By disabling the selection function
@@ -2198,19 +2198,19 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event)
 	 */
 	if ((state & DRAG_DETECT) != 0 && hooks (SWT.DragDetect) && !OS.isX11()) { // Wayland
 		long /*int*/ [] path = new long /*int*/ [1];
-		long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+		long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 		// free up the selection function on release.
-		OS.gtk_tree_selection_set_select_function(selection,0,0,0);
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
-				path[0] != 0 && OS.gtk_tree_selection_path_is_selected (selection, path[0])) {
+		GTK.gtk_tree_selection_set_select_function(selection,0,0,0);
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
+				path[0] != 0 && GTK.gtk_tree_selection_path_is_selected (selection, path[0])) {
 			selectionCountOnRelease = getSelectionCount();
 			if ((gdkEvent.state & (OS.GDK_CONTROL_MASK|OS.GDK_SHIFT_MASK)) == 0) {
-				OS.gtk_tree_view_set_cursor(handle, path[0], 0,  false);
+				GTK.gtk_tree_view_set_cursor(handle, path[0], 0,  false);
 			}
 			 // Check to see if there has been a new tree item selected when holding Control in Path.
 			 // If not, deselect the item.
 			if ((gdkEvent.state & OS.GDK_CONTROL_MASK) != 0 && selectionCountOnRelease == selectionCountOnPress) {
-				OS.gtk_tree_selection_unselect_path (selection,path[0]);
+				GTK.gtk_tree_selection_unselect_path (selection,path[0]);
 			}
 		}
 	}
@@ -2239,7 +2239,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 			* The fix is to detect this case in 'event_after' and send the
 			* expose event.
 			*/
-			if (OS.gtk_tree_model_iter_n_children (modelHandle, 0) == 0) {
+			if (GTK.gtk_tree_model_iter_n_children (modelHandle, 0) == 0) {
 				gtk_expose_event (widget, gdkEvent);
 			}
 			break;
@@ -2252,7 +2252,7 @@ void drawInheritedBackground (long /*int*/ eventPtr, long /*int*/ cairo) {
 	if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
 		Control control = findBackgroundControl ();
 		if (control != null) {
-			long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle);
+			long /*int*/ window = GTK.gtk_tree_view_get_bin_window (handle);
 			long /*int*/ rgn = 0;
 			if (eventPtr != 0) {
 				GdkEventExpose gdkEvent = new GdkEventExpose ();
@@ -2264,13 +2264,13 @@ void drawInheritedBackground (long /*int*/ eventPtr, long /*int*/ cairo) {
 			gdk_window_get_size (window, width, height);
 			int bottom = 0;
 			if (itemCount != 0) {
-				long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-				OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, itemCount - 1);
-				long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+				long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+				GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, itemCount - 1);
+				long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
 				GdkRectangle rect = new GdkRectangle ();
-				OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
+				GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect);
 				bottom = rect.y + rect.height;
-				OS.gtk_tree_path_free (path);
+				GTK.gtk_tree_path_free (path);
 				OS.g_free (iter);
 			}
 			if (height [0] > bottom) {
@@ -2297,7 +2297,7 @@ long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
 @Override
 long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
 	long /*int*/ window = OS.GDK_EVENT_WINDOW (event);
-	if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
+	if (window != GTK.gtk_tree_view_get_bin_window (handle)) return 0;
 	return super.gtk_motion_notify_event (widget, event);
 }
 
@@ -2326,9 +2326,9 @@ long /*int*/ gtk_start_interactive_search(long /*int*/ widget) {
 }
 @Override
 long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {
-	long /*int*/ path = OS.gtk_tree_path_new_from_string (pathStr);
+	long /*int*/ path = GTK.gtk_tree_path_new_from_string (pathStr);
 	if (path == 0) return 0;
-	long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
+	long /*int*/ indices = GTK.gtk_tree_path_get_indices (path);
 	if (indices != 0) {
 		int [] index = new int [1];
 		C.memmove (index, indices, 4);
@@ -2339,7 +2339,7 @@ long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {
 		event.item = item;
 		sendSelectionEvent (SWT.Selection, event, false);
 	}
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	return 0;
 }
 
@@ -2355,11 +2355,11 @@ void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {
 		super.gtk_widget_size_request (widget, requisition);
 		return;
 	}
-	long /*int*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;
+	long /*int*/ columns = GTK.gtk_tree_view_get_columns (handle), list = columns;
 	boolean fixVisible = columns != 0;
 	while (list != 0) {
 		long /*int*/ column = OS.g_list_data (list);
-		if (OS.gtk_tree_view_column_get_visible (column)) {
+		if (GTK.gtk_tree_view_column_get_visible (column)) {
 			fixVisible = false;
 			break;
 		}
@@ -2368,24 +2368,24 @@ void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {
 	long /*int*/ columnHandle = 0;
 	if (fixVisible) {
 		columnHandle = OS.g_list_data (columns);
-		OS.gtk_tree_view_column_set_visible (columnHandle, true);
+		GTK.gtk_tree_view_column_set_visible (columnHandle, true);
 	}
 	super.gtk_widget_size_request (widget, requisition);
 	if (fixVisible) {
-		OS.gtk_tree_view_column_set_visible (columnHandle, false);
+		GTK.gtk_tree_view_column_set_visible (columnHandle, false);
 	}
 	if (columns != 0) OS.g_list_free (columns);
 }
 
 void hideFirstColumn () {
-	long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
-	OS.gtk_tree_view_column_set_visible (firstColumn, false);
+	long /*int*/ firstColumn = GTK.gtk_tree_view_get_column (handle, 0);
+	GTK.gtk_tree_view_column_set_visible (firstColumn, false);
 }
 
 @Override
 void hookEvents () {
 	super.hookEvents ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection(handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection(handle);
 	OS.g_signal_connect_closure (selection, OS.changed, display.getClosure (CHANGED), false);
 	OS.g_signal_connect_closure (handle, OS.row_activated, display.getClosure (ROW_ACTIVATED), false);
 	if (checkRenderer != 0) {
@@ -2476,11 +2476,11 @@ public int indexOf (TableItem item) {
  */
 public boolean isSelected (int index) {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	byte [] buffer = Converter.wcsToMbcs (Integer.toString (index), true);
-	long /*int*/ path = OS.gtk_tree_path_new_from_string (buffer);
-	boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);
-	OS.gtk_tree_path_free (path);
+	long /*int*/ path = GTK.gtk_tree_path_new_from_string (buffer);
+	boolean answer = GTK.gtk_tree_selection_path_is_selected (selection, path);
+	GTK.gtk_tree_path_free (path);
 	return answer;
 }
 
@@ -2504,26 +2504,26 @@ boolean mnemonicMatch (char key) {
 
 @Override
 long /*int*/ paintWindow () {
-	OS.gtk_widget_realize (handle);
-	if (fixedHandle != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
-		OS.gtk_widget_realize (fixedHandle);
-		return OS.gtk_widget_get_window(fixedHandle);
+	GTK.gtk_widget_realize (handle);
+	if (fixedHandle != 0 && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+		GTK.gtk_widget_realize (fixedHandle);
+		return GTK.gtk_widget_get_window(fixedHandle);
 	}
-	return OS.gtk_tree_view_get_bin_window (handle);
+	return GTK.gtk_tree_view_get_bin_window (handle);
 }
 
 void recreateRenderers () {
 	if (checkRenderer != 0) {
 		display.removeWidget (checkRenderer);
 		OS.g_object_unref (checkRenderer);
-		checkRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_toggle_get_type(), 0) : OS.gtk_cell_renderer_toggle_new ();
+		checkRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_toggle_get_type(), 0) : GTK.gtk_cell_renderer_toggle_new ();
 		if (checkRenderer == 0) error (SWT.ERROR_NO_HANDLES);
 		OS.g_object_ref (checkRenderer);
 		display.addWidget (checkRenderer, this);
 		OS.g_signal_connect_closure (checkRenderer, OS.toggled, display.getClosure (TOGGLED), false);
 	}
 	if (columnCount == 0) {
-		createRenderers (OS.gtk_tree_view_get_column (handle, 0), Table.FIRST_COLUMN, true, 0);
+		createRenderers (GTK.gtk_tree_view_get_column (handle, 0), Table.FIRST_COLUMN, true, 0);
 	} else {
 		for (int i = 0; i < columnCount; i++) {
 			TableColumn column = columns [i];
@@ -2543,7 +2543,7 @@ void redrawBackgroundImage () {
 @Override
 void register () {
 	super.register ();
-	display.addWidget (OS.gtk_tree_view_get_selection (handle), this);
+	display.addWidget (GTK.gtk_tree_view_get_selection (handle), this);
 	if (checkRenderer != 0) display.addWidget (checkRenderer, this);
 	display.addWidget (modelHandle, this);
 }
@@ -2601,22 +2601,22 @@ void releaseWidget () {
 public void remove (int index) {
 	checkWidget();
 	if (!(0 <= index && index < itemCount)) error (SWT.ERROR_ITEM_NOT_REMOVED);
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	TableItem item = items [index];
 	boolean disposed = false;
 	if (item != null) {
 		disposed = item.isDisposed ();
 		if (!disposed) {
-			C.memmove (iter, item.handle, OS.GtkTreeIter_sizeof ());
+			C.memmove (iter, item.handle, GTK.GtkTreeIter_sizeof ());
 			item.release (false);
 		}
 	} else {
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
 	}
 	if (!disposed) {
-		long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+		long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 		OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-		OS.gtk_list_store_remove (modelHandle, iter);
+		GTK.gtk_list_store_remove (modelHandle, iter);
 		OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		System.arraycopy (items, index + 1, items, index, --itemCount - index);
 		items [itemCount] = null;
@@ -2646,19 +2646,19 @@ public void remove (int start, int end) {
 	if (!(0 <= start && start <= end && end < itemCount)) {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (iter == 0) error (SWT.ERROR_NO_HANDLES);
 	if (fixAccessibility ()) {
 		ignoreAccessibility = true;
 	}
 	int index = end;
 	while (index >= start) {
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
 		TableItem item = items [index];
 		if (item != null && !item.isDisposed ()) item.release (false);
 		OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-		OS.gtk_list_store_remove (modelHandle, iter);
+		GTK.gtk_list_store_remove (modelHandle, iter);
 		OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		index--;
 	}
@@ -2699,9 +2699,9 @@ public void remove (int [] indices) {
 	if (!(0 <= start && start <= end && end < itemCount)) {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	int last = -1;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (iter == 0) error (SWT.ERROR_NO_HANDLES);
 	if (fixAccessibility ()) {
 		ignoreAccessibility = true;
@@ -2714,15 +2714,15 @@ public void remove (int [] indices) {
 			if (item != null) {
 				disposed = item.isDisposed ();
 				if (!disposed) {
-					C.memmove (iter, item.handle, OS.GtkTreeIter_sizeof ());
+					C.memmove (iter, item.handle, GTK.GtkTreeIter_sizeof ());
 					item.release (false);
 				}
 			} else {
-				OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
+				GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
 			}
 			if (!disposed) {
 				OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_list_store_remove (modelHandle, iter);
+				GTK.gtk_list_store_remove (modelHandle, iter);
 				OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 				System.arraycopy (items, index + 1, items, index, --itemCount - index);
 				items [itemCount] = null;
@@ -2755,12 +2755,12 @@ public void removeAll () {
 	}
 	items = new TableItem [4];
 	itemCount = 0;
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixAccessibility ()) {
 		ignoreAccessibility = true;
 	}
-	OS.gtk_list_store_clear (modelHandle);
+	GTK.gtk_list_store_clear (modelHandle);
 	if (fixAccessibility ()) {
 		ignoreAccessibility = false;
 		OS.g_object_notify (handle, OS.model);
@@ -2769,11 +2769,11 @@ public void removeAll () {
 
 	resetCustomDraw ();
 	if (!searchEnabled ()) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	} else {
 		/* Set the search column whenever the model changes */
 		int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex;
-		OS.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
+		GTK.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
 	}
 }
 
@@ -2803,19 +2803,19 @@ public void removeSelectionListener(SelectionListener listener) {
 }
 
 void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ height) {
-	if (!ignoreSize && OS.GTK_IS_CELL_RENDERER_TEXT (cell) && hooks (SWT.MeasureItem)) {
+	if (!ignoreSize && GTK.GTK_IS_CELL_RENDERER_TEXT (cell) && hooks (SWT.MeasureItem)) {
 		long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
 		TableItem item = null;
 		boolean isSelected = false;
 		if (iter != 0) {
-			long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+			long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
 			int [] buffer = new int [1];
-			C.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4);
+			C.memmove (buffer, GTK.gtk_tree_path_get_indices (path), 4);
 			int index = buffer [0];
 			item = _getItem (index);
-			long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-			isSelected = OS.gtk_tree_selection_path_is_selected (selection, path);
-			OS.gtk_tree_path_free (path);
+			long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+			isSelected = GTK.gtk_tree_selection_path_is_selected (selection, path);
+			GTK.gtk_tree_path_free (path);
 		}
 		if (item != null) {
 			int columnIndex = 0;
@@ -2831,8 +2831,8 @@ void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ heigh
 			int [] contentWidth = new int [1], contentHeight = new int  [1];
 			if (width != 0) C.memmove (contentWidth, width, 4);
 			if (height != 0) C.memmove (contentHeight, height, 4);
-			if (OS.GTK3) {
-				OS.gtk_cell_renderer_get_preferred_height_for_width (cell, handle, contentWidth[0], contentHeight, null);
+			if (GTK.GTK3) {
+				GTK.gtk_cell_renderer_get_preferred_height_for_width (cell, handle, contentWidth[0], contentHeight, null);
 			}
 			Image image = item.getImage (columnIndex);
 			int imageWidth = 0;
@@ -2857,8 +2857,8 @@ void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ heigh
 			if (contentHeight [0] < rect.height) contentHeight [0] = rect.height;
 			if (width != 0) C.memmove (width, contentWidth, 4);
 			if (height != 0) C.memmove (height, contentHeight, 4);
-			if (OS.GTK3) {
-				OS.gtk_cell_renderer_set_fixed_size (cell, contentWidth [0], contentHeight [0]);
+			if (GTK.GTK3) {
+				GTK.gtk_cell_renderer_set_fixed_size (cell, contentWidth [0], contentHeight [0]);
 			}
 		}
 	}
@@ -2902,12 +2902,12 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 	boolean wasSelected = false;
 	long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
 	if (iter != 0) {
-		long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+		long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
 		int [] buffer = new int [1];
-		C.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4);
+		C.memmove (buffer, GTK.gtk_tree_path_get_indices (path), 4);
 		int index = buffer [0];
 		item = _getItem (index);
-		OS.gtk_tree_path_free (path);
+		GTK.gtk_tree_path_free (path);
 	}
 	long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
 	int columnIndex = 0;
@@ -2920,35 +2920,35 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 		}
 	}
 	if (item != null) {
-		if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) ||
-				( (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) || OS.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
+		if (GTK.GTK_IS_CELL_RENDERER_TOGGLE (cell) ||
+				( (GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell) || GTK.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
 			drawFlags = (int)/*64*/flags;
 			drawState = SWT.FOREGROUND;
 			long /*int*/ [] ptr = new long /*int*/ [1];
-			OS.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1);
+			GTK.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1);
 			if (ptr [0] == 0) {
 				int modelIndex = columnCount == 0 ? Table.FIRST_COLUMN : columns [columnIndex].modelIndex;
-				OS.gtk_tree_model_get (modelHandle, item.handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
+				GTK.gtk_tree_model_get (modelHandle, item.handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
 			}
 			if (ptr [0] != 0) {
 				drawState |= SWT.BACKGROUND;
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					OS.gdk_rgba_free (ptr [0]);
 				} else {
 					OS.gdk_color_free (ptr [0]);
 				}
 			}
-			if ((flags & OS.GTK_CELL_RENDERER_SELECTED) != 0) drawState |= SWT.SELECTED;
-			if (!OS.GTK3 || (flags & OS.GTK_CELL_RENDERER_SELECTED) == 0) {
-				if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
+			if ((flags & GTK.GTK_CELL_RENDERER_SELECTED) != 0) drawState |= SWT.SELECTED;
+			if (!GTK.GTK3 || (flags & GTK.GTK_CELL_RENDERER_SELECTED) == 0) {
+				if ((flags & GTK.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
 			}
 
 			GdkRectangle rect = new GdkRectangle ();
-			long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-			OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
-			OS.gtk_tree_path_free (path);
+			long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+			GTK.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
+			GTK.gtk_tree_path_free (path);
 			// A workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459117
-			if (cr != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0) && OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
+			if (cr != 0 && GTK.GTK_VERSION > OS.VERSION(3, 9, 0) && GTK.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
 				GdkRectangle r2 = new GdkRectangle ();
 				OS.gdk_cairo_get_clip_rectangle (cr, r2);
 				rect.x = r2.x;
@@ -2960,7 +2960,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 					if (control != null) {
 						if (cr != 0) {
 							Cairo.cairo_save (cr);
-							if (!OS.GTK3){
+							if (!GTK.GTK3){
 								Cairo.cairo_reset_clip (cr);
 							}
 						}
@@ -2987,7 +2987,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				if (wasSelected) {
 					Control control = findBackgroundControl ();
 					if (control == null) control = this;
-					if (!OS.GTK3){
+					if (!GTK.GTK3){
 						if (cr != 0) {
 							Cairo.cairo_save (cr);
 							Cairo.cairo_reset_clip (cr);
@@ -3008,14 +3008,14 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				}
 				gc.setFont (item.getFont (columnIndex));
 				if ((style & SWT.MIRRORED) != 0) rect.x = getClientWidth () - rect.width - rect.x;
-				if (OS.GTK_VERSION >= OS.VERSION(3, 9, 0) && cr != 0) {
+				if (GTK.GTK_VERSION >= OS.VERSION(3, 9, 0) && cr != 0) {
 					GdkRectangle r = new GdkRectangle();
 					OS.gdk_cairo_get_clip_rectangle(cr, r);
 					Rectangle rect2 = DPIUtil.autoScaleDown(new Rectangle(rect.x, r.y, r.width, r.height));
 					// Caveat: rect2 is necessary because GC#setClipping(Rectangle) got broken by bug 446075
 					gc.setClipping(rect2.x, rect2.y, rect2.width, rect2.height);
 
-					if (OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
+					if (GTK.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
 						rect.width = r.width;
 					}
 				} else {
@@ -3032,35 +3032,35 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				Rectangle eventRect = new Rectangle (rect.x, rect.y, rect.width, rect.height);
 				event.setBounds (DPIUtil.autoScaleDown (eventRect));
 				sendEvent (SWT.EraseItem, event);
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					drawForegroundRGBA = null;
 				} else {
 					drawForeground = null;
 				}
 				drawState = event.doit ? event.detail : 0;
-				drawFlags &= ~(OS.GTK_CELL_RENDERER_FOCUSED | OS.GTK_CELL_RENDERER_SELECTED);
-				if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
-				if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
+				drawFlags &= ~(GTK.GTK_CELL_RENDERER_FOCUSED | GTK.GTK_CELL_RENDERER_SELECTED);
+				if ((drawState & SWT.SELECTED) != 0) drawFlags |= GTK.GTK_CELL_RENDERER_SELECTED;
+				if ((drawState & SWT.FOCUSED) != 0) drawFlags |= GTK.GTK_CELL_RENDERER_FOCUSED;
 				if ((drawState & SWT.SELECTED) != 0) {
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						Cairo.cairo_save (cr);
 						Cairo.cairo_reset_clip (cr);
-						long /*int*/ context = OS.gtk_widget_get_style_context (widget);
-						OS.gtk_style_context_save (context);
-						OS.gtk_style_context_add_class (context, OS.GTK_STYLE_CLASS_CELL);
-						OS.gtk_style_context_set_state (context, OS.GTK_STATE_FLAG_SELECTED);
-						OS.gtk_render_background(context, cr, rect.x, rect.y, rect.width, rect.height);
-						OS.gtk_style_context_restore (context);
+						long /*int*/ context = GTK.gtk_widget_get_style_context (widget);
+						GTK.gtk_style_context_save (context);
+						GTK.gtk_style_context_add_class (context, GTK.GTK_STYLE_CLASS_CELL);
+						GTK.gtk_style_context_set_state (context, GTK.GTK_STATE_FLAG_SELECTED);
+						GTK.gtk_render_background(context, cr, rect.x, rect.y, rect.width, rect.height);
+						GTK.gtk_style_context_restore (context);
 						Cairo.cairo_restore (cr);
 					} else {
-						long /*int*/ style = OS.gtk_widget_get_style (widget);
+						long /*int*/ style = GTK.gtk_widget_get_style (widget);
 						//TODO - parity and sorted
 						byte[] detail = Converter.wcsToMbcs ("cell_odd", true);
-						OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
+						GTK.gtk_paint_flat_box (style, window, GTK.GTK_STATE_SELECTED, GTK.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
 					}
 				} else {
 					if (wasSelected) {
-						if (OS.GTK3) {
+						if (GTK.GTK3) {
 							drawForegroundRGBA = gc.getForeground ().handleRGBA;
 						} else {
 							drawForeground = gc.getForeground ().handle;
@@ -3079,31 +3079,31 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 		gc.fillRectangle(DPIUtil.autoScaleDown(new Rectangle(rect.x, rect.y, rect.width, rect.height)));
 		gc.dispose ();
 	}
-	if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
+	if ((drawState & SWT.FOREGROUND) != 0 || GTK.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
 		long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
 		GtkCellRendererClass klass = new GtkCellRendererClass ();
 		OS.memmove (klass, g_class);
-		if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell) && !OS.GTK3) {
+		if (drawForeground != null && GTK.GTK_IS_CELL_RENDERER_TEXT (cell) && !GTK.GTK3) {
 			OS.g_object_set (cell, OS.foreground_gdk, drawForeground, 0);
-		} else if (drawForegroundRGBA != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell) && OS.GTK3) {
+		} else if (drawForegroundRGBA != null && GTK.GTK_IS_CELL_RENDERER_TEXT (cell) && GTK.GTK3) {
 			OS.g_object_set (cell, OS.foreground_rgba, drawForegroundRGBA, 0);
 		}
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			OS.call (klass.render, cell, cr, widget, background_area, cell_area, drawFlags);
 		} else {
 			OS.call (klass.render, cell, window, widget, background_area, cell_area, expose_area, drawFlags);
 		}
 	}
 	if (item != null) {
-		if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
+		if (GTK.GTK_IS_CELL_RENDERER_TEXT (cell)) {
 			if (hooks (SWT.PaintItem)) {
 				if (wasSelected) drawState |= SWT.SELECTED;
 				GdkRectangle rect = new GdkRectangle ();
-				long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-				OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
-				OS.gtk_tree_path_free (path);
+				long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+				GTK.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
+				GTK.gtk_tree_path_free (path);
 				// A workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459117
-				if (cr != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0) && OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
+				if (cr != 0 && GTK.GTK_VERSION > OS.VERSION(3, 9, 0) && GTK.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
 					GdkRectangle r2 = new GdkRectangle ();
 					OS.gdk_cairo_get_clip_rectangle (cr, r2);
 					rect.x = r2.x;
@@ -3122,7 +3122,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				}
 				// On gtk >3.9 and <3.14.8 the clip rectangle does not have image area into clip rectangle
 				// need to adjust clip rectangle with image width
-				if (cr != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0) && OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
+				if (cr != 0 && GTK.GTK_VERSION > OS.VERSION(3, 9, 0) && GTK.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
 					rect.x -= imageWidth;
 					rect.width +=imageWidth;
 				}
@@ -3131,7 +3131,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				GC gc = getGC(cr);
 				if ((drawState & SWT.SELECTED) != 0) {
 					Color background, foreground;
-					if (OS.gtk_widget_has_focus (handle) || OS.GTK3) {
+					if (GTK.gtk_widget_has_focus (handle) || GTK.GTK3) {
 						background = display.getSystemColor (SWT.COLOR_LIST_SELECTION);
 						foreground = display.getSystemColor (SWT.COLOR_LIST_SELECTION_TEXT);
 					} else {
@@ -3140,15 +3140,15 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 						 * gtk_paint_flat_box () changes the background color state_type
 						 * to GTK_STATE_ACTIVE. The fix is to use the same values in the GC.
 						 */
-						background = OS.GTK3 ? Color.gtk_new (display, display.COLOR_LIST_SELECTION_INACTIVE_RGBA) : Color.gtk_new (display, display.COLOR_LIST_SELECTION_INACTIVE);
-						foreground = OS.GTK3 ? Color.gtk_new (display, display.COLOR_LIST_SELECTION_TEXT_INACTIVE_RGBA) : Color.gtk_new (display, display.COLOR_LIST_SELECTION_TEXT_INACTIVE);
+						background = GTK.GTK3 ? Color.gtk_new (display, display.COLOR_LIST_SELECTION_INACTIVE_RGBA) : Color.gtk_new (display, display.COLOR_LIST_SELECTION_INACTIVE);
+						foreground = GTK.GTK3 ? Color.gtk_new (display, display.COLOR_LIST_SELECTION_TEXT_INACTIVE_RGBA) : Color.gtk_new (display, display.COLOR_LIST_SELECTION_TEXT_INACTIVE);
 					}
 					gc.setBackground (background);
 					gc.setForeground (foreground);
 				} else {
 					gc.setBackground (item.getBackground (columnIndex));
 					Color foreground;
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						foreground = drawForegroundRGBA != null ? Color.gtk_new (display, drawForegroundRGBA) : item.getForeground (columnIndex);
 					} else {
 						foreground = drawForeground != null ? Color.gtk_new (display, drawForeground) : item.getForeground (columnIndex);
@@ -3178,7 +3178,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 
 private GC getGC(long /*int*/ cr) {
 	GC gc;
-	if (OS.GTK3){
+	if (GTK.GTK3){
 		GCData gcData = new GCData();
 		gcData.cairo = cr;
 		gc = GC.gtk_new(this, gcData );
@@ -3194,9 +3194,9 @@ void resetCustomDraw () {
 	for (int i=0; i<end; i++) {
 		boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
 		if (customDraw) {
-			long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);
+			long /*int*/ column = GTK.gtk_tree_view_get_column (handle, i);
 			long /*int*/ textRenderer = getTextRenderer (column);
-			OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
+			GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
 			if (columnCount != 0) columns [i].customDraw = false;
 		}
 	}
@@ -3242,10 +3242,10 @@ public void select (int index) {
 	checkWidget();
 	if (!(0 <= index && index < itemCount))  return;
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	TableItem item = _getItem (index);
-	OS.gtk_tree_selection_select_iter (selection, item.handle);
+	GTK.gtk_tree_selection_select_iter (selection, item.handle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
 }
@@ -3280,11 +3280,11 @@ public void select (int start, int end) {
 	start = Math.max (0, start);
 	end = Math.min (end, itemCount - 1);
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int index=start; index<=end; index++) {
 		TableItem item = _getItem (index);
-		OS.gtk_tree_selection_select_iter (selection, item.handle);
+		GTK.gtk_tree_selection_select_iter (selection, item.handle);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
@@ -3319,13 +3319,13 @@ public void select (int [] indices) {
 	int length = indices.length;
 	if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	for (int i=0; i<length; i++) {
 		int index = indices [i];
 		if (!(0 <= index && index < itemCount)) continue;
 		TableItem item = _getItem (index);
-		OS.gtk_tree_selection_select_iter (selection, item.handle);
+		GTK.gtk_tree_selection_select_iter (selection, item.handle);
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
@@ -3346,9 +3346,9 @@ public void selectAll () {
 	checkWidget();
 	if ((style & SWT.SINGLE) != 0) return;
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_select_all (selection);
+	GTK.gtk_tree_selection_select_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
 }
@@ -3361,24 +3361,24 @@ void selectFocusIndex (int index) {
 	*/
 	if (!(0 <= index && index < itemCount))  return;
 	TableItem item = _getItem (index);
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, item.handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_view_set_cursor (handle, path, 0, false);
+	GTK.gtk_tree_view_set_cursor (handle, path, 0, false);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 }
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
-	OS.gtk_widget_modify_base (handle, 0, color);
+	GTK.gtk_widget_modify_base (handle, 0, color);
 }
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	/* Setting the background color overrides the selected background color.
 	 * To prevent this, we need to re-set the default. This can be done with CSS
 	 * on GTK3.14+, or by using GtkStateFlags as an argument to
@@ -3390,8 +3390,8 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 		background = rgba;
 	}
 	GdkRGBA selectedBackground = display.getSystemColor(SWT.COLOR_LIST_SELECTION).handleRGBA;
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "treeview" : "GtkTreeView";
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "treeview" : "GtkTreeView";
 		String css = name + " {background-color: " + display.gtk_rgba_to_css_string(background) + ";}\n"
                 + name + ":selected {background-color: " + display.gtk_rgba_to_css_string(selectedBackground) + ";}";
 
@@ -3403,7 +3403,7 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 		gtk_css_provider_load_from_css(context, finalCss);
 	} else {
 		super.setBackgroundGdkRGBA(context, handle, rgba);
-		OS.gtk_widget_override_background_color(handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground);
+		GTK.gtk_widget_override_background_color(handle, GTK.GTK_STATE_FLAG_SELECTED, selectedBackground);
 	}
 }
 
@@ -3424,7 +3424,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	* a new shell is created. The fix is to ensure the tree view is realized
 	* after it has been resized.
 	*/
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	return result;
 }
 
@@ -3470,7 +3470,7 @@ public void setColumnOrder (int [] order) {
 	for (int i=0; i<order.length; i++) {
 		long /*int*/ column = columns [order [i]].handle;
 		long /*int*/ baseColumn = i == 0 ? 0 : columns [order [i-1]].handle;
-		OS.gtk_tree_view_move_column_after (handle, column, baseColumn);
+		GTK.gtk_tree_view_move_column_after (handle, column, baseColumn);
 	}
 }
 
@@ -3487,8 +3487,8 @@ void setFontDescription (long /*int*/ font) {
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION (3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 14, 0)) {
 		foreground = rgba;
 		GdkRGBA toSet = rgba == null ? display.COLOR_LIST_FOREGROUND_RGBA : rgba;
 		setForegroundGdkRGBA (handle, toSet);
@@ -3499,7 +3499,7 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (handle, color, false);
 }
 
@@ -3531,27 +3531,27 @@ public void setHeaderBackground(Color color) {
 			return;
 	}
 	headerBackground = color;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA background;
 		if (headerBackground != null) {
 			background = headerBackground.handleRGBA;
 		} else {
 			background = defaultBackground();
 		}
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
 		// background works for 3.18 and later, background-color only as of 3.20
 		String css = name + " {background: " + display.gtk_rgba_to_css_string(background) + ";}\n";
 		headerCSSBackground = css;
 		String finalCss = display.gtk_css_create_css_color_string (headerCSSBackground, headerCSSForeground, SWT.BACKGROUND);
 		for (TableColumn column : columns) {
 			if (column != null) {
-				long /*int*/ context = OS.gtk_widget_get_style_context(column.buttonHandle);
+				long /*int*/ context = GTK.gtk_widget_get_style_context(column.buttonHandle);
 				// Create provider as we need it attached to the proper context which is not the widget one
-				long /*int*/ provider = OS.gtk_css_provider_new ();
-				OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+				long /*int*/ provider = GTK.gtk_css_provider_new ();
+				GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 				OS.g_object_unref (provider);
-				OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (finalCss, true), -1, null);
-				OS.gtk_style_context_invalidate(context);
+				GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (finalCss, true), -1, null);
+				GTK.gtk_style_context_invalidate(context);
 			}
 		}
 	}
@@ -3586,26 +3586,26 @@ public void setHeaderForeground (Color color) {
 			return;
 	}
 	headerForeground = color;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA foreground;
 		if (headerForeground != null) {
 			foreground = headerForeground.handleRGBA;
 		} else {
 			foreground = display.COLOR_LIST_FOREGROUND_RGBA;
 		}
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
 		String css = name + " {color: " + display.gtk_rgba_to_css_string(foreground) + ";}";
 		headerCSSForeground = css;
 		String finalCss = display.gtk_css_create_css_color_string (headerCSSBackground, headerCSSForeground, SWT.FOREGROUND);
 		for (TableColumn column : columns) {
 			if (column != null) {
-				long /*int*/ context = OS.gtk_widget_get_style_context(column.buttonHandle);
+				long /*int*/ context = GTK.gtk_widget_get_style_context(column.buttonHandle);
 				// Create provider as we need it attached to the proper context which is not the widget one
-				long /*int*/ provider = OS.gtk_css_provider_new ();
-				OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+				long /*int*/ provider = GTK.gtk_css_provider_new ();
+				GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 				OS.g_object_unref (provider);
-				OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (finalCss, true), -1, null);
-				OS.gtk_style_context_invalidate(context);
+				GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (finalCss, true), -1, null);
+				GTK.gtk_style_context_invalidate(context);
 			}
 		}
 	}
@@ -3630,7 +3630,7 @@ public void setHeaderForeground (Color color) {
  */
 public void setHeaderVisible (boolean show) {
 	checkWidget ();
-	OS.gtk_tree_view_set_headers_visible (handle, show);
+	GTK.gtk_tree_view_set_headers_visible (handle, show);
 }
 
 /**
@@ -3657,13 +3657,13 @@ public void setItemCount (int count) {
 	System.arraycopy (items, 0, newItems, 0, itemCount);
 	items = newItems;
 	if (isVirtual) {
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 		if (iter == 0) error (SWT.ERROR_NO_HANDLES);
 		if (fixAccessibility ()) {
 			ignoreAccessibility = true;
 		}
 		for (int i=itemCount; i<count; i++) {
-			OS.gtk_list_store_append (modelHandle, iter);
+			GTK.gtk_list_store_append (modelHandle, iter);
 		}
 		if (fixAccessibility ()) {
 			ignoreAccessibility = false;
@@ -3698,11 +3698,11 @@ public void setItemCount (int count) {
  */
 public void setLinesVisible (boolean show) {
 	checkWidget();
-	if (!OS.GTK3) {
-		OS.gtk_tree_view_set_rules_hint (handle, show);
+	if (!GTK.GTK3) {
+		GTK.gtk_tree_view_set_rules_hint (handle, show);
 	}
 	//Note: this is overriden by the active theme in GTK3.
-	OS.gtk_tree_view_set_grid_lines (handle, show ? OS.GTK_TREE_VIEW_GRID_LINES_VERTICAL : OS.GTK_TREE_VIEW_GRID_LINES_NONE);
+	GTK.gtk_tree_view_set_grid_lines (handle, show ? GTK.GTK_TREE_VIEW_GRID_LINES_VERTICAL : GTK.GTK_TREE_VIEW_GRID_LINES_NONE);
 }
 
 void setModel (long /*int*/ newModel) {
@@ -3736,7 +3736,7 @@ void setParentBackground () {
 @Override
 void setParentWindow (long /*int*/ widget) {
 	long /*int*/ window = eventWindow ();
-	OS.gtk_widget_set_parent_window (widget, window);
+	GTK.gtk_widget_set_parent_window (widget, window);
 }
 
 @Override
@@ -3756,10 +3756,10 @@ public void setRedraw (boolean redraw) {
 
 void setScrollWidth (long /*int*/ column, TableItem item) {
 	if (columnCount != 0 || currentItem == item) return;
-	int width = OS.gtk_tree_view_column_get_fixed_width (column);
+	int width = GTK.gtk_tree_view_column_get_fixed_width (column);
 	int itemWidth = calculateWidth (column, item.handle);
 	if (width < itemWidth) {
-		OS.gtk_tree_view_column_set_fixed_width (column, itemWidth);
+		GTK.gtk_tree_view_column_set_fixed_width (column, itemWidth);
 	}
 }
 
@@ -3784,12 +3784,12 @@ public void setSortColumn (TableColumn column) {
 	checkWidget ();
 	if (column != null && column.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	if (sortColumn != null && !sortColumn.isDisposed()) {
-		OS.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, false);
+		GTK.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, false);
 	}
 	sortColumn = column;
 	if (sortColumn != null && sortDirection != SWT.NONE) {
-		OS.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, true);
-		OS.gtk_tree_view_column_set_sort_order (sortColumn.handle, sortDirection == SWT.DOWN ? 0 : 1);
+		GTK.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, true);
+		GTK.gtk_tree_view_column_set_sort_order (sortColumn.handle, sortDirection == SWT.DOWN ? 0 : 1);
 	}
 }
 
@@ -3812,10 +3812,10 @@ public void setSortDirection  (int direction) {
 	sortDirection = direction;
 	if (sortColumn == null || sortColumn.isDisposed ()) return;
 	if (sortDirection == SWT.NONE) {
-		OS.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, false);
+		GTK.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, false);
 	} else {
-		OS.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, true);
-		OS.gtk_tree_view_column_set_sort_order (sortColumn.handle, sortDirection == SWT.DOWN ? 0 : 1);
+		GTK.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, true);
+		GTK.gtk_tree_view_column_set_sort_order (sortColumn.handle, sortDirection == SWT.DOWN ? 0 : 1);
 	}
 }
 
@@ -4019,16 +4019,16 @@ public void setTopIndex (int index) {
 	 * doesn't exist on GTK2.
 	 */
 	long /*int*/ vAdjustment;
-	if (OS.GTK3){
-		vAdjustment = OS.gtk_scrollable_get_vadjustment(handle);
+	if (GTK.GTK3){
+		vAdjustment = GTK.gtk_scrollable_get_vadjustment(handle);
 	} else {
-		vAdjustment = OS.gtk_tree_view_get_vadjustment(handle);
+		vAdjustment = GTK.gtk_tree_view_get_vadjustment(handle);
 	}
-	cachedAdjustment = OS.gtk_adjustment_get_value(vAdjustment);
+	cachedAdjustment = GTK.gtk_adjustment_get_value(vAdjustment);
 	topIndex = index;
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, _getItem (index).handle);
-	OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
-	OS.gtk_tree_path_free (path);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, _getItem (index).handle);
+	GTK.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
+	GTK.gtk_tree_path_free (path);
 }
 
 /**
@@ -4055,7 +4055,7 @@ public void showColumn (TableColumn column) {
 	if (column.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
 	if (column.parent != this) return;
 
-	OS.gtk_tree_view_scroll_to_cell (handle, 0, column.handle, false, 0, 0);
+	GTK.gtk_tree_view_scroll_to_cell (handle, 0, column.handle, false, 0, 0);
 }
 
 boolean showFirstColumn () {
@@ -4065,11 +4065,11 @@ boolean showFirstColumn () {
 	*/
 	int columnCount = Math.max (1, this.columnCount);
 	for (int i=0; i<columnCount; i++) {
-		long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);
-		if (OS.gtk_tree_view_column_get_visible (column)) return false;
+		long /*int*/ column = GTK.gtk_tree_view_get_column (handle, i);
+		if (GTK.gtk_tree_view_column_get_visible (column)) return false;
 	}
-	long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
-	OS.gtk_tree_view_column_set_visible (firstColumn, true);
+	long /*int*/ firstColumn = GTK.gtk_tree_view_get_column (handle, 0);
+	GTK.gtk_tree_view_column_set_visible (firstColumn, true);
 	return true;
 }
 
@@ -4100,10 +4100,10 @@ public void showItem (TableItem item) {
 }
 
 void showItem (long /*int*/ iter) {
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
 
-	OS.gtk_tree_view_scroll_to_cell (handle, path, 0, false, 0, 0);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_view_scroll_to_cell (handle, path, 0, false, 0, 0);
+	GTK.gtk_tree_path_free (path);
 }
 
 /**
@@ -4137,12 +4137,12 @@ void updateScrollBarValue (ScrollBar bar) {
 	* force the position to be corrected.
 	*/
 	long /*int*/ parentHandle = parentingHandle ();
-	long /*int*/ list = OS.gtk_container_get_children (parentHandle);
+	long /*int*/ list = GTK.gtk_container_get_children (parentHandle);
 	if (list == 0) return;
 	long /*int*/ temp = list;
 	while (temp != 0) {
 		long /*int*/ widget = OS.g_list_data (temp);
-		if (widget != 0) OS.gtk_widget_queue_resize  (widget);
+		if (widget != 0) GTK.gtk_widget_queue_resize  (widget);
 		temp = OS.g_list_next (temp);
 	}
 	OS.g_list_free (list);
@@ -4163,7 +4163,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us
 					if (control != null) {
 						GdkEventExpose gdkEvent = new GdkEventExpose ();
 						OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
-						long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle);
+						long /*int*/ window = GTK.gtk_tree_view_get_bin_window (handle);
 						if (window == gdkEvent.window) {
 							drawBackground (control, window, gdkEvent.region, gdkEvent.area_x, gdkEvent.area_y, gdkEvent.area_width, gdkEvent.area_height);
 						}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java
index 84197ebe47..d9a3574314 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java
@@ -256,7 +256,7 @@ public int getAlignment () {
  */
 public boolean getMoveable() {
 	checkWidget();
-	return OS.gtk_tree_view_column_get_reorderable (handle);
+	return GTK.gtk_tree_view_column_get_reorderable (handle);
 }
 
 /**
@@ -288,7 +288,7 @@ public Table getParent () {
  */
 public boolean getResizable () {
 	checkWidget();
-	return OS.gtk_tree_view_column_get_resizable (handle);
+	return GTK.gtk_tree_view_column_get_resizable (handle);
 }
 
 /**
@@ -326,11 +326,11 @@ public int getWidth () {
 
 int getWidthInPixels () {
 	checkWidget();
-	if (!OS.gtk_tree_view_column_get_visible (handle)) {
+	if (!GTK.gtk_tree_view_column_get_visible (handle)) {
 		return 0;
 	}
-	if (useFixedWidth) return OS.gtk_tree_view_column_get_fixed_width (handle);
-	return OS.gtk_tree_view_column_get_width (handle);
+	if (useFixedWidth) return GTK.gtk_tree_view_column_get_fixed_width (handle);
+	return GTK.gtk_tree_view_column_get_width (handle);
 }
 
 @Override
@@ -344,7 +344,7 @@ long /*int*/ gtk_clicked (long /*int*/ widget) {
 	*/
 	boolean doubleClick = false;
 	boolean postEvent = true;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventButton gdkEvent = new GdkEventButton ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
@@ -392,7 +392,7 @@ long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
 long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
 	useFixedWidth = false;
 	GtkAllocation widgetAllocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (widget, widgetAllocation);
+	GTK.gtk_widget_get_allocation (widget, widgetAllocation);
 	/*
 	 * GTK Feature: gtk_size_allocate is not a reliable signal to tell if the resizes are correct.
 	 * There is a phantom signal that is sent with size of 1x1 at x,y = 0,0 before sending out the
@@ -441,10 +441,10 @@ public void pack () {
 	int width = 0;
 	if (buttonHandle != 0) {
 		GtkRequisition requisition = new GtkRequisition ();
-		if (parent.getHeaderVisible() && OS.GTK_VERSION >= OS.VERSION (3, 8, 0) && !OS.gtk_widget_get_visible(buttonHandle)) {
-			OS.gtk_widget_show(buttonHandle);
+		if (parent.getHeaderVisible() && GTK.GTK_VERSION >= OS.VERSION (3, 8, 0) && !GTK.gtk_widget_get_visible(buttonHandle)) {
+			GTK.gtk_widget_show(buttonHandle);
 			gtk_widget_get_preferred_size (buttonHandle, requisition);
-			OS.gtk_widget_hide(buttonHandle);
+			GTK.gtk_widget_hide(buttonHandle);
 		} else {
 			gtk_widget_get_preferred_size (buttonHandle, requisition);
 		}
@@ -458,11 +458,11 @@ public void pack () {
 			}
 		}
 	} else {
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		if (GTK.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
 			do {
 				width = Math.max (width, parent.calculateWidth (handle, iter));
-			} while (OS.gtk_tree_model_iter_next(parent.modelHandle, iter));
+			} while (GTK.gtk_tree_model_iter_next(parent.modelHandle, iter));
 		}
 		OS.g_free (iter);
 	}
@@ -586,10 +586,10 @@ public void setImage (Image image) {
 		if (imageIndex == -1) imageIndex = headerImageList.add (image);
 		long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
 		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-		OS.gtk_widget_show (imageHandle);
+		GTK.gtk_widget_show (imageHandle);
 	} else {
 		gtk_image_set_from_pixbuf (imageHandle, 0);
-		OS.gtk_widget_hide (imageHandle);
+		GTK.gtk_widget_hide (imageHandle);
 	}
 }
 
@@ -609,7 +609,7 @@ public void setImage (Image image) {
  */
 public void setResizable (boolean resizable) {
 	checkWidget();
-	OS.gtk_tree_view_column_set_resizable (handle, resizable);
+	GTK.gtk_tree_view_column_set_resizable (handle, resizable);
 }
 
 /**
@@ -635,16 +635,16 @@ public void setResizable (boolean resizable) {
  */
 public void setMoveable (boolean moveable) {
 	checkWidget();
-	OS.gtk_tree_view_column_set_reorderable (handle, moveable);
+	GTK.gtk_tree_view_column_set_reorderable (handle, moveable);
 }
 
 @Override
 void setOrientation (boolean create) {
 	if ((parent.style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
 		if (buttonHandle != 0) {
-			int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-			OS.gtk_widget_set_direction (buttonHandle, dir);
-			OS.gtk_container_forall (buttonHandle, display.setDirectionProc, dir);
+			int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+			GTK.gtk_widget_set_direction (buttonHandle, dir);
+			GTK.gtk_container_forall (buttonHandle, display.setDirectionProc, dir);
 		}
 	}
 }
@@ -656,11 +656,11 @@ public void setText (String string) {
 	super.setText (string);
 	char [] chars = fixMnemonic (string);
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+	GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	if (string.length () != 0) {
-		OS.gtk_widget_show (labelHandle);
+		GTK.gtk_widget_show (labelHandle);
 	} else {
-		OS.gtk_widget_hide (labelHandle);
+		GTK.gtk_widget_hide (labelHandle);
 	}
 }
 
@@ -718,15 +718,15 @@ void setWidthInPixels (int width) {
 	if (width == lastWidth) return;
 	if (width > 0) {
 		useFixedWidth = true;
-		OS.gtk_tree_view_column_set_fixed_width (handle, width);
+		GTK.gtk_tree_view_column_set_fixed_width (handle, width);
 	}
 	/*
 	 * Bug in GTK.  For some reason, calling gtk_tree_view_column_set_visible()
 	 * when the parent is not realized fails to show the column. The fix is to
 	 * ensure that the table has been realized.
 	 */
-	if (width != 0) OS.gtk_widget_realize (parent.handle);
-	OS.gtk_tree_view_column_set_visible (handle, width != 0);
+	if (width != 0) GTK.gtk_widget_realize (parent.handle);
+	GTK.gtk_tree_view_column_set_visible (handle, width != 0);
 	lastWidth = width;
 	/*
 	 * Bug in GTK. When the column is made visible the event window of column
@@ -737,7 +737,7 @@ void setWidthInPixels (int width) {
 	 */
 	if (width != 0) {
 		if (buttonHandle != 0) {
-			long /*int*/ window = OS.gtk_widget_get_parent_window (buttonHandle);
+			long /*int*/ window = GTK.gtk_widget_get_parent_window (buttonHandle);
 			if (window != 0) {
 				long /*int*/ windowList = OS.gdk_window_get_children (window);
 				if (windowList != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java
index 769ef891d3..2a965f2084 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java
@@ -117,8 +117,8 @@ TableItem (Table parent, int style, int index, boolean create) {
 	if (create) {
 		parent.createItem (this, index);
 	} else {
-		handle = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		OS.gtk_tree_model_iter_nth_child (parent.modelHandle, handle, 0, index);
+		handle = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		GTK.gtk_tree_model_iter_nth_child (parent.modelHandle, handle, 0, index);
 	}
 }
 
@@ -129,9 +129,9 @@ static Table checkNull (Table control) {
 
 Color _getBackground () {
 	long /*int*/ [] ptr = new long /*int*/ [1];
-	OS.gtk_tree_model_get (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, ptr, -1);
 	if (ptr [0] == 0) return parent.getBackground ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = new GdkRGBA ();
 		OS.memmove(gdkRGBA, ptr [0], GdkRGBA.sizeof);
 		OS.gdk_rgba_free (ptr [0]);
@@ -149,9 +149,9 @@ Color _getBackground (int index) {
 	if (0 > index || index > count - 1) return _getBackground ();
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
 	if (ptr [0] == 0) return _getBackground ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = new GdkRGBA ();
 		OS.memmove(gdkRGBA, ptr [0], GdkRGBA.sizeof);
 		OS.gdk_rgba_free (ptr [0]);
@@ -166,15 +166,15 @@ Color _getBackground (int index) {
 
 boolean _getChecked () {
 	int [] ptr = new int [1];
-	OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
 	return ptr [0] != 0;
 }
 
 Color _getForeground () {
 	long /*int*/ [] ptr = new long /*int*/ [1];
-	OS.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1);
 	if (ptr [0] == 0) return parent.getForeground ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = new GdkRGBA ();
 		OS.memmove(gdkRGBA, ptr [0], GdkRGBA.sizeof);
 		OS.gdk_rgba_free (ptr [0]);
@@ -192,9 +192,9 @@ Color _getForeground (int index) {
 	if (0 > index || index > count - 1) return _getForeground ();
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	int modelIndex =  parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1);
 	if (ptr [0] == 0) return _getForeground ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = new GdkRGBA ();
 		OS.memmove(gdkRGBA, ptr [0], GdkRGBA.sizeof);
 		OS.gdk_rgba_free (ptr [0]);
@@ -212,7 +212,7 @@ Image _getImage (int index) {
 	if (0 > index || index > count - 1) return null;
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1);
 	if (ptr [0] == 0) return null;
 	ImageList imageList = parent.imageList;
 	int imageIndex = imageList.indexOf (ptr [0]);
@@ -226,7 +226,7 @@ String _getText (int index) {
 	if (0 > index || index > count - 1) return "";
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);
 	if (ptr [0] == 0) return "";
 	int length = C.strlen (ptr [0]);
 	byte[] buffer = new byte [length];
@@ -243,13 +243,13 @@ protected void checkSubclass () {
 void clear () {
 	if (parent.currentItem == this) return;
 	if (cached || (parent.style & SWT.VIRTUAL) == 0) {
-		int columnCount = OS.gtk_tree_model_get_n_columns (parent.modelHandle);
+		int columnCount = GTK.gtk_tree_model_get_n_columns (parent.modelHandle);
 		/* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
 		for (int i=Table.CHECKED_COLUMN; i<Table.FOREGROUND_COLUMN; i++) {
-			OS.gtk_list_store_set (parent.modelHandle, handle, i, 0, -1);
+			GTK.gtk_list_store_set (parent.modelHandle, handle, i, 0, -1);
 		}
 		for (int i=Table.FOREGROUND_COLUMN; i<columnCount; i++) {
-			OS.gtk_list_store_set (parent.modelHandle, handle, i, (long /*int*/)0, -1);
+			GTK.gtk_list_store_set (parent.modelHandle, handle, i, (long /*int*/)0, -1);
 		}
 	}
 	cached = false;
@@ -318,22 +318,22 @@ Rectangle getBoundsinPixels () {
 	checkWidget ();
 	if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
 	long /*int*/ parentHandle = parent.handle;
-	long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
+	long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, 0);
 	if (column == 0) return new Rectangle (0, 0, 0, 0);
 	long /*int*/ textRenderer = parent.getTextRenderer (column);
 	long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
 	if (textRenderer == 0 || pixbufRenderer == 0)  return new Rectangle (0, 0, 0, 0);
 
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	OS.gtk_widget_realize (parentHandle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	GTK.gtk_widget_realize (parentHandle);
 
-	boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-	boolean isExpanded = OS.gtk_tree_view_row_expanded (parentHandle, path);
-	OS.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, isExpander, isExpanded);
+	boolean isExpander = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
+	boolean isExpanded = GTK.gtk_tree_view_row_expanded (parentHandle, path);
+	GTK.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, isExpander, isExpanded);
 
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	GTK.gtk_tree_path_free (path);
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
 	int right = rect.x + rect.width;
 
@@ -343,11 +343,11 @@ Rectangle getBoundsinPixels () {
 	parent.ignoreSize = false;
 	rect.width = w [0];
 	int [] buffer = new int [1];
-	if (OS.gtk_tree_view_get_expander_column (parentHandle) == column) {
-		OS.gtk_widget_style_get (parentHandle, OS.expander_size, buffer, 0);
+	if (GTK.gtk_tree_view_get_expander_column (parentHandle) == column) {
+		GTK.gtk_widget_style_get (parentHandle, OS.expander_size, buffer, 0);
 		rect.x += buffer [0] + TreeItem.EXPANDER_EXTRA_PADDING;
 	}
-	OS.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
+	GTK.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
 	int horizontalSeparator = buffer[0];
 	rect.x += horizontalSeparator;
 
@@ -359,9 +359,9 @@ Rectangle getBoundsinPixels () {
 			rect.width = Math.max (0, right - rect.x);
 		}
 	}
-	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
+	int width = GTK.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
 	Rectangle r = new Rectangle (rect.x, rect.y, width, rect.height + 1);
-	if (parent.getHeaderVisible() && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (parent.getHeaderVisible() && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		r.y += parent.getHeaderHeightInPixels();
 	}
 	return r;
@@ -411,17 +411,17 @@ Rectangle getBoundsInPixels (int index) {
 	if (index >= 0 && index < parent.columnCount) {
 		column = parent.columns [index].handle;
 	} else {
-		column = OS.gtk_tree_view_get_column (parentHandle, index);
+		column = GTK.gtk_tree_view_get_column (parentHandle, index);
 	}
 	if (column == 0) return new Rectangle (0, 0, 0, 0);
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	OS.gtk_widget_realize (parentHandle);
-	OS.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, false, false);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	GTK.gtk_widget_realize (parentHandle);
+	GTK.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, false, false);
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	GTK.gtk_tree_path_free (path);
 	int [] cw = new int [1], ch = new int [1];
-	OS.gtk_tree_view_column_cell_get_size (column, null, null, null, cw, ch);
+	GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, cw, ch);
 	rect.height = ch [0];
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
 
@@ -431,9 +431,9 @@ Rectangle getBoundsInPixels (int index) {
 		rect.x += x [0] + w [0];
 		rect.width -= x [0] + w [0];
 	}
-	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
+	int width = GTK.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
 	Rectangle r = new Rectangle (rect.x, rect.y, width, rect.height + 1);
-	if (parent.getHeaderVisible() && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (parent.getHeaderVisible() && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		r.y += parent.getHeaderHeightInPixels();
 	}
 	return r;
@@ -608,16 +608,16 @@ Rectangle getImageBoundsInPixels (int index) {
 	if (index >= 0 && index < parent.columnCount) {
 		column = parent.columns [index].handle;
 	} else {
-		column = OS.gtk_tree_view_get_column (parentHandle, index);
+		column = GTK.gtk_tree_view_get_column (parentHandle, index);
 	}
 	if (column == 0) return new Rectangle (0, 0, 0, 0);
 	long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
 	if (pixbufRenderer == 0)  return new Rectangle (0, 0, 0, 0);
 	GdkRectangle rect = new GdkRectangle ();
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	OS.gtk_widget_realize (parentHandle);
-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-	OS.gtk_tree_path_free (path);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	GTK.gtk_widget_realize (parentHandle);
+	GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	GTK.gtk_tree_path_free (path);
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
 	int [] x = new int [1], w = new int[1];
 	gtk_tree_view_column_cell_get_position (column, pixbufRenderer, x, w);
@@ -628,7 +628,7 @@ Rectangle getImageBoundsInPixels (int index) {
 	 * yet to be sized, as per Bug 469277 & 476419. NOTE: this change has been ported to Tables since Tables/Trees both
 	 * use the same underlying GTK structure.
 	 */
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		if (parent.pixbufSizeSet) {
 			if (x [0] > 0) {
 				rect.x += x [0];
@@ -649,7 +649,7 @@ Rectangle getImageBoundsInPixels (int index) {
 		rect.x += x [0];
 	}
 	rect.width = w [0];
-	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width : 0;
+	int width = GTK.gtk_tree_view_column_get_visible (column) ? rect.width : 0;
 	return new Rectangle (rect.x, rect.y, width, rect.height + 1);
 }
 
@@ -757,23 +757,23 @@ Rectangle getTextBoundsInPixels (int index) {
 	if (index >= 0 && index < parent.columnCount) {
 		column = parent.columns [index].handle;
 	} else {
-		column = OS.gtk_tree_view_get_column (parentHandle, index);
+		column = GTK.gtk_tree_view_get_column (parentHandle, index);
 	}
 	if (column == 0) return new Rectangle (0, 0, 0, 0);
 	long /*int*/ textRenderer = parent.getTextRenderer (column);
 	long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
 	if (textRenderer == 0 || pixbufRenderer == 0)  return new Rectangle (0, 0, 0, 0);
 
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	OS.gtk_widget_realize (parentHandle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	GTK.gtk_widget_realize (parentHandle);
 
-	boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-	boolean isExpanded = OS.gtk_tree_view_row_expanded (parentHandle, path);
-	OS.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, isExpander, isExpanded);
+	boolean isExpander = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
+	boolean isExpanded = GTK.gtk_tree_view_row_expanded (parentHandle, path);
+	GTK.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, isExpander, isExpanded);
 
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	GTK.gtk_tree_path_free (path);
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
 	int right = rect.x + rect.width;
 
@@ -782,11 +782,11 @@ Rectangle getTextBoundsInPixels (int index) {
 	gtk_cell_renderer_get_preferred_size (textRenderer, parentHandle, w, null);
 	parent.ignoreSize = false;
 	int [] buffer = new int [1];
-	if (OS.gtk_tree_view_get_expander_column (parentHandle) == column) {
-		OS.gtk_widget_style_get (parentHandle, OS.expander_size, buffer, 0);
+	if (GTK.gtk_tree_view_get_expander_column (parentHandle) == column) {
+		GTK.gtk_widget_style_get (parentHandle, OS.expander_size, buffer, 0);
 		rect.x += buffer [0] + TreeItem.EXPANDER_EXTRA_PADDING;
 	}
-	OS.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
+	GTK.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
 	int horizontalSeparator = buffer[0];
 	rect.x += horizontalSeparator;
 
@@ -798,7 +798,7 @@ Rectangle getTextBoundsInPixels (int index) {
 	 * NOTE: this change has been ported to Tables since Tables/Trees both use the
 	 * same underlying GTK structure.
 	 */
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		Image image = _getImage(index);
 		int imageWidth = 0;
 		if (image != null) {
@@ -817,7 +817,7 @@ Rectangle getTextBoundsInPixels (int index) {
 			rect.width = Math.max (0, right - rect.x);
 		}
 	}
-	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
+	int width = GTK.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
 	return new Rectangle (rect.x, rect.y, width, rect.height + 1);
 }
 
@@ -860,12 +860,12 @@ public void setBackground (Color color) {
 		error (SWT.ERROR_INVALID_ARGUMENT);
 	}
 	if (_getBackground ().equals (color)) return;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color != null ? color.handleRGBA : null;
-		OS.gtk_list_store_set (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, gdkRGBA, -1);
+		GTK.gtk_list_store_set (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, gdkRGBA, -1);
 	} else {
 		GdkColor gdkColor = color != null ? color.handle : null;
-		OS.gtk_list_store_set (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, gdkColor, -1);
+		GTK.gtk_list_store_set (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, gdkColor, -1);
 	}
 	cached = true;
 }
@@ -897,12 +897,12 @@ public void setBackground (int index, Color color) {
 	int count = Math.max (1, parent.getColumnCount ());
 	if (0 > index || index > count - 1) return;
 	int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color != null ? color.handleRGBA : null;
-		OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, gdkRGBA, -1);
+		GTK.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, gdkRGBA, -1);
 	} else {
 		GdkColor gdkColor = color != null ? color.handle : null;
-		OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, gdkColor, -1);
+		GTK.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, gdkColor, -1);
 	}
 	cached = true;
 
@@ -915,13 +915,13 @@ public void setBackground (int index, Color color) {
 				if (parent.columnCount > 0) {
 					column = parent.columns [index].handle;
 				} else {
-					column = OS.gtk_tree_view_get_column (parentHandle, index);
+					column = GTK.gtk_tree_view_get_column (parentHandle, index);
 				}
 				if (column == 0) return;
 				long /*int*/ textRenderer = parent.getTextRenderer (column);
 				long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
-				OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
-				OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
 			}
 			if (parent.columnCount == 0) {
 				parent.firstCustomDraw = true;
@@ -947,13 +947,13 @@ public void setChecked (boolean checked) {
 	checkWidget();
 	if ((parent.style & SWT.CHECK) == 0) return;
 	if (_getChecked () == checked) return;
-	OS.gtk_list_store_set (parent.modelHandle, handle, Table.CHECKED_COLUMN, checked, -1);
+	GTK.gtk_list_store_set (parent.modelHandle, handle, Table.CHECKED_COLUMN, checked, -1);
 	/*
 	* GTK+'s "inconsistent" state does not match SWT's concept of grayed.  To
 	* show checked+grayed differently from unchecked+grayed, we must toggle the
 	* grayed state on check and uncheck.
 	*/
-	OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, !checked ? false : grayed, -1);
+	GTK.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, !checked ? false : grayed, -1);
 	cached = true;
 }
 
@@ -984,7 +984,7 @@ public void setFont (Font font){
 	this.font = font;
 	if (oldFont != null && oldFont.equals (font)) return;
 	long /*int*/ fontHandle = font != null ? font.handle : 0;
-	OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);
+	GTK.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);
 	cached = true;
 }
 
@@ -1025,7 +1025,7 @@ public void setFont (int index, Font font) {
 
 	int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
 	long /*int*/ fontHandle  = font != null ? font.handle : 0;
-	OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);
+	GTK.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);
 	cached = true;
 
 	if (font != null) {
@@ -1037,13 +1037,13 @@ public void setFont (int index, Font font) {
 				if (parent.columnCount > 0) {
 					column = parent.columns [index].handle;
 				} else {
-					column = OS.gtk_tree_view_get_column (parentHandle, index);
+					column = GTK.gtk_tree_view_get_column (parentHandle, index);
 				}
 				if (column == 0) return;
 				long /*int*/ textRenderer = parent.getTextRenderer (column);
 				long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
-				OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
-				OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
 			}
 			if (parent.columnCount == 0) {
 				parent.firstCustomDraw = true;
@@ -1077,12 +1077,12 @@ public void setForeground (Color color){
 		error (SWT.ERROR_INVALID_ARGUMENT);
 	}
 	if (_getForeground ().equals (color)) return;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color != null ? color.handleRGBA : null;
-		OS.gtk_list_store_set (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, gdkRGBA, -1);
+		GTK.gtk_list_store_set (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, gdkRGBA, -1);
 	} else {
 		GdkColor gdkColor = color != null ? color.handle : null;
-		OS.gtk_list_store_set (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, gdkColor, -1);
+		GTK.gtk_list_store_set (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, gdkColor, -1);
 	}
 	cached = true;
 }
@@ -1114,12 +1114,12 @@ public void setForeground (int index, Color color){
 	int count = Math.max (1, parent.getColumnCount ());
 	if (0 > index || index > count - 1) return;
 	int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color != null ? color.handleRGBA : null;
-		OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, gdkRGBA, -1);
+		GTK.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, gdkRGBA, -1);
 	} else {
 		GdkColor gdkColor = color != null ? color.handle : null;
-		OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, gdkColor, -1);
+		GTK.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, gdkColor, -1);
 	}
 	cached = true;
 
@@ -1132,13 +1132,13 @@ public void setForeground (int index, Color color){
 				if (parent.columnCount > 0) {
 					column = parent.columns [index].handle;
 				} else {
-					column = OS.gtk_tree_view_get_column (parentHandle, index);
+					column = GTK.gtk_tree_view_get_column (parentHandle, index);
 				}
 				if (column == 0) return;
 				long /*int*/ textRenderer = parent.getTextRenderer (column);
 				long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
-				OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
-				OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
 			}
 			if (parent.columnCount == 0) {
 				parent.firstCustomDraw = true;
@@ -1170,8 +1170,8 @@ public void setGrayed (boolean grayed) {
 	* Render checked+grayed as "inconsistent", unchecked+grayed as blank.
 	*/
 	int [] ptr = new int [1];
-	OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
-	OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
+	GTK.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
 	cached = true;
 }
 
@@ -1217,19 +1217,19 @@ public void setImage (int index, Image image) {
 	 * change has been ported to Tables since Tables/Trees both use the same
 	 * underlying GTK structure.
 	 */
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/parentHandle = parent.handle;
-		long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+		long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, index);
 		long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
 		int [] currentWidth = new int [1];
 		int [] currentHeight= new int [1];
-		OS.gtk_cell_renderer_get_fixed_size (pixbufRenderer, currentWidth, currentHeight);
+		GTK.gtk_cell_renderer_get_fixed_size (pixbufRenderer, currentWidth, currentHeight);
 		if (!parent.pixbufSizeSet) {
 			if (image != null) {
 				int iWidth = image.getBoundsInPixels ().width;
 				int iHeight = image.getBoundsInPixels ().height;
 				if (iWidth > currentWidth [0] || iHeight > currentHeight [0]) {
-					OS.gtk_cell_renderer_set_fixed_size (pixbufRenderer, iWidth, iHeight);
+					GTK.gtk_cell_renderer_set_fixed_size (pixbufRenderer, iWidth, iHeight);
 					parent.pixbufHeight = iHeight;
 					parent.pixbufWidth = iWidth;
 					parent.pixbufSizeSet = true;
@@ -1243,12 +1243,12 @@ public void setImage (int index, Image image) {
 			 * which results in icons being set to 0. Fix is to compare only positive sizes.
 			 */
 			if (parent.pixbufWidth > Math.max(currentWidth [0], 0) || parent.pixbufHeight > Math.max(currentHeight [0], 0)) {
-				OS.gtk_cell_renderer_set_fixed_size (pixbufRenderer, parent.pixbufWidth, parent.pixbufHeight);
+				GTK.gtk_cell_renderer_set_fixed_size (pixbufRenderer, parent.pixbufWidth, parent.pixbufHeight);
 			}
 		}
 	}
 	int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, pixbuf, -1);
+	GTK.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, pixbuf, -1);
 	/*
 	 * Bug in GTK.  When in fixed height mode, GTK does not recalculate the cell renderer width
 	 * when the image is changed in the model.  The fix is to force it to recalculate the width if
@@ -1257,7 +1257,7 @@ public void setImage (int index, Image image) {
 	if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
 		if (image != null) {
 			long /*int*/parentHandle = parent.handle;
-			long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+			long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, index);
 			int [] w = new int [1];
 			long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);
 			gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
@@ -1267,8 +1267,8 @@ public void setImage (int index, Image image) {
 				* are relying on the fact that it is done as part of modifying
 				* the style.
 				*/
-				if (!OS.GTK3) {
-					long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+				if (!GTK.GTK3) {
+					long /*int*/ style = GTK.gtk_widget_get_modifier_style (parentHandle);
 					parent.modifyStyle (parentHandle, style);
 				}
 			}
@@ -1282,7 +1282,7 @@ public void setImage (int index, Image image) {
 	 */
 	long /*int*/ column;
 	if (parent.columnCount == 0) {
-		column = OS.gtk_tree_view_get_column (parent.handle, index);
+		column = GTK.gtk_tree_view_get_column (parent.handle, index);
 		parent.maxWidth = Math.max(parent.maxWidth, parent.calculateWidth(column, this.handle));
 	}
 }
@@ -1370,7 +1370,7 @@ public void setText (int index, String string) {
 	}
 	byte[] buffer = Converter.wcsToMbcs (string, true);
 	int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, buffer, -1);
+	GTK.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, buffer, -1);
 	cached = true;
 	/*
 	 * Bug 465056: single column Tables have a very small initial width.
@@ -1379,7 +1379,7 @@ public void setText (int index, String string) {
 	 */
 	long /*int*/ column;
 	if (parent.columnCount == 0) {
-		column = OS.gtk_tree_view_get_column (parent.handle, index);
+		column = GTK.gtk_tree_view_get_column (parent.handle, index);
 		parent.maxWidth = Math.max(parent.maxWidth, parent.calculateWidth(column, this.handle));
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
index 73609e5c9e..17482e3aca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
@@ -71,7 +71,7 @@ public class Text extends Scrollable {
 	static final char RTL_MARK = '\u200f';
 	int[] segments;
 
-	static final int ITER_SIZEOF = OS.GtkTextIter_sizeof();
+	static final int ITER_SIZEOF = GTK.GtkTextIter_sizeof();
 	static final int SPACE_FOR_CURSOR = 1;
 
 	/**
@@ -156,12 +156,12 @@ public Text (Composite parent, int style) {
 		 */
 		if ((style & SWT.ICON_CANCEL) != 0) {
 			this.style |= SWT.ICON_CANCEL;
-			OS.gtk_entry_set_icon_from_icon_name (handle, OS.GTK_ENTRY_ICON_SECONDARY, OS.GTK_NAMED_ICON_CLEAR);
-			OS.gtk_entry_set_icon_sensitive (handle, OS.GTK_ENTRY_ICON_SECONDARY, false);
+			GTK.gtk_entry_set_icon_from_icon_name (handle, GTK.GTK_ENTRY_ICON_SECONDARY, GTK.GTK_NAMED_ICON_CLEAR);
+			GTK.gtk_entry_set_icon_sensitive (handle, GTK.GTK_ENTRY_ICON_SECONDARY, false);
 		}
 		if ((style & SWT.ICON_SEARCH) != 0) {
 			this.style |= SWT.ICON_SEARCH;
-			OS.gtk_entry_set_icon_from_icon_name (handle, OS.GTK_ENTRY_ICON_PRIMARY, OS.GTK_NAMED_ICON_FIND);
+			GTK.gtk_entry_set_icon_from_icon_name (handle, GTK.GTK_ENTRY_ICON_PRIMARY, GTK.GTK_NAMED_ICON_FIND);
 		}
 	}
 }
@@ -201,60 +201,60 @@ void createHandle (int index) {
 	}
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
 	if ((style & SWT.SINGLE) != 0) {
-		handle = OS.gtk_entry_new ();
+		handle = GTK.gtk_entry_new ();
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (fixedHandle, handle);
-		OS.gtk_editable_set_editable (handle, (style & SWT.READ_ONLY) == 0);
+		GTK.gtk_container_add (fixedHandle, handle);
+		GTK.gtk_editable_set_editable (handle, (style & SWT.READ_ONLY) == 0);
 		/*
 		 * We need to handle borders differently in GTK3.20+. GtkEntry without frame will have a blank background color.
 		 * So let's set border via css and override the background in this case to be COLOR_LIST_BACKGROUND.
 		 */
-		if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) {
 				if ((style & SWT.BORDER) == 0) {
-					OS.gtk_entry_set_has_frame(handle, false);
-					long /*int*/ context = OS.gtk_widget_get_style_context(handle);
+					GTK.gtk_entry_set_has_frame(handle, false);
+					long /*int*/ context = GTK.gtk_widget_get_style_context(handle);
 					String background = display.gtk_rgba_to_css_string(display.COLOR_LIST_BACKGROUND_RGBA);
 					gtk_css_provider_load_from_css(context, "entry {border: solid; background: " + background + ";}");
-					OS.gtk_style_context_invalidate(context);
+					GTK.gtk_style_context_invalidate(context);
 				}
 		} else {
-			OS.gtk_entry_set_has_frame (handle, (style & SWT.BORDER) != 0);
+			GTK.gtk_entry_set_has_frame (handle, (style & SWT.BORDER) != 0);
 		}
-		OS.gtk_entry_set_visibility (handle, (style & SWT.PASSWORD) == 0);
+		GTK.gtk_entry_set_visibility (handle, (style & SWT.PASSWORD) == 0);
 		float alignment = 0.0f;
 		if ((style & SWT.CENTER) != 0) alignment = 0.5f;
 		if ((style & SWT.RIGHT) != 0) alignment = 1.0f;
 		if (alignment > 0.0f) {
-			OS.gtk_entry_set_alignment (handle, alignment);
+			GTK.gtk_entry_set_alignment (handle, alignment);
 		}
 	} else {
-		scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
+		scrolledHandle = GTK.gtk_scrolled_window_new (0, 0);
 		if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		handle = OS.gtk_text_view_new ();
+		handle = GTK.gtk_text_view_new ();
 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-		bufferHandle = OS.gtk_text_view_get_buffer (handle);
+		bufferHandle = GTK.gtk_text_view_get_buffer (handle);
 		if (bufferHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		OS.gtk_container_add (fixedHandle, scrolledHandle);
-		OS.gtk_container_add (scrolledHandle, handle);
-		OS.gtk_text_view_set_editable (handle, (style & SWT.READ_ONLY) == 0);
-		if ((style & SWT.WRAP) != 0) OS.gtk_text_view_set_wrap_mode (handle, OS.GTK_WRAP_WORD_CHAR);
-		int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-		int vsp = (style & SWT.V_SCROLL) != 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
-		OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
+		GTK.gtk_container_add (fixedHandle, scrolledHandle);
+		GTK.gtk_container_add (scrolledHandle, handle);
+		GTK.gtk_text_view_set_editable (handle, (style & SWT.READ_ONLY) == 0);
+		if ((style & SWT.WRAP) != 0) GTK.gtk_text_view_set_wrap_mode (handle, GTK.GTK_WRAP_WORD_CHAR);
+		int hsp = (style & SWT.H_SCROLL) != 0 ? GTK.GTK_POLICY_ALWAYS : GTK.GTK_POLICY_NEVER;
+		int vsp = (style & SWT.V_SCROLL) != 0 ? GTK.GTK_POLICY_ALWAYS : GTK.GTK_POLICY_NEVER;
+		GTK.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
 		if ((style & SWT.BORDER) != 0) {
-			OS.gtk_scrolled_window_set_shadow_type (scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
+			GTK.gtk_scrolled_window_set_shadow_type (scrolledHandle, GTK.GTK_SHADOW_ETCHED_IN);
 		}
-		int just = OS.GTK_JUSTIFY_LEFT;
-		if ((style & SWT.CENTER) != 0) just = OS.GTK_JUSTIFY_CENTER;
-		if ((style & SWT.RIGHT) != 0) just = OS.GTK_JUSTIFY_RIGHT;
-		OS.gtk_text_view_set_justification (handle, just);
+		int just = GTK.GTK_JUSTIFY_LEFT;
+		if ((style & SWT.CENTER) != 0) just = GTK.GTK_JUSTIFY_CENTER;
+		if ((style & SWT.RIGHT) != 0) just = GTK.GTK_JUSTIFY_RIGHT;
+		GTK.gtk_text_view_set_justification (handle, just);
 	}
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		imContext = OS.imContextLast();
 		if ((style & SWT.SINGLE) != 0) {
-			OS.gtk_entry_set_width_chars(handle, 6);
+			GTK.gtk_entry_set_width_chars(handle, 6);
 		}
 		// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 		// reset to default font to get the usual behavior
@@ -426,15 +426,15 @@ public void append (String string) {
 	byte [] buffer = Converter.wcsToMbcs (string, false);
 	clearSegments (true);
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_editable_insert_text (handle, buffer, buffer.length, new int[]{-1});
-		OS.gtk_editable_set_position (handle, -1);
+		GTK.gtk_editable_insert_text (handle, buffer, buffer.length, new int[]{-1});
+		GTK.gtk_editable_set_position (handle, -1);
 	} else {
 		byte [] position =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_end_iter (bufferHandle, position);
-		OS.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length);
-		OS.gtk_text_buffer_place_cursor (bufferHandle, position);
-		long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-		OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
+		GTK.gtk_text_buffer_get_end_iter (bufferHandle, position);
+		GTK.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length);
+		GTK.gtk_text_buffer_place_cursor (bufferHandle, position);
+		long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+		GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
 	}
 	applySegments ();
 }
@@ -466,8 +466,8 @@ void applySegments () {
 	if ((style & SWT.SINGLE) != 0) {
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-		int limit = OS.gtk_entry_get_max_length (handle);
-		if (limit != 0) OS.gtk_entry_set_max_length (handle, translateOffset (limit));
+		int limit = GTK.gtk_entry_get_max_length (handle);
+		if (limit != 0) GTK.gtk_entry_set_max_length (handle, translateOffset (limit));
 		int [] pos = new int [1];
 		for (int i = 0; i < nSegments; i++) {
 			pos [0] = segments [i] + i;
@@ -475,9 +475,9 @@ void applySegments () {
 				separator [0] = segmentsChars [i];
 			}
 			byte [] buffer = Converter.wcsToMbcs (separator, false);
-			long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+			long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 			pos [0] = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, pos [0]);
-			OS.gtk_editable_insert_text (handle, buffer, buffer.length, pos);
+			GTK.gtk_editable_insert_text (handle, buffer, buffer.length, pos);
 		}
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
@@ -488,15 +488,15 @@ void applySegments () {
 		byte [] startIter =  new byte [ITER_SIZEOF];
 		byte [] endIter =  new byte [ITER_SIZEOF];
 		for (int i = 0; i < nSegments; i++) {
-			OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
-			long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
-			OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, pos, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + i));
+			GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
+			long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+			GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, pos, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + i));
 			OS.g_free (ptr);
 			if (segmentsChars != null && segmentsChars.length > i) {
 				separator [0] = segmentsChars [i];
 			}
 			byte [] buffer = Converter.wcsToMbcs (separator, false);
-			OS.gtk_text_buffer_insert (bufferHandle, pos, buffer, buffer.length);
+			GTK.gtk_text_buffer_insert (bufferHandle, pos, buffer, buffer.length);
 		}
 		OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
@@ -512,17 +512,17 @@ void clearSegments (boolean applyText) {
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		if (applyText) {
 			OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
-			long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+			long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 			int start, end;
 			for (int i = 0; i < nSegments; i++) {
 				start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]);
 				end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1);
-				OS.gtk_editable_delete_text (handle, start, end);
+				GTK.gtk_editable_delete_text (handle, start, end);
 			}
 			OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 		}
-		int limit = OS.gtk_entry_get_max_length (handle);
-		if (limit != 0) OS.gtk_entry_set_max_length (handle, untranslateOffset (limit));
+		int limit = GTK.gtk_entry_get_max_length (handle);
+		if (limit != 0) GTK.gtk_entry_set_max_length (handle, untranslateOffset (limit));
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	} else if (applyText) {
 		OS.g_signal_handlers_block_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -530,11 +530,11 @@ void clearSegments (boolean applyText) {
 		byte [] start = new byte [ITER_SIZEOF], end = new byte [ITER_SIZEOF];
 		byte [] startIter =  new byte [ITER_SIZEOF], endIter =  new byte [ITER_SIZEOF];
 		for (int i = 0; i < nSegments; i++) {
-			OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
-			long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
-			OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]));
-			OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, end, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1));
-			OS.gtk_text_buffer_delete (bufferHandle, start, end);
+			GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
+			long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+			GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]));
+			GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, end, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1));
+			GTK.gtk_text_buffer_delete (bufferHandle, start, end);
 			OS.g_free (ptr);
 		}
 		OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_RANGE);
@@ -554,13 +554,13 @@ void clearSegments (boolean applyText) {
 public void clearSelection () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		int position = OS.gtk_editable_get_position (handle);
-		OS.gtk_editable_select_region (handle, position, position);
+		int position = GTK.gtk_editable_get_position (handle);
+		GTK.gtk_editable_select_region (handle, position, position);
 	} else {
 		byte [] position = new byte [ITER_SIZEOF];
-		long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);
-		OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, insertMark);
-		OS.gtk_text_buffer_select_range(bufferHandle, position, position);
+		long /*int*/ insertMark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+		GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, insertMark);
+		GTK.gtk_text_buffer_select_range(bufferHandle, position, position);
 	}
 }
 
@@ -571,14 +571,14 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
 	int[] w = new int [1], h = new int [1];
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_widget_realize (handle);
-		long /*int*/ layout = OS.gtk_entry_get_layout (handle);
+		GTK.gtk_widget_realize (handle);
+		long /*int*/ layout = GTK.gtk_entry_get_layout (handle);
 		OS.pango_layout_get_pixel_size (layout, w, h);
 	} else {
 		byte [] start =  new byte [ITER_SIZEOF], end  =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_bounds (bufferHandle, start, end);
-		long /*int*/ text = OS.gtk_text_buffer_get_text (bufferHandle, start, end, true);
-		long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, text);
+		GTK.gtk_text_buffer_get_bounds (bufferHandle, start, end);
+		long /*int*/ text = GTK.gtk_text_buffer_get_text (bufferHandle, start, end, true);
+		long /*int*/ layout = GTK.gtk_widget_create_pango_layout (handle, text);
 		OS.g_free (text);
 		OS.pango_layout_set_width (layout, wHint * OS.PANGO_SCALE);
 		OS.pango_layout_get_pixel_size (layout, w, h);
@@ -588,7 +588,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	int height = h [0];
 	if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
 		byte [] buffer = Converter.wcsToMbcs (message, true);
-		long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+		long /*int*/ layout = GTK.gtk_widget_create_pango_layout (handle, buffer);
 		Arrays.fill (buffer, (byte) 0);
 		OS.pango_layout_get_pixel_size (layout, w, h);
 		OS.g_object_unref (layout);
@@ -608,13 +608,13 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 	Rectangle trim = super.computeTrimInPixels (x, y, width, height);
 	int xborder = 0, yborder = 0;
 	if ((style & SWT.SINGLE) != 0) {
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			GtkBorder tmp = new GtkBorder();
-			long /*int*/ context = OS.gtk_widget_get_style_context (handle);
-			if (OS.GTK_VERSION < OS.VERSION(3, 18, 0)) {
-				OS.gtk_style_context_get_padding (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+			long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
+			if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0)) {
+				GTK.gtk_style_context_get_padding (context, GTK.GTK_STATE_FLAG_NORMAL, tmp);
 			} else {
-				OS.gtk_style_context_get_padding (context, OS.gtk_widget_get_state_flags(handle), tmp);
+				GTK.gtk_style_context_get_padding (context, GTK.gtk_widget_get_state_flags(handle), tmp);
 			}
 			trim.x -= tmp.left;
 			trim.y -= tmp.top;
@@ -626,10 +626,10 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 				trim.height += tmp.top + tmp.bottom;
 			}
 			if ((style & SWT.BORDER) != 0) {
-				if (OS.GTK_VERSION < OS.VERSION(3, 18, 0)) {
-					OS.gtk_style_context_get_border (context, OS.GTK_STATE_FLAG_NORMAL, tmp);
+				if (GTK.GTK_VERSION < OS.VERSION(3, 18, 0)) {
+					GTK.gtk_style_context_get_border (context, GTK.GTK_STATE_FLAG_NORMAL, tmp);
 				} else {
-					OS.gtk_style_context_get_border (context, OS.gtk_widget_get_state_flags(handle), tmp);
+					GTK.gtk_style_context_get_border (context, GTK.gtk_widget_get_state_flags(handle), tmp);
 				}
 				trim.x -= tmp.left;
 				trim.y -= tmp.top;
@@ -637,10 +637,10 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 				trim.height += tmp.top + tmp.bottom;
 			}
 			GdkRectangle icon_area = new GdkRectangle();
-			OS.gtk_entry_get_icon_area(handle, OS.GTK_ENTRY_ICON_PRIMARY, icon_area);
+			GTK.gtk_entry_get_icon_area(handle, GTK.GTK_ENTRY_ICON_PRIMARY, icon_area);
 			trim.x -= icon_area.width;
 			trim.width += icon_area.width;
-			OS.gtk_entry_get_icon_area(handle, OS.GTK_ENTRY_ICON_SECONDARY, icon_area);
+			GTK.gtk_entry_get_icon_area(handle, GTK.GTK_ENTRY_ICON_SECONDARY, icon_area);
 			trim.width += icon_area.width;
 		} else {
 			if ((style & SWT.BORDER) != 0) {
@@ -655,14 +655,14 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 			trim.height += innerBorder.top + innerBorder.bottom;
 		}
 	} else {
-		int borderWidth = OS.gtk_container_get_border_width (handle);
+		int borderWidth = GTK.gtk_container_get_border_width (handle);
 		xborder += borderWidth;
 		yborder += borderWidth;
 	}
 	int [] property = new int [1];
-	OS.gtk_widget_style_get (handle, OS.interior_focus, property, 0);
+	GTK.gtk_widget_style_get (handle, OS.interior_focus, property, 0);
 	if (property [0] == 0) {
-		OS.gtk_widget_style_get (handle, OS.focus_line_width, property, 0);
+		GTK.gtk_widget_style_get (handle, OS.focus_line_width, property, 0);
 		xborder += property [0];
 		yborder += property [0];
 	}
@@ -688,11 +688,11 @@ Rectangle computeTrimInPixels (int x, int y, int width, int height) {
 public void copy () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_editable_copy_clipboard (handle);
+		GTK.gtk_editable_copy_clipboard (handle);
 	} else {
-		long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
+		long /*int*/ clipboard = GTK.gtk_clipboard_get (OS.GDK_NONE);
 		clearSegments (true);
-		OS.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard);
+		GTK.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard);
 		applySegments ();
 	}
 }
@@ -712,11 +712,11 @@ public void copy () {
 public void cut () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_editable_cut_clipboard (handle);
+		GTK.gtk_editable_cut_clipboard (handle);
 	} else {
-		long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
+		long /*int*/ clipboard = GTK.gtk_clipboard_get (OS.GDK_NONE);
 		clearSegments (true);
-		OS.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, OS.gtk_text_view_get_editable (handle));
+		GTK.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, GTK.gtk_text_view_get_editable (handle));
 		applySegments ();
 	}
 }
@@ -771,7 +771,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 	 * be removed without overriding it. It is better to take the signal from GTK and send it
 	 * back to SWT instead.
 	 */
-	boolean isDraggable = (OS.GTK_VERSION < OS.VERSION(3, 14, 0)) ? insideBlockSelection(x, y) : false;
+	boolean isDraggable = (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) ? insideBlockSelection(x, y) : false;
 	if (filter) {
 		if (isDraggable && super.dragDetect (x, y, filter, dragOnTimeout, consume)) {
 			if (consume != null) consume [0] = true;
@@ -793,7 +793,7 @@ boolean filterKey (int keyval, long /*int*/ event) {
 		lastEventTime = time;
 		long /*int*/ imContext = imContext ();
 		if (imContext != 0) {
-			return OS.gtk_im_context_filter_keypress (imContext, event);
+			return GTK.gtk_im_context_filter_keypress (imContext, event);
 		}
 	}
 	gdkEventKey = event;
@@ -812,7 +812,7 @@ void fixIM () {
 	if (gdkEventKey != 0 && gdkEventKey != -1) {
 		long /*int*/ imContext = imContext ();
 		if (imContext != 0) {
-			OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
+			GTK.gtk_im_context_filter_keypress (imContext, gdkEventKey);
 			gdkEventKey = -1;
 			return;
 		}
@@ -822,7 +822,7 @@ void fixIM () {
 
 @Override
 GdkColor getBackgroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getBaseGdkColor ();
 }
 
@@ -853,9 +853,9 @@ public int getCaretLineNumber () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) return 0;
 	byte [] position = new byte [ITER_SIZEOF];
-	long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-	OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
-	return OS.gtk_text_iter_get_line (position);
+	long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+	GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
+	return GTK.gtk_text_iter_get_line (position);
 }
 
 /**
@@ -877,11 +877,11 @@ public Point getCaretLocation () {
 Point getCaretLocationInPixels () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		int index = OS.gtk_editable_get_position (handle);
-		index = OS.gtk_entry_text_index_to_layout_index (handle, index);
+		int index = GTK.gtk_editable_get_position (handle);
+		index = GTK.gtk_entry_text_index_to_layout_index (handle, index);
 		int [] offset_x = new int [1], offset_y = new int [1];
-		OS.gtk_entry_get_layout_offsets (handle, offset_x, offset_y);
-		long /*int*/ layout = OS.gtk_entry_get_layout (handle);
+		GTK.gtk_entry_get_layout_offsets (handle, offset_x, offset_y);
+		long /*int*/ layout = GTK.gtk_entry_get_layout (handle);
 		PangoRectangle pos = new PangoRectangle ();
 		OS.pango_layout_index_to_pos (layout, index, pos);
 		int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidthInPixels ();
@@ -889,13 +889,13 @@ Point getCaretLocationInPixels () {
 		return new Point (x, y);
 	}
 	byte [] position = new byte [ITER_SIZEOF];
-	long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-	OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
+	long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+	GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_text_view_get_iter_location (handle, position, rect);
+	GTK.gtk_text_view_get_iter_location (handle, position, rect);
 	int [] x = new int [1];
 	int [] y  = new int [1];
-	OS.gtk_text_view_buffer_to_window_coords (handle, OS.GTK_TEXT_WINDOW_TEXT, rect.x, rect.y, x, y);
+	GTK.gtk_text_view_buffer_to_window_coords (handle, GTK.GTK_TEXT_WINDOW_TEXT, rect.x, rect.y, x, y);
 	return new Point (x [0], y [0]);
 }
 
@@ -916,16 +916,16 @@ public int getCaretPosition () {
 	checkWidget ();
 	int result;
 	if ((style & SWT.SINGLE) != 0)  {
-		long /*int*/ ptr = OS.gtk_entry_get_text (handle);
-		result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_editable_get_position (handle));
+		long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
+		result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_editable_get_position (handle));
 	} else {
 		byte [] position = new byte [ITER_SIZEOF];
-		long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-		OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
+		long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+		GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
 		byte [] zero = new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
-		long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
-		result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (position));
+		GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
+		long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
+		result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (position));
 		OS.g_free (ptr);
 	}
 	return untranslateOffset (result);
@@ -945,13 +945,13 @@ public int getCharCount () {
 	checkWidget ();
 	int result;
 	if ((style & SWT.SINGLE) != 0) {
-		long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+		long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 		result = (int)/*64*/OS.g_utf16_strlen (ptr, -1);
 	} else {
 		byte [] startIter =  new byte [ITER_SIZEOF];
 		byte [] endIter =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
-		long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+		GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
+		long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
 		result = (int)/*64*/OS.g_utf16_strlen(ptr, -1);
 		OS.g_free (ptr);
 	}
@@ -998,8 +998,8 @@ public boolean getDoubleClickEnabled () {
 public char getEchoChar () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		if (!OS.gtk_entry_get_visibility (handle)) {
-			return OS.gtk_entry_get_invisible_char (handle);
+		if (!GTK.gtk_entry_get_visibility (handle)) {
+			return GTK.gtk_entry_get_invisible_char (handle);
 		}
 	}
 	return '\0';
@@ -1018,14 +1018,14 @@ public char getEchoChar () {
 public boolean getEditable () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		return OS.gtk_editable_get_editable (handle);
+		return GTK.gtk_editable_get_editable (handle);
 	}
-	return OS.gtk_text_view_get_editable (handle);
+	return GTK.gtk_text_view_get_editable (handle);
 }
 
 @Override
 GdkColor getForegroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getTextColor ();
 }
 
@@ -1042,7 +1042,7 @@ GdkColor getForegroundGdkColor () {
 public int getLineCount () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) return 1;
-	return OS.gtk_text_buffer_get_line_count (bufferHandle);
+	return GTK.gtk_text_buffer_get_line_count (bufferHandle);
 }
 
 /**
@@ -1123,17 +1123,17 @@ public int getOrientation () {
 	if ((style & SWT.SINGLE) != 0) {
 		int [] index = new int [1];
 		int [] trailing = new int [1];
-		long /*int*/ layout = OS.gtk_entry_get_layout (handle);
+		long /*int*/ layout = GTK.gtk_entry_get_layout (handle);
 		OS.pango_layout_xy_to_index (layout, point.x * OS.PANGO_SCALE, point.y * OS.PANGO_SCALE, index, trailing);
 		long /*int*/ ptr = OS.pango_layout_get_text (layout);
 		position = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
 	} else {
 		byte [] p = new byte [ITER_SIZEOF];
-		OS.gtk_text_view_get_iter_at_location (handle, p, point.x, point.y);
+		GTK.gtk_text_view_get_iter_at_location (handle, p, point.x, point.y);
 		byte [] zero = new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
-		long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, p, true);
-		position = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (p));
+		GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
+		long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, p, true);
+		position = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (p));
 		OS.g_free (ptr);
 	}
 	return untranslateOffset (position);
@@ -1163,20 +1163,20 @@ public Point getSelection () {
 	if ((style & SWT.SINGLE) != 0) {
 		int [] start = new int [1];
 		int [] end = new int [1];
-		OS.gtk_editable_get_selection_bounds (handle, start, end);
-		long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+		GTK.gtk_editable_get_selection_bounds (handle, start, end);
+		long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 		start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]);
 		end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]);
 		selection = new Point (start [0], end [0]);
 	} else {
 		byte [] startIter =  new byte [ITER_SIZEOF];
 		byte [] endIter =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter);
+		GTK.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter);
 		byte [] zero = new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
-		long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
-		int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (startIter));
-		int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (endIter));
+		GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
+		long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
+		int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (startIter));
+		int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, GTK.gtk_text_iter_get_offset (endIter));
 		OS.g_free (ptr);
 		selection = new Point (start, end);
 	}
@@ -1239,7 +1239,7 @@ public int getTabs () {
 
 int getTabWidth (int tabs) {
 	byte[] buffer = Converter.wcsToMbcs(" ", true);
-	long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+	long /*int*/ layout = GTK.gtk_widget_create_pango_layout (handle, buffer);
 	int [] width = new int [1];
 	int [] height = new int [1];
 	OS.pango_layout_get_size (layout, width, height);
@@ -1328,12 +1328,12 @@ public char [] getTextChars () {
 	checkWidget ();
 	long /*int*/ address;
 	if ((style & SWT.SINGLE) != 0) {
-		address = OS.gtk_entry_get_text (handle);
+		address = GTK.gtk_entry_get_text (handle);
 	} else {
 		byte [] start =  new byte [ITER_SIZEOF];
 		byte [] end =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_bounds (bufferHandle, start, end);
-		address = OS.gtk_text_buffer_get_text (bufferHandle, start, end, true);
+		GTK.gtk_text_buffer_get_bounds (bufferHandle, start, end);
+		address = GTK.gtk_text_buffer_get_text (bufferHandle, start, end, true);
 	}
 	if (address == 0) return new char[0];
 	int length = C.strlen (address);
@@ -1368,7 +1368,7 @@ public char [] getTextChars () {
 public int getTextLimit () {
 	checkWidget ();
 	if ((style & SWT.MULTI) != 0) return LIMIT;
-	int limit = OS.gtk_entry_get_max_length (handle);
+	int limit = GTK.gtk_entry_get_max_length (handle);
 	return limit == 0 ? 0xFFFF : untranslateOffset (limit);
 }
 
@@ -1403,21 +1403,21 @@ public int getTopIndex () {
 	 * one to see if the user has scrolled/moved the viewport using the GUI.
 	 * If so, we use the old method of fetching the top index.
 	 */
-	if (OS.GTK3) {
-		long /*int*/ vAdjustment = OS.gtk_scrollable_get_vadjustment (handle);
-		currentAdjustment = OS.gtk_adjustment_get_value (vAdjustment);
+	if (GTK.GTK3) {
+		long /*int*/ vAdjustment = GTK.gtk_scrollable_get_vadjustment (handle);
+		currentAdjustment = GTK.gtk_adjustment_get_value (vAdjustment);
 		if (cachedAdjustment == currentAdjustment) {
 			// If indexMark is 0, fetch topIndex using the old method
 			if (indexMark != 0) {
-				OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, indexMark);
-				return OS.gtk_text_iter_get_line (position);
+				GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, indexMark);
+				return GTK.gtk_text_iter_get_line (position);
 			}
 		}
 	}
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_text_view_get_visible_rect (handle, rect);
-	OS.gtk_text_view_get_line_at_y (handle, position, rect.y, null);
-	return OS.gtk_text_iter_get_line (position);
+	GTK.gtk_text_view_get_visible_rect (handle, rect);
+	GTK.gtk_text_view_get_line_at_y (handle, position, rect.y, null);
+	return GTK.gtk_text_iter_get_line (position);
 }
 
 /**
@@ -1450,9 +1450,9 @@ int getTopPixelInPixels () {
 	if ((style & SWT.SINGLE) != 0) return 0;
 	byte [] position = new byte [ITER_SIZEOF];
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_text_view_get_visible_rect (handle, rect);
+	GTK.gtk_text_view_get_visible_rect (handle, rect);
 	int [] lineTop = new int[1];
-	OS.gtk_text_view_get_line_at_y (handle, position, rect.y, lineTop);
+	GTK.gtk_text_view_get_line_at_y (handle, position, rect.y, lineTop);
 	return lineTop [0];
 }
 
@@ -1489,7 +1489,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) {
 	* is to post the modify event when the user is typing.
 	*/
 	boolean keyPress = false;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventKey gdkEvent = new GdkEventKey ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -1507,8 +1507,8 @@ long /*int*/ gtk_changed (long /*int*/ widget) {
 	}
 	if ((style & SWT.SEARCH) != 0) {
 		if ((style & SWT.ICON_CANCEL) != 0) {
-			long /*int*/ ptr = OS.gtk_entry_get_text (handle);
-			OS.gtk_entry_set_icon_sensitive (handle, OS.GTK_ENTRY_ICON_SECONDARY, OS.g_utf16_strlen (ptr, -1) > 0);
+			long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
+			GTK.gtk_entry_set_icon_sensitive (handle, GTK.GTK_ENTRY_ICON_SECONDARY, OS.g_utf16_strlen (ptr, -1) > 0);
 		}
 	}
 	return 0;
@@ -1518,7 +1518,7 @@ long /*int*/ gtk_changed (long /*int*/ widget) {
 long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	if (text == 0) return 0;
 	if ((style & SWT.SINGLE) != 0) {
-		if (!OS.gtk_editable_get_editable (handle)) return 0;
+		if (!GTK.gtk_editable_get_editable (handle)) return 0;
 	}
 	int length = C.strlen (text);
 	if (length == 0) return 0;
@@ -1537,7 +1537,7 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	*/
 	fixStart = fixEnd = -1;
 	OS.g_signal_handlers_block_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, COMMIT);
-	int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
+	int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ());
 	int mask =  OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
 	OS.g_signal_handlers_unblock_matched (imContext, mask, id, 0, 0, 0, handle);
 	if (newChars == chars) {
@@ -1551,8 +1551,8 @@ long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
 	OS.g_signal_handlers_block_matched (imContext, mask, id, 0, 0, 0, handle);
 	if ((style & SWT.SINGLE) != 0) {
 		if (fixStart != -1 && fixEnd != -1) {
-			OS.gtk_editable_set_position (handle, fixStart);
-			OS.gtk_editable_select_region (handle, fixStart, fixEnd);
+			GTK.gtk_editable_set_position (handle, fixStart);
+			GTK.gtk_editable_select_region (handle, fixStart, fixEnd);
 		}
 	}
 	fixStart = fixEnd = -1;
@@ -1566,20 +1566,20 @@ long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*i
 	byte [] endIter = new byte [ITER_SIZEOF];
 	C.memmove (startIter, iter1, startIter.length);
 	C.memmove (endIter, iter2, endIter.length);
-	int start = OS.gtk_text_iter_get_offset (startIter);
-	int end = OS.gtk_text_iter_get_offset (endIter);
+	int start = GTK.gtk_text_iter_get_offset (startIter);
+	int end = GTK.gtk_text_iter_get_offset (endIter);
 	byte [] zero = new byte [ITER_SIZEOF];
-	OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
-	long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
+	GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
+	long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
 	start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start);
 	end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end);
 	OS.g_free (ptr);
 	String newText = verifyText ("", start, end);
 	if (newText == null) {
 		/* Remember the selection when the text was deleted */
-		OS.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter);
-		start = OS.gtk_text_iter_get_offset (startIter);
-		end = OS.gtk_text_iter_get_offset (endIter);
+		GTK.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter);
+		start = GTK.gtk_text_iter_get_offset (startIter);
+		end = GTK.gtk_text_iter_get_offset (endIter);
 		if (start != end) {
 			fixStart = start;
 			fixEnd = end;
@@ -1590,11 +1590,11 @@ long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*i
 			byte [] buffer = Converter.wcsToMbcs (newText, false);
 			OS.g_signal_handlers_block_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			OS.g_signal_handlers_block_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_RANGE);
-			OS.gtk_text_buffer_delete (bufferHandle, startIter, endIter);
+			GTK.gtk_text_buffer_delete (bufferHandle, startIter, endIter);
 			OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_RANGE);
 			OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			OS.g_signal_handlers_block_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
-			OS.gtk_text_buffer_insert (bufferHandle, startIter, buffer, buffer.length);
+			GTK.gtk_text_buffer_insert (bufferHandle, startIter, buffer, buffer.length);
 			OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
 			OS.g_signal_stop_emission_by_name (bufferHandle, OS.delete_range);
 			Arrays.fill (buffer, (byte) 0);
@@ -1606,7 +1606,7 @@ long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*i
 @Override
 long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {
 	if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
-	long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+	long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 	if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1);
 	int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos);
 	int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos);
@@ -1614,7 +1614,7 @@ long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long
 	if (newText == null) {
 		/* Remember the selection when the text was deleted */
 		int [] newStart = new int [1], newEnd = new int [1];
-		OS.gtk_editable_get_selection_bounds (handle, newStart, newEnd);
+		GTK.gtk_editable_get_selection_bounds (handle, newStart, newEnd);
 		if (newStart [0] != newEnd [0]) {
 			fixStart = newStart [0];
 			fixEnd = newEnd [0];
@@ -1627,10 +1627,10 @@ long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long
 			byte [] buffer = Converter.wcsToMbcs (newText, false);
 			OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-			OS.gtk_editable_insert_text (handle, buffer, buffer.length, pos);
+			GTK.gtk_editable_insert_text (handle, buffer, buffer.length, pos);
 			OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
 			OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-			OS.gtk_editable_set_position (handle, pos [0]);
+			GTK.gtk_editable_set_position (handle, pos [0]);
 			Arrays.fill (buffer, (byte) 0);
 		}
 	}
@@ -1654,8 +1654,8 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 				GdkEventFocus gdkEventFocus = new GdkEventFocus ();
 				OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);
 				if (gdkEventFocus.in == 0) {
-					long /*int*/ settings = OS.gtk_settings_get_default ();
-					OS.g_object_set (settings, OS.gtk_entry_select_on_focus, true, 0);
+					long /*int*/ settings = GTK.gtk_settings_get_default ();
+					OS.g_object_set (settings, GTK.gtk_entry_select_on_focus, true, 0);
 				}
 				break;
 		}
@@ -1664,24 +1664,24 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 }
 
 void drawMessage (long /*int*/ cr) {
-	if (OS.GTK_VERSION >= OS.VERSION (3, 2, 0)) return;
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 2, 0)) return;
 	if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
-		long /*int*/ str = OS.gtk_entry_get_text (handle);
-		if (!OS.gtk_widget_has_focus (handle) && C.strlen (str) == 0) {
+		long /*int*/ str = GTK.gtk_entry_get_text (handle);
+		if (!GTK.gtk_widget_has_focus (handle) && C.strlen (str) == 0) {
 			long /*int*/ window = paintWindow ();
 			int [] w = new int [1], h = new int [1];
 			gdk_window_get_size (window, w, h);
 			GtkBorder innerBorder = Display.getEntryInnerBorder (handle);
 			int width = w [0] - innerBorder.left - innerBorder.right;
 			int height = h [0] - innerBorder.top - innerBorder.bottom;
-			long /*int*/ context = OS.gtk_widget_get_pango_context (handle);
+			long /*int*/ context = GTK.gtk_widget_get_pango_context (handle);
 			long /*int*/ lang = OS.pango_context_get_language (context);
 			long /*int*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang);
 			int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));
 			int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));
 			OS.pango_font_metrics_unref (metrics);
 			byte [] buffer = Converter.wcsToMbcs (message, true);
-			long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+			long /*int*/ layout = GTK.gtk_widget_create_pango_layout (handle, buffer);
 			long /*int*/ line = OS.pango_layout_get_line (layout, 0);
 			PangoRectangle rect = new PangoRectangle ();
 			OS.pango_layout_line_get_extents (line, null, rect);
@@ -1707,19 +1707,19 @@ void drawMessage (long /*int*/ cr) {
 			}
 			GdkColor textColor = new GdkColor ();
 			GdkColor baseColor = new GdkColor ();
-			if (OS.GTK3) {
-				long /*int*/ styleContext = OS.gtk_widget_get_style_context (handle);
+			if (GTK.GTK3) {
+				long /*int*/ styleContext = GTK.gtk_widget_get_style_context (handle);
 				GdkRGBA textRGBA;
-				textRGBA = display.styleContextGetColor (styleContext, OS.GTK_STATE_FLAG_INSENSITIVE);
+				textRGBA = display.styleContextGetColor (styleContext, GTK.GTK_STATE_FLAG_INSENSITIVE);
 				Point thickness = getThickness (handle);
 				x += thickness.x;
 				y += thickness.y;
 				long /*int*/ cairo = cr != 0 ? cr : OS.gdk_cairo_create(window);
 				Cairo.cairo_set_source_rgba(cairo, textRGBA.red, textRGBA.green, textRGBA.blue, textRGBA.alpha);
 			} else {
-				long /*int*/ style = OS.gtk_widget_get_style (handle);
-				OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor);
-				OS.gtk_style_get_base (style, OS.GTK_STATE_NORMAL, baseColor);
+				long /*int*/ style = GTK.gtk_widget_get_style (handle);
+				GTK.gtk_style_get_text (style, GTK.GTK_STATE_INSENSITIVE, textColor);
+				GTK.gtk_style_get_base (style, GTK.GTK_STATE_NORMAL, baseColor);
 				long /*int*/ cairo = cr != 0 ? cr : OS.gdk_cairo_create(window);
 				Cairo.cairo_set_source_rgba_compatibility (cairo, textColor);
 				Cairo.cairo_move_to(cairo, x, y);
@@ -1764,8 +1764,8 @@ long /*int*/ gtk_grab_focus (long /*int*/ widget) {
 	* the entry has done focus in processing.
 	*/
 	if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) {
-		long /*int*/ settings = OS.gtk_settings_get_default ();
-		OS.g_object_set (settings, OS.gtk_entry_select_on_focus, false, 0);
+		long /*int*/ settings = GTK.gtk_settings_get_default ();
+		OS.g_object_set (settings, GTK.gtk_entry_select_on_focus, false, 0);
 	}
 	return result;
 }
@@ -1773,11 +1773,11 @@ long /*int*/ gtk_grab_focus (long /*int*/ widget) {
 @Override
 long /*int*/ gtk_icon_release (long /*int*/ widget, long /*int*/ icon_pos, long /*int*/ event) {
 	Event e = new Event();
-	if (icon_pos == OS.GTK_ENTRY_ICON_PRIMARY) {
+	if (icon_pos == GTK.GTK_ENTRY_ICON_PRIMARY) {
 		e.detail = SWT.ICON_SEARCH;
 	} else {
 		e.detail = SWT.ICON_CANCEL;
-		OS.gtk_editable_delete_text (handle, 0, -1);
+		GTK.gtk_editable_delete_text (handle, 0, -1);
 	}
 	sendSelectionEvent (SWT.DefaultSelection, e, false);
 	return 0;
@@ -1792,7 +1792,7 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /
 	String oldText = new String (Converter.mbcsToWcs (buffer));
 	int [] pos = new int [1];
 	C.memmove (pos, position, 4);
-	long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+	long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 	if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
 	/* Use the selection when the text was deleted */
 	int start = pos [0], end = pos [0];
@@ -1806,18 +1806,18 @@ long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /
 	String newText = verifyText (oldText, start, end);
 	if (newText != oldText && handle != 0) {
 		int [] newStart = new int [1], newEnd = new int [1];
-		OS.gtk_editable_get_selection_bounds (handle, newStart, newEnd);
+		GTK.gtk_editable_get_selection_bounds (handle, newStart, newEnd);
 		if (newText != null) {
 			if (newStart [0] != newEnd [0]) {
 				OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 				OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_editable_delete_selection (handle);
+				GTK.gtk_editable_delete_selection (handle);
 				OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 				OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 			}
 			byte [] buffer3 = Converter.wcsToMbcs (newText, false);
 			OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-			OS.gtk_editable_insert_text (handle, buffer3, buffer3.length, pos);
+			GTK.gtk_editable_insert_text (handle, buffer3, buffer3.length, pos);
 			OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
 			newStart [0] = newEnd [0] = pos [0];
 		}
@@ -1859,8 +1859,8 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
 @Override
 long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {
 	if ((style & SWT.RIGHT_TO_LEFT) != 0) {
-		OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
-		OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
+		GTK.gtk_widget_set_direction (menu, GTK.GTK_TEXT_DIR_RTL);
+		GTK.gtk_container_forall (menu, display.setDirectionProc, GTK.GTK_TEXT_DIR_RTL);
 	}
 	return 0;
 }
@@ -1871,15 +1871,15 @@ long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter
 	byte [] position = new byte [ITER_SIZEOF];
 	C.memmove (position, iter, position.length);
 	/* Use the selection when the text was deleted */
-	int start = OS.gtk_text_iter_get_offset (position), end = start;
+	int start = GTK.gtk_text_iter_get_offset (position), end = start;
 	if (fixStart != -1 && fixEnd != -1) {
 		start = fixStart;
 		end = fixEnd;
 		fixStart = fixEnd = -1;
 	}
 	byte [] zero = new byte [ITER_SIZEOF];
-	OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
-	long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
+	GTK.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
+	long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
 	start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start);
 	end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end);
 	OS.g_free(ptr);
@@ -1893,7 +1893,7 @@ long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter
 		if (newText != oldText) {
 			byte [] buffer1 = Converter.wcsToMbcs (newText, false);
 			OS.g_signal_handlers_block_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
-			OS.gtk_text_buffer_insert (bufferHandle, iter, buffer1, buffer1.length);
+			GTK.gtk_text_buffer_insert (bufferHandle, iter, buffer1, buffer1.length);
 			OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
 			OS.g_signal_stop_emission_by_name (bufferHandle, OS.insert_text);
 		}
@@ -1923,7 +1923,7 @@ void hookEvents () {
 	long /*int*/ imContext = imContext ();
 	if (imContext != 0) {
 		OS.g_signal_connect_closure (imContext, OS.commit, display.getClosure (COMMIT), false);
-		int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
+		int id = OS.g_signal_lookup (OS.commit, GTK.gtk_im_context_get_type ());
 		int mask =  OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
 		OS.g_signal_handlers_block_matched (imContext, mask, id, 0, 0, 0, handle);
 	}
@@ -1945,9 +1945,9 @@ void hookEvents () {
 long /*int*/ imContext () {
 	if (imContext != 0) return imContext;
 	if ((style & SWT.SINGLE) != 0) {
-		return OS.GTK_ENTRY_IM_CONTEXT (handle);
+		return GTK.GTK_ENTRY_IM_CONTEXT (handle);
 	}
-	return OS.GTK_TEXTVIEW_IM_CONTEXT (handle);
+	return GTK.GTK_TEXTVIEW_IM_CONTEXT (handle);
 }
 
 
@@ -1955,14 +1955,14 @@ private boolean insideBlockSelection (int x, int y) {
 	int start = 0, end = 0;
 	if ((style & SWT.SINGLE) != 0) {
 		int [] s = new int [1], e = new int [1];
-		OS.gtk_editable_get_selection_bounds (handle, s, e);
+		GTK.gtk_editable_get_selection_bounds (handle, s, e);
 		start = s [0];
 		end = e [0];
 	} else {
 		byte [] s = new byte [ITER_SIZEOF], e =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_selection_bounds (bufferHandle, s, e);
-		start = OS.gtk_text_iter_get_offset (s);
-		end = OS.gtk_text_iter_get_offset (e);
+		GTK.gtk_text_buffer_get_selection_bounds (bufferHandle, s, e);
+		start = GTK.gtk_text_iter_get_offset (s);
+		end = GTK.gtk_text_iter_get_offset (e);
 	}
 	if (start != end) {
 		if (end < start) {
@@ -1974,14 +1974,14 @@ private boolean insideBlockSelection (int x, int y) {
 		if ((style & SWT.SINGLE) != 0) {
 			int [] index = new int [1];
 			int [] trailing = new int [1];
-			long /*int*/ layout = OS.gtk_entry_get_layout (handle);
+			long /*int*/ layout = GTK.gtk_entry_get_layout (handle);
 			OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing);
 			long /*int*/ ptr = OS.pango_layout_get_text (layout);
 			position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
 		} else {
 			byte [] p = new byte [ITER_SIZEOF];
-			OS.gtk_text_view_get_iter_at_location (handle, p, x, y);
-			position = OS.gtk_text_iter_get_offset (p);
+			GTK.gtk_text_view_get_iter_at_location (handle, p, x, y);
+			position = GTK.gtk_text_iter_get_offset (p);
 		}
 		if (start <= position && position < end) {
 			return true;
@@ -2015,18 +2015,18 @@ public void insert (String string) {
 	byte [] buffer = Converter.wcsToMbcs (string, false);
 	if ((style & SWT.SINGLE) != 0) {
 		int [] start = new int [1], end = new int [1];
-		OS.gtk_editable_get_selection_bounds (handle, start, end);
-		OS.gtk_editable_delete_selection (handle);
-		OS.gtk_editable_insert_text (handle, buffer, buffer.length, start);
-		OS.gtk_editable_set_position (handle, start [0]);
+		GTK.gtk_editable_get_selection_bounds (handle, start, end);
+		GTK.gtk_editable_delete_selection (handle);
+		GTK.gtk_editable_insert_text (handle, buffer, buffer.length, start);
+		GTK.gtk_editable_set_position (handle, start [0]);
 	} else {
 		byte [] start =  new byte [ITER_SIZEOF];
 		byte [] end =  new byte [ITER_SIZEOF];
-		if (OS.gtk_text_buffer_get_selection_bounds (bufferHandle, start, end)) {
-			OS.gtk_text_buffer_delete (bufferHandle, start, end);
+		if (GTK.gtk_text_buffer_get_selection_bounds (bufferHandle, start, end)) {
+			GTK.gtk_text_buffer_delete (bufferHandle, start, end);
 		}
-		OS.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length);
-		OS.gtk_text_buffer_place_cursor (bufferHandle, start);
+		GTK.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length);
+		GTK.gtk_text_buffer_place_cursor (bufferHandle, start);
 		scrollIfNotVisible(start, null, true);
 	}
 	applySegments ();
@@ -2055,27 +2055,27 @@ private void scrollIfNotVisible(byte [] iter, byte [] scrollTo, boolean insert)
 	byte [] indexIter =  new byte [ITER_SIZEOF];
 
 	// Calculate the visible area
-	OS.gtk_text_view_get_visible_rect (handle, rect);
+	GTK.gtk_text_view_get_visible_rect (handle, rect);
 	lineHeight = getLineHeight ();
 	numLinesVisible = rect.height / lineHeight;
 
 	// Get the coordinates of the insertion/selection point
-	OS.gtk_text_view_get_line_yrange (handle, iter, insertionCoordinates, null);
+	GTK.gtk_text_view_get_line_yrange (handle, iter, insertionCoordinates, null);
 
 	// If we have a topIndex, calculate whether the insertion/selection point
 	// is in the visible area
 	if (indexMark != 0) {
-		OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, indexIter, indexMark);
-		OS.gtk_text_view_get_line_yrange (handle, indexIter, topIndexCoordinates, null);
+		GTK.gtk_text_buffer_get_iter_at_mark (bufferHandle, indexIter, indexMark);
+		GTK.gtk_text_view_get_line_yrange (handle, indexIter, topIndexCoordinates, null);
 		distanceTopIndex = (insertionCoordinates [0] - topIndexCoordinates [0]) / lineHeight;
 
 		// If it is not in the visible area, scroll to the insertion/selection point
 		if (distanceTopIndex >= numLinesVisible) {
 			if (insert) {
-				long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-				OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
+				long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+				GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
 			} else if (scrollTo != null) {
-				OS.gtk_text_view_scroll_to_iter (handle, scrollTo, 0, true, 0, 0);
+				GTK.gtk_text_view_scroll_to_iter (handle, scrollTo, 0, true, 0, 0);
 			}
 		}
 	} else {
@@ -2084,10 +2084,10 @@ private void scrollIfNotVisible(byte [] iter, byte [] scrollTo, boolean insert)
 		distanceTopIndex = (insertionCoordinates [0] - topIndexCoordinates [0]) / lineHeight;
 		if (distanceTopIndex >= numLinesVisible) {
 			if (scrollTo != null && !insert) {
-				OS.gtk_text_view_scroll_to_iter (handle, scrollTo, 0, true, 0, 0);
+				GTK.gtk_text_view_scroll_to_iter (handle, scrollTo, 0, true, 0, 0);
 			} else if (insert) {
-				long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-				OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
+				long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+				GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
 			}
 		}
 	}
@@ -2112,8 +2112,8 @@ long /*int*/ paintWindow () {
 		OS.g_list_free (children);
 		return window;
 	}
-	OS.gtk_widget_realize (handle);
-	return OS.gtk_text_view_get_window (handle, OS.GTK_TEXT_WINDOW_TEXT);
+	GTK.gtk_widget_realize (handle);
+	return GTK.gtk_text_view_get_window (handle, GTK.GTK_TEXT_WINDOW_TEXT);
 }
 
 /**
@@ -2131,11 +2131,11 @@ long /*int*/ paintWindow () {
 public void paste () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_editable_paste_clipboard (handle);
+		GTK.gtk_editable_paste_clipboard (handle);
 	} else {
-		long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
+		long /*int*/ clipboard = GTK.gtk_clipboard_get (OS.GDK_NONE);
 		clearSegments (true);
-		OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
+		GTK.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, GTK.gtk_text_view_get_editable (handle));
 		applySegments ();
 	}
 }
@@ -2267,26 +2267,26 @@ public void removeVerifyListener (VerifyListener listener) {
 public void selectAll () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_editable_select_region (handle, 0, -1);
+		GTK.gtk_editable_select_region (handle, 0, -1);
 	} else {
 		byte [] start =  new byte [ITER_SIZEOF];
 		byte [] end =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, 0);
-		OS.gtk_text_buffer_get_end_iter (bufferHandle, end);
-		OS.gtk_text_buffer_select_range(bufferHandle, start, end);
+		GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, 0);
+		GTK.gtk_text_buffer_get_end_iter (bufferHandle, end);
+		GTK.gtk_text_buffer_select_range(bufferHandle, start, end);
 	}
 }
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
-	OS.gtk_widget_modify_base (handle, 0, color);
+	GTK.gtk_widget_modify_base (handle, 0, color);
 }
 
 @Override
 GdkRGBA getContextBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (background != null && (state & BACKGROUND) != 0) {
 		return background;
 	}
@@ -2295,7 +2295,7 @@ GdkRGBA getContextBackgroundGdkRGBA () {
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	/* Setting the background color overrides the selected background color.
 	 * To prevent this, we need to re-set the default. This can be done with CSS
 	 * on GTK3.16+, or by using GtkStateFlags as an argument to
@@ -2311,14 +2311,14 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 	String css;
 	String properties;
 	String name;
-	String selection = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? " selection" : ":selected";
+	String selection = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? " selection" : ":selected";
     if ((style & SWT.SINGLE) != 0) {
-      	name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "entry" : "GtkEntry";
+      	name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "entry" : "GtkEntry";
        	properties = " {background: " + display.gtk_rgba_to_css_string(background) + ";}\n"
        			+ name + ":selected {background-color: " + display.gtk_rgba_to_css_string(selectedBackground) + ";}\n"
        			+ name + selection + " {color: " + display.gtk_rgba_to_css_string(selectedForeground) + ";}";
     } else {
-       	name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "textview text" : "GtkTextView";
+       	name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "textview text" : "GtkTextView";
        	properties = " {background-color: " + display.gtk_rgba_to_css_string(background) + ";}\n"
        			+ name + ":selected {background-color: " + display.gtk_rgba_to_css_string(selectedBackground) + ";}\n"
        			+ name + selection + " {color: " + display.gtk_rgba_to_css_string(selectedForeground) + ";}";
@@ -2388,8 +2388,8 @@ public void setDoubleClickEnabled (boolean doubleClick) {
 public void setEchoChar (char echo) {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_entry_set_visibility (handle, echo == '\0');
-		OS.gtk_entry_set_invisible_char (handle, echo);
+		GTK.gtk_entry_set_visibility (handle, echo == '\0');
+		GTK.gtk_entry_set_invisible_char (handle, echo);
 	}
 }
 
@@ -2408,9 +2408,9 @@ public void setEditable (boolean editable) {
 	style &= ~SWT.READ_ONLY;
 	if (!editable) style |= SWT.READ_ONLY;
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_editable_set_editable (handle, editable);
+		GTK.gtk_editable_set_editable (handle, editable);
 	} else {
-		OS.gtk_text_view_set_editable (handle, editable);
+		GTK.gtk_text_view_set_editable (handle, editable);
 	}
 }
 
@@ -2422,7 +2422,7 @@ void setFontDescription (long /*int*/ font) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (handle, color, false);
 }
 
@@ -2449,10 +2449,10 @@ public void setMessage (String message) {
 	checkWidget ();
 	if (message == null) error (SWT.ERROR_NULL_ARGUMENT);
 	this.message = message;
-	if (OS.GTK_VERSION >= OS.VERSION (3, 2, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 2, 0)) {
 		if ((style & SWT.SINGLE) != 0) {
 			byte [] buffer = Converter.wcsToMbcs (message, true);
-			OS.gtk_entry_set_placeholder_text (handle, buffer);
+			GTK.gtk_entry_set_placeholder_text (handle, buffer);
 			return;
 		}
 	}
@@ -2508,18 +2508,18 @@ public void setSelection (int start) {
 	checkWidget ();
 	start = translateOffset (start);
 	if ((style & SWT.SINGLE) != 0) {
-		long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+		long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 		start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
-		OS.gtk_editable_set_position (handle, start);
+		GTK.gtk_editable_set_position (handle, start);
 	} else {
 		byte [] startIter =  new byte [ITER_SIZEOF];
 		byte [] endIter =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
-		long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+		GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
+		long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
 		start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
 		OS.g_free (ptr);
-		OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
-		OS.gtk_text_buffer_place_cursor (bufferHandle, startIter);
+		GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
+		GTK.gtk_text_buffer_place_cursor (bufferHandle, startIter);
 		scrollIfNotVisible(startIter, startIter, false);
 	}
 }
@@ -2554,23 +2554,23 @@ public void setSelection (int start, int end) {
 	start = translateOffset (start);
 	end = translateOffset (end);
 	if ((style & SWT.SINGLE) != 0) {
-		long /*int*/ ptr = OS.gtk_entry_get_text (handle);
+		long /*int*/ ptr = GTK.gtk_entry_get_text (handle);
 		start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
 		end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end);
-		OS.gtk_editable_set_position (handle, start);
-		OS.gtk_editable_select_region (handle, start, end);
+		GTK.gtk_editable_set_position (handle, start);
+		GTK.gtk_editable_select_region (handle, start, end);
 	} else {
 		byte [] startIter =  new byte [ITER_SIZEOF];
 		byte [] endIter =  new byte [ITER_SIZEOF];
-		OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
-		long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+		GTK.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
+		long /*int*/ ptr = GTK.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
 		start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
 		end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end);
 		OS.g_free (ptr);
-		OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
-		OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end);
+		GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
+		GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end);
 		scrollIfNotVisible(startIter, startIter, false);
-		OS.gtk_text_buffer_select_range(bufferHandle, startIter, endIter);
+		GTK.gtk_text_buffer_select_range(bufferHandle, startIter, endIter);
 	}
 }
 
@@ -2636,7 +2636,7 @@ void setTabStops (int tabs) {
 	int tabWidth = getTabWidth (tabs);
 	long /*int*/ tabArray = OS.pango_tab_array_new (1, false);
 	OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth);
-	OS.gtk_text_view_set_tabs (handle, tabArray);
+	GTK.gtk_text_view_set_tabs (handle, tabArray);
 	OS.pango_tab_array_free (tabArray);
 }
 
@@ -2725,7 +2725,7 @@ void setText (char [] text) {
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
-		OS.gtk_entry_set_text (handle, buffer);
+		GTK.gtk_entry_set_text (handle, buffer);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, INSERT_TEXT);
@@ -2736,20 +2736,20 @@ void setText (char [] text) {
 		OS.g_signal_handlers_block_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		OS.g_signal_handlers_block_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_RANGE);
 		OS.g_signal_handlers_block_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
-		OS.gtk_text_buffer_set_text (bufferHandle, buffer, buffer.length);
+		GTK.gtk_text_buffer_set_text (bufferHandle, buffer, buffer.length);
 		OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_RANGE);
 		OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
-		OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0);
-		OS.gtk_text_buffer_place_cursor (bufferHandle, position);
-		long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-		OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
+		GTK.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0);
+		GTK.gtk_text_buffer_place_cursor (bufferHandle, position);
+		long /*int*/ mark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+		GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
 		Arrays.fill (buffer, (byte) 0);
 	}
 	sendEvent (SWT.Modify);
 	if ((style & SWT.SEARCH) != 0) {
 		if ((style & SWT.ICON_CANCEL) != 0) {
-			OS.gtk_entry_set_icon_sensitive (handle, OS.GTK_ENTRY_ICON_SECONDARY, true);
+			GTK.gtk_entry_set_icon_sensitive (handle, GTK.GTK_ENTRY_ICON_SECONDARY, true);
 		}
 	}
 	applySegments ();
@@ -2783,7 +2783,7 @@ public void setTextLimit (int limit) {
 	checkWidget ();
 	if (limit == 0) error (SWT.ERROR_CANNOT_BE_ZERO);
 	if ((style & SWT.SINGLE) != 0) {
-		OS.gtk_entry_set_max_length (handle, segments != null ? Math.min (LIMIT, translateOffset (limit)) : limit);
+		GTK.gtk_entry_set_max_length (handle, segments != null ? Math.min (LIMIT, translateOffset (limit)) : limit);
 	}
 }
 
@@ -2803,8 +2803,8 @@ public void setTopIndex (int index) {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) return;
 	byte [] position = new byte [ITER_SIZEOF];
-	OS.gtk_text_buffer_get_iter_at_line (bufferHandle, position, index);
-	if (OS.GTK3) {
+	GTK.gtk_text_buffer_get_iter_at_line (bufferHandle, position, index);
+	if (GTK.GTK3) {
 		/*
 		 * Feature in GTK: create a new GtkTextMark for the purposes of
 		 * keeping track of the top index. In getTopIndex() we can use this
@@ -2814,12 +2814,12 @@ public void setTopIndex (int index) {
 		 * in getTopIndex().
 		 */
 		byte [] buffer = Converter.wcsToMbcs ("index_mark", true);
-		indexMark = OS.gtk_text_buffer_create_mark (bufferHandle, buffer, position, true);
-		OS.gtk_text_view_scroll_to_mark (handle, indexMark, 0, true, 0, 0);
-		long /*int*/ vAdjustment = OS.gtk_scrollable_get_vadjustment (handle);
-		cachedAdjustment = OS.gtk_adjustment_get_value (vAdjustment);
+		indexMark = GTK.gtk_text_buffer_create_mark (bufferHandle, buffer, position, true);
+		GTK.gtk_text_view_scroll_to_mark (handle, indexMark, 0, true, 0, 0);
+		long /*int*/ vAdjustment = GTK.gtk_scrollable_get_vadjustment (handle);
+		cachedAdjustment = GTK.gtk_adjustment_get_value (vAdjustment);
 	} else {
-		OS.gtk_text_view_scroll_to_iter (handle, position, 0, true, 0, 0);
+		GTK.gtk_text_view_scroll_to_iter (handle, position, 0, true, 0, 0);
 	}
 }
 
@@ -2839,10 +2839,10 @@ public void setTopIndex (int index) {
 public void showSelection () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) return;
-	long /*int*/ mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
-	OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
-	mark = OS.gtk_text_buffer_get_insert (bufferHandle);
-	OS.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
+	long /*int*/ mark = GTK.gtk_text_buffer_get_selection_bound (bufferHandle);
+	GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
+	mark = GTK.gtk_text_buffer_get_insert (bufferHandle);
+	GTK.gtk_text_view_scroll_to_mark (handle, mark, 0, true, 0, 0);
 }
 
 int translateOffset (int offset) {
@@ -2862,7 +2862,7 @@ boolean translateTraversal (GdkEventKey keyEvent) {
 			long /*int*/ imContext =  imContext ();
 			if (imContext != 0) {
 				long /*int*/ [] preeditString = new long /*int*/ [1];
-				OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
+				GTK.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
 				if (preeditString [0] != 0) {
 					int length = C.strlen (preeditString [0]);
 					OS.g_free (preeditString [0]);
@@ -2904,7 +2904,7 @@ String verifyText (String string, int start, int end) {
 	event.text = string;
 	event.start = start;
 	event.end = end;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventKey gdkEvent = new GdkEventKey ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -2985,13 +2985,13 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ ar
 	if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) {
 		switch ((int)/*64*/user_data) {
 			case MOVE_CURSOR: {
-				if (arg0 == OS.GTK_MOVEMENT_VISUAL_POSITIONS) {
+				if (arg0 == GTK.GTK_MOVEMENT_VISUAL_POSITIONS) {
 					clearSegments (true);
 				}
 				break;
 			}
 			case MOVE_CURSOR_INVERSE: {
-				if (arg0 == OS.GTK_MOVEMENT_VISUAL_POSITIONS) {
+				if (arg0 == GTK.GTK_MOVEMENT_VISUAL_POSITIONS) {
 					applySegments ();
 				}
 				break;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
index 131a0d04b4..f8ab5c80fa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
@@ -104,8 +104,8 @@ public ToolBar (Composite parent, int style) {
 	} else {
 		this.style |= SWT.HORIZONTAL;
 	}
-	int orientation = (style & SWT.VERTICAL) != 0 ? OS.GTK_ORIENTATION_VERTICAL : OS.GTK_ORIENTATION_HORIZONTAL;
-	OS.gtk_orientable_set_orientation(handle, orientation);
+	int orientation = (style & SWT.VERTICAL) != 0 ? GTK.GTK_ORIENTATION_VERTICAL : GTK.GTK_ORIENTATION_HORIZONTAL;
+	GTK.gtk_orientable_set_orientation(handle, orientation);
 }
 
 static int checkStyle (int style) {
@@ -129,13 +129,13 @@ void createHandle (int index) {
 	state |= HANDLE | THEME_BACKGROUND;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	handle = OS.gtk_toolbar_new ();
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	handle = GTK.gtk_toolbar_new ();
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (fixedHandle, handle);
-	if ((style & SWT.FLAT) != 0 && !OS.GTK3) {
+	GTK.gtk_container_add (fixedHandle, handle);
+	if ((style & SWT.FLAT) != 0 && !GTK.GTK3) {
 		byte [] swt_toolbar_flat = Converter.wcsToMbcs ("swt-toolbar-flat", true);
-		OS.gtk_widget_set_name (handle, swt_toolbar_flat);
+		GTK.gtk_widget_set_name (handle, swt_toolbar_flat);
 	}
 
 	/*
@@ -148,11 +148,11 @@ void createHandle (int index) {
 	* tool bar preferred size is too big with GTK_ICON_SIZE_LARGE_TOOLBAR
 	* when the tool bar item has no image or text.
 	*/
-	OS.gtk_toolbar_set_icon_size (handle, OS.GTK3 ? OS.GTK_ICON_SIZE_SMALL_TOOLBAR : OS.GTK_ICON_SIZE_LARGE_TOOLBAR);
+	GTK.gtk_toolbar_set_icon_size (handle, GTK.GTK3 ? GTK.GTK_ICON_SIZE_SMALL_TOOLBAR : GTK.GTK_ICON_SIZE_LARGE_TOOLBAR);
 
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont().handle);
 	}
 }
@@ -173,9 +173,9 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	 * to display. The fix is to disable it before the computation of
 	 * size and enable it if WRAP style is set.
 	 */
-	OS.gtk_toolbar_set_show_arrow (handle, false);
+	GTK.gtk_toolbar_set_show_arrow (handle, false);
 	Point size = computeNativeSize (handle, wHint, hHint, changed);
-	if ((style & SWT.WRAP) != 0) OS.gtk_toolbar_set_show_arrow (handle, true);
+	if ((style & SWT.WRAP) != 0) GTK.gtk_toolbar_set_show_arrow (handle, true);
 	return size;
 }
 
@@ -249,15 +249,15 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
 
 @Override
 boolean forceFocus (long /*int*/ focusHandle) {
-	int dir = OS.GTK_DIR_TAB_FORWARD;
-	if ((style & SWT.MIRRORED) != 0) dir = OS.GTK_DIR_TAB_BACKWARD;
+	int dir = GTK.GTK_DIR_TAB_FORWARD;
+	if ((style & SWT.MIRRORED) != 0) dir = GTK.GTK_DIR_TAB_BACKWARD;
 	long /*int*/ childHandle = handle;
 	if (currentFocusItem != null)  childHandle = currentFocusItem.handle;
 	/*
 	 * Feature in GTK. GtkToolBar takes care of navigating through
 	 * items by Up/Down arrow keys.
 	 */
-	if (OS.gtk_widget_child_focus (childHandle, dir)) return true;
+	if (GTK.gtk_widget_child_focus (childHandle, dir)) return true;
 	return super.forceFocus (focusHandle);
 }
 
@@ -325,7 +325,7 @@ ToolItem getItemInPixels (Point point) {
  */
 public int getItemCount () {
 	checkWidget();
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) return 0;
 	int itemCount = OS.g_list_length (list);
 	OS.g_list_free (list);
@@ -354,7 +354,7 @@ public ToolItem [] getItems () {
 }
 
 ToolItem [] _getItems () {
-	long /*int*/ list = OS.gtk_container_get_children (handle);
+	long /*int*/ list = GTK.gtk_container_get_children (handle);
 	if (list == 0) return new ToolItem [0];
 	int count = OS.g_list_length (list);
 	ToolItem [] items = new ToolItem [count];
@@ -480,7 +480,7 @@ long /*int*/ menuItemSelected (long /*int*/ widget, ToolItem item) {
 			 */
 			event.detail = SWT.ARROW;
 			GtkAllocation allocation = new GtkAllocation ();
-			OS.gtk_widget_get_allocation (widget, allocation);
+			GTK.gtk_widget_get_allocation (widget, allocation);
 			event.x = DPIUtil.autoScaleDown(allocation.x);
 			if ((style & SWT.MIRRORED) != 0) event.x = DPIUtil.autoScaleDown (getClientWidth () - allocation.width) - event.x;
 			event.y = DPIUtil.autoScaleDown(allocation.y + allocation.height);
@@ -527,19 +527,19 @@ void relayout () {
 			hasImage |= item.image != null;
 		}
 	}
-	int type = OS.GTK_TOOLBAR_ICONS;
+	int type = GTK.GTK_TOOLBAR_ICONS;
 	if (hasText && hasImage) {
 		if ((style & SWT.RIGHT) != 0) {
-			type = OS.GTK_TOOLBAR_BOTH_HORIZ;
+			type = GTK.GTK_TOOLBAR_BOTH_HORIZ;
 		} else {
-			type = OS.GTK_TOOLBAR_BOTH;
+			type = GTK.GTK_TOOLBAR_BOTH;
 		}
 	} else if (hasText) {
-		type = OS.GTK_TOOLBAR_TEXT;
+		type = GTK.GTK_TOOLBAR_TEXT;
 	} else if (hasImage) {
-		type = OS.GTK_TOOLBAR_ICONS;
+		type = GTK.GTK_TOOLBAR_ICONS;
 	}
-	OS.gtk_toolbar_set_style (handle, type);
+	GTK.gtk_toolbar_set_style (handle, type);
 }
 
 @Override
@@ -585,19 +585,19 @@ void reskinChildren (int flags) {
 
 @Override
 int setBounds (int x, int y, int width, int height, boolean move, boolean resize) {
-	OS.gtk_toolbar_set_show_arrow (handle, false);
+	GTK.gtk_toolbar_set_show_arrow (handle, false);
 	int result = super.setBounds (x, y, width, height, move, resize);
 	if ((result & RESIZED) != 0) relayout ();
-	if ((style & SWT.WRAP) != 0) OS.gtk_toolbar_set_show_arrow (handle, true);
+	if ((style & SWT.WRAP) != 0) GTK.gtk_toolbar_set_show_arrow (handle, true);
 	return result;
 }
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		// Form background string
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "toolbar" : "GtkToolbar";
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "toolbar" : "GtkToolbar";
 		String css = name + " {background-color: " + display.gtk_rgba_to_css_string(rgba) + "}";
 
 		// Cache background color
@@ -613,7 +613,7 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 
 @Override
 void setParentBackground () {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setBackgroundGdkRGBA (handle, display.getSystemColor(SWT.COLOR_TRANSPARENT).handleRGBA);
 	}
 	super.setParentBackground();
@@ -621,21 +621,21 @@ void setParentBackground () {
 
 @Override
 void setForegroundGdkRGBA (long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		GdkRGBA toSet = new GdkRGBA();
 		if (rgba != null) {
 			toSet = rgba;
 		} else {
 			toSet = display.COLOR_WIDGET_FOREGROUND_RGBA;
 		}
-		long /*int*/ context = OS.gtk_widget_get_style_context (handle);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
 		// Form foreground string
 		String color = display.gtk_rgba_to_css_string(toSet);
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle)
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? display.gtk_widget_class_get_css_name(handle)
 	    		: display.gtk_widget_get_name(handle);
 		GdkRGBA selectedForeground = display.COLOR_LIST_SELECTION_TEXT_RGBA;
-		String selection = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? " selection" : ":selected";
+		String selection = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? " selection" : ":selected";
 		String css = "* {color: " + color + ";}\n"
 				+ name + selection + " {color: " + display.gtk_rgba_to_css_string(selectedForeground) + ";}";
 
@@ -666,14 +666,14 @@ void restoreBackground () {
 	 * setting the foreground color from overriding the background color
 	 * (or replacing it with black).
 	 */
-	long /*int*/ context = OS.gtk_widget_get_style_context(handle);
+	long /*int*/ context = GTK.gtk_widget_get_style_context(handle);
 	String finalCss = display.gtk_css_create_css_color_string (this.cssBackground, this.cssForeground, SWT.BACKGROUND);
 	gtk_css_provider_load_from_css (context, finalCss);
 }
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	super.setForegroundGdkRGBA (rgba);
 	ToolItem [] items = getItems ();
 	for (int i = 0; i < items.length; i++) {
@@ -683,7 +683,7 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setForegroundGdkColor (color);
 	ToolItem [] items = getItems ();
 	for (int i = 0; i < items.length; i++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
index ab90743ee6..13e270d51f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
@@ -185,32 +185,32 @@ void createHandle (int index) {
 	state |= HANDLE;
 	int bits = SWT.SEPARATOR | SWT.RADIO | SWT.CHECK | SWT.PUSH | SWT.DROP_DOWN;
 	if ((style & SWT.SEPARATOR) == 0) {
-		labelHandle = OS.gtk_label_new_with_mnemonic (null);
+		labelHandle = GTK.gtk_label_new_with_mnemonic (null);
 		if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-		imageHandle = OS.gtk_image_new_from_pixbuf (0);
+		imageHandle = GTK.gtk_image_new_from_pixbuf (0);
 		if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	}
 	switch (style & bits) {
 		case SWT.SEPARATOR:
-			handle = OS.gtk_separator_tool_item_new ();
+			handle = GTK.gtk_separator_tool_item_new ();
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-			OS.gtk_separator_tool_item_set_draw (handle, true);
+			GTK.gtk_separator_tool_item_set_draw (handle, true);
 			break;
 		case SWT.DROP_DOWN:
-			handle = OS.gtk_menu_tool_button_new (0, null);
+			handle = GTK.gtk_menu_tool_button_new (0, null);
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			/*
 			 * Feature in GTK. The arrow button of DropDown tool-item is
 			 * disabled when it does not contain menu. The fix is to
 			 * find the arrow button handle and enable it.
 			 */
-			long /*int*/ child = OS.gtk_bin_get_child (handle);
-			long /*int*/ list = OS.gtk_container_get_children (child);
+			long /*int*/ child = GTK.gtk_bin_get_child (handle);
+			long /*int*/ list = GTK.gtk_container_get_children (child);
 			arrowHandle = OS.g_list_nth_data (list, 1);
 			if (arrowHandle != 0) {
-				OS.gtk_widget_set_sensitive (arrowHandle, true);
-				if (!OS.GTK3) {
-					OS.gtk_widget_set_size_request(OS.gtk_bin_get_child(arrowHandle), 8, 6);
+				GTK.gtk_widget_set_sensitive (arrowHandle, true);
+				if (!GTK.GTK3) {
+					GTK.gtk_widget_set_size_request(GTK.gtk_bin_get_child(arrowHandle), 8, 6);
 				}
 			}
 			break;
@@ -222,20 +222,20 @@ void createHandle (int index) {
 			* The fix is to use toggle buttons instead.
 			*/
 		case SWT.CHECK:
-			handle = OS.gtk_toggle_tool_button_new ();
+			handle = GTK.gtk_toggle_tool_button_new ();
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			break;
 		case SWT.PUSH:
 		default:
-			handle = OS.gtk_tool_button_new (0, null);
+			handle = GTK.gtk_tool_button_new (0, null);
 			if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 			break;
 	}
 	if (labelHandle != 0) {
-		OS.gtk_tool_button_set_label_widget(handle, labelHandle);
+		GTK.gtk_tool_button_set_label_widget(handle, labelHandle);
 	}
 	if (imageHandle != 0) {
-		OS.gtk_tool_button_set_icon_widget(handle, imageHandle);
+		GTK.gtk_tool_button_set_icon_widget(handle, imageHandle);
 	}
 	if ((parent.state & FOREGROUND) != 0) {
 		setForegroundColor (parent.getForegroundGdkColor());
@@ -248,8 +248,8 @@ void createHandle (int index) {
 	 * determine whether to show or hide its label when the toolbar
 	 * style is GTK_TOOLBAR_BOTH_HORIZ (or SWT.RIGHT).
 	 */
-	if ((parent.style & SWT.RIGHT) != 0) OS.gtk_tool_item_set_is_important (handle, true);
-	if ((style & SWT.SEPARATOR) == 0) OS.gtk_tool_button_set_use_underline (handle, true);
+	if ((parent.style & SWT.RIGHT) != 0) GTK.gtk_tool_item_set_is_important (handle, true);
+	if ((style & SWT.SEPARATOR) == 0) GTK.gtk_tool_button_set_use_underline (handle, true);
 }
 
 @Override
@@ -308,7 +308,7 @@ Rectangle getBoundsInPixels () {
 	parent.forceResize ();
 	long /*int*/ topHandle = topHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (topHandle, allocation);
+	GTK.gtk_widget_get_allocation (topHandle, allocation);
 	int x = allocation.x;
 	int y = allocation.y;
 	int width = allocation.width;
@@ -371,7 +371,7 @@ public Image getDisabledImage () {
 public boolean getEnabled () {
 	checkWidget();
 	long /*int*/ topHandle = topHandle ();
-	return OS.gtk_widget_get_sensitive (topHandle);
+	return GTK.gtk_widget_get_sensitive (topHandle);
 }
 
 /**
@@ -429,7 +429,7 @@ public ToolBar getParent () {
 public boolean getSelection () {
 	checkWidget();
 	if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false;
-	return OS.gtk_toggle_tool_button_get_active (handle);
+	return GTK.gtk_toggle_tool_button_get_active (handle);
 }
 
 /**
@@ -467,7 +467,7 @@ int getWidthInPixels () {
 	parent.forceResize ();
 	long /*int*/ topHandle = topHandle ();
 	GtkAllocation allocation = new GtkAllocation();
-	OS.gtk_widget_get_allocation (topHandle, allocation);
+	GTK.gtk_widget_get_allocation (topHandle, allocation);
 	return allocation.width;
 }
 
@@ -476,7 +476,7 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	double x = gdkEvent.x + allocation.x;
 	double y = gdkEvent.y + allocation.y;
 	OS.memmove (event, gdkEvent, GdkEventButton.sizeof);
@@ -492,7 +492,7 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event)
 	GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	double x = gdkEvent.x + allocation.x;
 	double y = gdkEvent.y + allocation.y;
 	OS.memmove (event, gdkEvent, GdkEventButton.sizeof);
@@ -507,7 +507,7 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event)
 long /*int*/ gtk_clicked (long /*int*/ widget) {
 	Event event = new Event ();
 	if ((style & SWT.DROP_DOWN) != 0) {
-		long /*int*/ eventPtr = OS.gtk_get_current_event ();
+		long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 		if (eventPtr != 0) {
 			GdkEvent gdkEvent = new GdkEvent ();
 			OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
@@ -526,13 +526,13 @@ long /*int*/ gtk_clicked (long /*int*/ widget) {
 						 * It is required to set back the state of arrow to normal state after it is clicked.
 						 */
 						OS.g_signal_handlers_block_matched (widget, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CLICKED);
-						OS.gtk_toggle_button_set_active(widget, false);
+						GTK.gtk_toggle_button_set_active(widget, false);
 						OS.g_signal_handlers_unblock_matched (widget, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CLICKED);
 					}
 					if (isArrow) {
 						event.detail = SWT.ARROW;
 						GtkAllocation allocation = new GtkAllocation ();
-						OS.gtk_widget_get_allocation (topHandle, allocation);
+						GTK.gtk_widget_get_allocation (topHandle, allocation);
 						event.x = DPIUtil.autoScaleDown(allocation.x);
 						if ((style & SWT.MIRRORED) != 0) event.x = DPIUtil.autoScaleDown (parent.getClientWidth ()- allocation.width) - event.x;
 						event.y = DPIUtil.autoScaleDown(allocation.y + allocation.height);
@@ -568,7 +568,7 @@ long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) {
 		 * for the tool-item. If the text/image of the item changes,
 		 * then the proxyMenu is reset.
 		 */
-		OS.gtk_tool_item_set_proxy_menu_item (widget, buffer, proxyMenuItem);
+		GTK.gtk_tool_item_set_proxy_menu_item (widget, buffer, proxyMenuItem);
 		return 1;
 	}
 
@@ -580,11 +580,11 @@ long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) {
 				long /*int*/ pixbuf = imageList.getPixbuf (index);
 				byte[] label = null;
 				int [] showImages = new int []{1};
-				long /*int*/ settings = OS.gtk_settings_get_default();
+				long /*int*/ settings = GTK.gtk_settings_get_default();
 				if (settings != 0) {
-					if (!OS.GTK3) {
-						long /*int*/ property = OS.g_object_class_find_property(OS.G_OBJECT_GET_CLASS(settings), OS.gtk_menu_images);
-						if (property != 0) OS.g_object_get (settings, OS.gtk_menu_images, showImages, 0);
+					if (!GTK.GTK3) {
+						long /*int*/ property = OS.g_object_class_find_property(OS.G_OBJECT_GET_CLASS(settings), GTK.gtk_menu_images);
+						if (property != 0) OS.g_object_get (settings, GTK.gtk_menu_images, showImages, 0);
 					}
 				}
 
@@ -607,45 +607,45 @@ long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) {
 					label = Converter.wcsToMbcs(text, true);
 				}
 				long /*int*/ menuItem;
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 
-					menuItem = OS.gtk_menu_item_new ();
+					menuItem = GTK.gtk_menu_item_new ();
 					if (menuItem == 0) error (SWT.ERROR_NO_HANDLES);
 
-					long /*int*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 6);
+					long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 6);
 					if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
 
-					long /*int*/ menuLabel = OS.gtk_accel_label_new (label);
+					long /*int*/ menuLabel = GTK.gtk_accel_label_new (label);
 					if (menuLabel == 0) error (SWT.ERROR_NO_HANDLES);
-					if (OS.GTK_VERSION >= OS.VERSION (3, 16, 0)) {
-						OS.gtk_label_set_xalign (labelHandle, 0);
-						OS.gtk_widget_set_halign (labelHandle, OS.GTK_ALIGN_FILL);
+					if (GTK.GTK_VERSION >= OS.VERSION (3, 16, 0)) {
+						GTK.gtk_label_set_xalign (labelHandle, 0);
+						GTK.gtk_widget_set_halign (labelHandle, GTK.GTK_ALIGN_FILL);
 					} else {
-						OS.gtk_misc_set_alignment(labelHandle, 0, 0);
+						GTK.gtk_misc_set_alignment(labelHandle, 0, 0);
 					}
 
-					long /*int*/ menuImage = OS.gtk_image_new_from_pixbuf (pixbuf);
+					long /*int*/ menuImage = GTK.gtk_image_new_from_pixbuf (pixbuf);
 					if (menuImage == 0) error (SWT.ERROR_NO_HANDLES);
 
-					OS.gtk_container_add (boxHandle, menuImage);
-					OS.gtk_box_pack_end (boxHandle, menuLabel, true, true, 0);
-					OS.gtk_container_add (menuItem, boxHandle);
+					GTK.gtk_container_add (boxHandle, menuImage);
+					GTK.gtk_box_pack_end (boxHandle, menuLabel, true, true, 0);
+					GTK.gtk_container_add (menuItem, boxHandle);
 				} else {
-					menuItem = OS.gtk_image_menu_item_new_with_label (label);
+					menuItem = GTK.gtk_image_menu_item_new_with_label (label);
 					if (menuItem == 0) error (SWT.ERROR_NO_HANDLES);
 
-					long /*int*/ menuImage = OS.gtk_image_new_from_pixbuf (pixbuf);
+					long /*int*/ menuImage = GTK.gtk_image_new_from_pixbuf (pixbuf);
 					if (menuImage == 0) error (SWT.ERROR_NO_HANDLES);
-					OS.gtk_image_menu_item_set_image (menuItem, menuImage);
+					GTK.gtk_image_menu_item_set_image (menuItem, menuImage);
 				}
-				OS.gtk_tool_item_set_proxy_menu_item (widget, buffer, menuItem);
+				GTK.gtk_tool_item_set_proxy_menu_item (widget, buffer, menuItem);
 
 				/*
 				 * Since the arrow button does not appear in the drop_down
 				 * item, we request the menu-item and then, hook the
 				 * activate signal to send the Arrow selection signal.
 				 */
-				proxyMenuItem = OS.gtk_tool_item_get_proxy_menu_item (widget, buffer);
+				proxyMenuItem = GTK.gtk_tool_item_get_proxy_menu_item (widget, buffer);
 				OS.g_signal_connect(menuItem, OS.activate, ToolBar.menuItemSelectedFunc.getAddress(), handle);
 				return 1;
 			}
@@ -658,11 +658,11 @@ void gtk_css_provider_load_from_css (long /*int*/ context, String css) {
 	/* Utility function. */
 	//@param css : a 'css java' string like "{\nbackground: red;\n}".
 	if (provider == 0) {
-		provider = OS.gtk_css_provider_new ();
-		OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+		provider = GTK.gtk_css_provider_new ();
+		GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 		OS.g_object_unref (provider);
 	}
-	OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
+	GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
 }
 
 @Override
@@ -752,9 +752,9 @@ void hookEvents () {
 	 * such as button-press, enter-notify to it. The fix is to assign
 	 * the listener to child (GtkButton) of the tool-item.
 	 */
-	eventHandle = OS.gtk_bin_get_child(handle);
+	eventHandle = GTK.gtk_bin_get_child(handle);
 	if ((style & SWT.DROP_DOWN) != 0) {
-		long /*int*/ list = OS.gtk_container_get_children(eventHandle);
+		long /*int*/ list = GTK.gtk_container_get_children(eventHandle);
 		eventHandle = OS.g_list_nth_data(list, 0);
 		if (arrowHandle != 0) OS.g_signal_connect_closure (arrowHandle, OS.clicked, display.getClosure (CLICKED), false);
 	}
@@ -778,7 +778,7 @@ void hookEvents () {
 		OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK |
 		OS.GDK_KEY_PRESS_MASK | OS.GDK_KEY_RELEASE_MASK |
 		OS.GDK_FOCUS_CHANGE_MASK;
-	OS.gtk_widget_add_events (eventHandle, mask);
+	GTK.gtk_widget_add_events (eventHandle, mask);
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.getClosure (BUTTON_PRESS_EVENT), false);
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.getClosure (BUTTON_RELEASE_EVENT), false);
 	OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [EVENT_AFTER], 0, display.getClosure (EVENT_AFTER), false);
@@ -890,7 +890,7 @@ void resizeControl () {
 }
 
 void resizeHandle(int width, int height) {
-	OS.gtk_widget_set_size_request (handle, width, height);
+	GTK.gtk_widget_set_size_request (handle, width, height);
 	/*
 	* Cause a size allocation this widget's topHandle.  Note that
 	* all calls to gtk_widget_size_allocate() must be preceded by
@@ -899,10 +899,10 @@ void resizeHandle(int width, int height) {
 	GtkRequisition requisition = new GtkRequisition ();
 	parent.gtk_widget_size_request (handle, requisition);
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (handle, allocation);
+	GTK.gtk_widget_get_allocation (handle, allocation);
 	allocation.width = width;
 	allocation.height = height;
-	OS.gtk_widget_size_allocate (handle, allocation);
+	GTK.gtk_widget_size_allocate (handle, allocation);
 }
 
 void selectRadio () {
@@ -985,10 +985,10 @@ public void setDisabledImage (Image image) {
 public void setEnabled (boolean enabled) {
 	checkWidget();
 	long /*int*/ topHandle = topHandle ();
-	if (OS.gtk_widget_get_sensitive (topHandle) == enabled) return;
-	OS.gtk_widget_set_sensitive (topHandle, enabled);
+	if (GTK.gtk_widget_get_sensitive (topHandle) == enabled) return;
+	GTK.gtk_widget_set_sensitive (topHandle, enabled);
 
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		if (enabled) {
 			/*
 			* Bug in GTK (see Eclipse bug 82169). GtkButton requires an enter notify before it
@@ -999,8 +999,8 @@ public void setEnabled (boolean enabled) {
 			int [] x = new int [1], y = new int [1];
 			gdk_window_get_device_position (parent.paintWindow (), x, y, null);
 			if (getBoundsInPixels ().contains (x [0], y [0])) {
-				OS.gtk_widget_hide (handle);
-				OS.gtk_widget_show (handle);
+				GTK.gtk_widget_hide (handle);
+				GTK.gtk_widget_show (handle);
 			}
 		} else {
 			/*
@@ -1010,13 +1010,13 @@ public void setEnabled (boolean enabled) {
 			* As a result, when it is re-enabled it automatically enters
 			* a PRELIGHT state. The fix is to set a NORMAL state.
 			*/
-			OS.gtk_widget_set_state (topHandle, OS.GTK_STATE_NORMAL);
+			GTK.gtk_widget_set_state (topHandle, GTK.GTK_STATE_NORMAL);
 		}
 	}
 }
 
 boolean setFocus () {
-	return OS.gtk_widget_child_focus (handle, OS.GTK_DIR_TAB_FORWARD);
+	return GTK.gtk_widget_child_focus (handle, GTK.GTK_DIR_TAB_FORWARD);
 }
 
 void setFontDescription (long /*int*/ font) {
@@ -1024,26 +1024,26 @@ void setFontDescription (long /*int*/ font) {
 }
 
 void setForegroundRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (labelHandle != 0) setForegroundRGBA (labelHandle, rgba);
 }
 
 void setBackgroundRGBA (GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (handle != 0) setBackgroundRGBA (handle, rgba);
 }
 
 void setForegroundColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	if (labelHandle != 0) setForegroundColor (labelHandle, color);
 }
 
 void setBackgroundRGBA (long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		// Form background string
-		long /*int*/ context = OS.gtk_widget_get_style_context(handle);
-		String name = OS.GTK_VERSION >= OS.VERSION(3,	 20, 0) ? display.gtk_widget_class_get_css_name(handle)
+		long /*int*/ context = GTK.gtk_widget_get_style_context(handle);
+		String name = GTK.GTK_VERSION >= OS.VERSION(3,	 20, 0) ? display.gtk_widget_class_get_css_name(handle)
         		: display.gtk_widget_get_name(handle);
 		String css = name + " {background-color: " + display.gtk_rgba_to_css_string(rgba) + "}";
 
@@ -1054,13 +1054,13 @@ void setBackgroundRGBA (long /*int*/ handle, GdkRGBA rgba) {
 }
 
 void setForegroundRGBA (long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
-	if (OS.GTK_VERSION < OS.VERSION(3, 14, 0)) {
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
+	if (GTK.GTK_VERSION < OS.VERSION(3, 14, 0)) {
 		GdkRGBA selectedForeground = display.COLOR_LIST_SELECTION_TEXT_RGBA;
-		OS.gtk_widget_override_color (handle, OS.GTK_STATE_FLAG_NORMAL, rgba);
-		OS.gtk_widget_override_color (handle, OS.GTK_STATE_FLAG_SELECTED, selectedForeground);
-		long /*int*/ context = OS.gtk_widget_get_style_context (handle);
-		OS.gtk_style_context_invalidate (context);
+		GTK.gtk_widget_override_color (handle, GTK.GTK_STATE_FLAG_NORMAL, rgba);
+		GTK.gtk_widget_override_color (handle, GTK.GTK_STATE_FLAG_SELECTED, selectedForeground);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
+		GTK.gtk_style_context_invalidate (context);
 		return;
 	}
 	GdkRGBA toSet = new GdkRGBA();
@@ -1069,7 +1069,7 @@ void setForegroundRGBA (long /*int*/ handle, GdkRGBA rgba) {
 	} else {
 		toSet = display.COLOR_WIDGET_FOREGROUND_RGBA;
 	}
-	long /*int*/ context = OS.gtk_widget_get_style_context (handle);
+	long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
 	// Form foreground string
 	String color = display.gtk_rgba_to_css_string(toSet);
 	String css = "* {color: " + color + ";}";
@@ -1142,7 +1142,7 @@ public void setImage (Image image) {
 	*/
 	if ((style & SWT.DROP_DOWN) != 0) {
 		proxyMenuItem = 0;
-		proxyMenuItem = OS.gtk_tool_item_retrieve_proxy_menu_item (handle);
+		proxyMenuItem = GTK.gtk_tool_item_retrieve_proxy_menu_item (handle);
 		OS.g_signal_connect(proxyMenuItem, OS.activate, ToolBar.menuItemSelectedFunc.getAddress(), handle);
 	}
 	parent.relayout ();
@@ -1151,8 +1151,8 @@ public void setImage (Image image) {
 @Override
 void setOrientation (boolean create) {
 	if ((parent.style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
-		int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-		if (handle != 0) OS.gtk_widget_set_direction (handle, dir);
+		int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+		if (handle != 0) GTK.gtk_widget_set_direction (handle, dir);
 	}
 }
 
@@ -1184,7 +1184,7 @@ public void setSelection (boolean selected) {
 	checkWidget ();
 	if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return;
 	OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CLICKED);
-	OS.gtk_toggle_tool_button_set_active (handle, selected);
+	GTK.gtk_toggle_tool_button_set_active (handle, selected);
 	OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CLICKED);
 }
 
@@ -1231,7 +1231,7 @@ public void setText (String string) {
 	if (labelHandle == 0) return;
 	char [] chars = fixMnemonic (string);
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+	GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	/*
 	* If Text/Image of a tool-item changes, then it is
 	* required to reset the proxy menu. Otherwise, the
@@ -1239,7 +1239,7 @@ public void setText (String string) {
 	*/
 	if ((style & SWT.DROP_DOWN) != 0) {
 		proxyMenuItem = 0;
-		proxyMenuItem = OS.gtk_tool_item_retrieve_proxy_menu_item (handle);
+		proxyMenuItem = GTK.gtk_tool_item_retrieve_proxy_menu_item (handle);
 		OS.g_signal_connect(proxyMenuItem, OS.activate, ToolBar.menuItemSelectedFunc.getAddress(), handle);
 	}
 	parent.relayout ();
@@ -1282,15 +1282,15 @@ public void setToolTipText (String string) {
 	*/
 	if ((style & SWT.DROP_DOWN) != 0) {
 		proxyMenuItem = 0;
-		proxyMenuItem = OS.gtk_tool_item_retrieve_proxy_menu_item (handle);
+		proxyMenuItem = GTK.gtk_tool_item_retrieve_proxy_menu_item (handle);
 		OS.g_signal_connect(proxyMenuItem, OS.activate, ToolBar.menuItemSelectedFunc.getAddress(), handle);
 	}
 }
 
 void setToolTipText (Shell shell, String newString) {
-	long /*int*/ child = OS.gtk_bin_get_child (handle);
+	long /*int*/ child = GTK.gtk_bin_get_child (handle);
 	if ((style & SWT.DROP_DOWN) != 0) {
-		long /*int*/ list = OS.gtk_container_get_children (child);
+		long /*int*/ list = GTK.gtk_container_get_children (child);
 		child = OS.g_list_nth_data (list, 0);
 		if (arrowHandle != 0) shell.setToolTipText (arrowHandle, newString);
 	}
@@ -1328,9 +1328,9 @@ void setWidthInPixels (int width) {
 }
 
 void showWidget (int index) {
-	if (handle != 0) OS.gtk_widget_show (handle);
-	if (labelHandle != 0) OS.gtk_widget_show (labelHandle);
-	if (imageHandle != 0) OS.gtk_widget_show (imageHandle);
-	OS.gtk_toolbar_insert(parent.handle, handle, index);
+	if (handle != 0) GTK.gtk_widget_show (handle);
+	if (labelHandle != 0) GTK.gtk_widget_show (labelHandle);
+	if (imageHandle != 0) GTK.gtk_widget_show (imageHandle);
+	GTK.gtk_toolbar_insert(parent.handle, handle, index);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
index b88cc109ec..f81b1d1d88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
@@ -137,7 +137,7 @@ public void addSelectionListener (SelectionListener listener) {
 
 void configure () {
 	long /*int*/ screen = OS.gdk_screen_get_default ();
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	/*
 	 * Feature in GTK: using gdk_screen_get_monitor_at_window() does not accurately get the correct monitor on the machine.
 	 * Using gdk_screen_get_monitor_at_point() returns it correctly. Using getLocation() on point will get
@@ -154,7 +154,7 @@ void configure () {
 	point = getLocation ();
 	int x = point.x;
 	int y = point.y;
-	OS.gtk_window_resize (handle, w, h + TIP_HEIGHT);
+	GTK.gtk_window_resize (handle, w, h + TIP_HEIGHT);
 	int[] polyline;
 	spikeAbove = dest.height >= y + h + TIP_HEIGHT;
 	if ((dest.width >= x + w) || (multipleMonitors && OS.gdk_screen_width() >= x + w)) {
@@ -182,7 +182,7 @@ void configure () {
 				borderPolygon[12] = w-35;
 				borderPolygon[14] = borderPolygon[16]  = w-16;
 			}
-			OS.gtk_window_move (handle, Math.max(0, x - 17), y);
+			GTK.gtk_window_move (handle, Math.max(0, x - 17), y);
 		} else {
 			polyline = new int[] {
 				0, 5, 1, 5, 1, 3, 3, 1,  5, 1, 5, 0,
@@ -205,7 +205,7 @@ void configure () {
 				borderPolygon[36] = borderPolygon[38] = w-17;
 				borderPolygon [40] = w-35;
 			}
-			OS.gtk_window_move (handle, Math.max(0, x - 17), y - h - TIP_HEIGHT);
+			GTK.gtk_window_move (handle, Math.max(0, x - 17), y - h - TIP_HEIGHT);
 		}
 	} else {
 		if (dest.height >= y + h + TIP_HEIGHT) {
@@ -231,7 +231,7 @@ void configure () {
 				borderPolygon[12] =  borderPolygon[14] = 16;
 				borderPolygon [16] = 35;
 			}
-			OS.gtk_window_move (handle, Math.max(dest.width- w, x - w + 17), y);
+			GTK.gtk_window_move (handle, Math.max(dest.width- w, x - w + 17), y);
 		} else {
 			polyline = new int[] {
 				0, 5, 1, 5, 1, 3, 3, 1,  5, 1, 5, 0,
@@ -254,14 +254,14 @@ void configure () {
 				borderPolygon[36] = 35;
 				borderPolygon[38] = borderPolygon [40] = 17;
 			}
-			OS.gtk_window_move (handle, Math.max(dest.width - w, x - w + 17), y - h - TIP_HEIGHT);
+			GTK.gtk_window_move (handle, Math.max(dest.width - w, x - w + 17), y - h - TIP_HEIGHT);
 		}
 	}
-	OS.gtk_widget_realize(handle);
+	GTK.gtk_widget_realize(handle);
 	Region region = new Region (display);
 	region.add(DPIUtil.autoScaleDown(polyline));
-	if (OS.GTK3) {
-		OS.gtk_widget_shape_combine_region (handle, region.handle);
+	if (GTK.GTK3) {
+		GTK.gtk_widget_shape_combine_region (handle, region.handle);
 	} else {
 		long /*int*/ window = gtk_widget_get_window (handle);
 		OS.gdk_window_shape_combine_region (window, region.handle, 0, 0);
@@ -273,19 +273,19 @@ void configure () {
 void createHandle (int index) {
 	if ((style & SWT.BALLOON) != 0) {
 		state |= HANDLE;
-		handle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
+		handle = GTK.gtk_window_new (GTK.GTK_WINDOW_POPUP);
 		Color background = display.getSystemColor (SWT.COLOR_INFO_BACKGROUND);
-		if (OS.GTK3) {
-			long /*int*/ context = OS.gtk_widget_get_style_context (handle);
+		if (GTK.GTK3) {
+			long /*int*/ context = GTK.gtk_widget_get_style_context (handle);
 			GdkRGBA bgRGBA = background.handleRGBA;
-			String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "window" : "GtkWindow";
+			String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "window" : "GtkWindow";
 			String css = name + " {background-color: " + display.gtk_rgba_to_css_string(bgRGBA) + ";}";
 			gtk_css_provider_load_from_css (context, css);
-			OS.gtk_style_context_invalidate (context);
+			GTK.gtk_style_context_invalidate (context);
 		} else {
-			OS.gtk_widget_modify_bg (handle, OS.GTK_STATE_NORMAL, background.handle);
+			GTK.gtk_widget_modify_bg (handle, GTK.GTK_STATE_NORMAL, background.handle);
 		}
-		OS.gtk_window_set_type_hint (handle, OS.GDK_WINDOW_TYPE_HINT_TOOLTIP);
+		GTK.gtk_window_set_type_hint (handle, OS.GDK_WINDOW_TYPE_HINT_TOOLTIP);
 	}
 }
 
@@ -293,11 +293,11 @@ void gtk_css_provider_load_from_css (long /*int*/ context, String css) {
 	/* Utility function. */
 	//@param css : a 'css java' string like "{\nbackground: red;\n}".
 	if (provider == 0) {
-		provider = OS.gtk_css_provider_new ();
-		OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+		provider = GTK.gtk_css_provider_new ();
+		GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 		OS.g_object_unref (provider);
 	}
-	OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
+	GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
 }
 
 @Override
@@ -316,7 +316,7 @@ void destroyWidget () {
 	releaseHandle ();
 	if (topHandle != 0 && (state & HANDLE) != 0) {
 		if ((style & SWT.BALLOON) != 0) {
-			OS.gtk_widget_destroy (topHandle);
+			GTK.gtk_widget_destroy (topHandle);
 		} else {
 			OS.g_object_unref (topHandle);
 		}
@@ -346,7 +346,7 @@ Point getLocation () {
 	if (item != null) {
 		long /*int*/ itemHandle = item.handle;
 		GdkRectangle area = new GdkRectangle ();
-		OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0);
+		GTK.gtk_status_icon_get_geometry (itemHandle, 0, area, 0);
 		x = area.x + area.width / 2;
 		y = area.y + area.height / 2;
 	}
@@ -463,7 +463,7 @@ public String getText () {
  */
 public boolean getVisible () {
 	checkWidget ();
-	if ((style & SWT.BALLOON) != 0) return OS.gtk_widget_get_visible (handle);
+	if ((style & SWT.BALLOON) != 0) return GTK.gtk_widget_get_visible (handle);
 	return false;
 }
 
@@ -500,7 +500,7 @@ void drawTooltip (long /*int*/ cr) {
 			case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs ("dialog-warning", true); break;
 		}
 		if (buffer != null) {
-			long /*int*/ pixbuf = OS.gtk_icon_theme_load_icon(OS.gtk_icon_theme_get_default(), buffer, OS.GTK_ICON_SIZE_MENU, 0, 0);
+			long /*int*/ pixbuf = GTK.gtk_icon_theme_load_icon(GTK.gtk_icon_theme_get_default(), buffer, GTK.GTK_ICON_SIZE_MENU, 0, 0);
 			OS.gdk_cairo_set_source_pixbuf(cairo, pixbuf, x, y);
 			Cairo.cairo_paint (cairo);
 			OS.g_object_unref (pixbuf);
@@ -509,7 +509,7 @@ void drawTooltip (long /*int*/ cr) {
 		x += INSET;
 		int [] w = new int [1], h = new int [1];
 		Color foreground = display.getSystemColor (SWT.COLOR_INFO_FOREGROUND);
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			OS.gdk_cairo_set_source_rgba(cairo,foreground.handleRGBA);
 		} else {
 			OS.gdk_cairo_set_source_color(cairo,foreground.handle);
@@ -522,7 +522,7 @@ void drawTooltip (long /*int*/ cr) {
 	if (layoutMessage != 0) {
 		x = BORDER + PADDING + INSET;
 		Color foreground = display.getSystemColor (SWT.COLOR_INFO_FOREGROUND);
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			OS.gdk_cairo_set_source_rgba(cairo,foreground.handleRGBA);
 		} else {
 			OS.gdk_cairo_set_source_color(cairo,foreground.handle);
@@ -553,17 +553,17 @@ long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
 	int x = point.x;
 	int y = point.y;
 	long /*int*/ screen = OS.gdk_screen_get_default ();
-	OS.gtk_widget_realize (widget);
+	GTK.gtk_widget_realize (widget);
 	int monitorNumber = OS.gdk_screen_get_monitor_at_point(screen, point.x, point.y);
 	GdkRectangle dest = new GdkRectangle ();
 	OS.gdk_screen_get_monitor_geometry (screen, monitorNumber, dest);
 	GtkAllocation widgetAllocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (widget, widgetAllocation);
+	GTK.gtk_widget_get_allocation (widget, widgetAllocation);
 	int w = widgetAllocation.width;
 	int h = widgetAllocation.height;
 	if (dest.height < y + h) y -= h;
 	if (dest.width < x + w) x -= w;
-	OS.gtk_window_move (widget, x, y);
+	GTK.gtk_window_move (widget, x, y);
 	return 0;
 }
 
@@ -571,10 +571,10 @@ long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
 void hookEvents () {
 	if ((style & SWT.BALLOON) != 0) {
 		OS.g_signal_connect_closure_by_id (handle, display.signalIds [EXPOSE_EVENT], 0, display.getClosure (EXPOSE_EVENT), true);
-		if (OS.GTK_VERSION >= OS.VERSION (3, 9, 0)) {
+		if (GTK.GTK_VERSION >= OS.VERSION (3, 9, 0)) {
 			OS.g_signal_connect_closure_by_id (handle, display.signalIds [EXPOSE_EVENT_INVERSE], 0, display.getClosure (EXPOSE_EVENT_INVERSE), true);
 		}
-		OS.gtk_widget_add_events (handle, OS.GDK_BUTTON_PRESS_MASK);
+		GTK.gtk_widget_add_events (handle, OS.GDK_BUTTON_PRESS_MASK);
 		OS.g_signal_connect_closure (handle, OS.button_press_event, display.getClosure (BUTTON_PRESS_EVENT), false);
 	}
 }
@@ -685,7 +685,7 @@ void setLocationInPixels (int x, int y) {
 	this.x = x;
 	this.y = y;
 	if ((style & SWT.BALLOON) != 0) {
-		if (OS.gtk_widget_get_visible (handle)) configure ();
+		if (GTK.gtk_widget_get_visible (handle)) configure ();
 	}
 }
 /**
@@ -743,11 +743,11 @@ public void setMessage (String string) {
 	layoutMessage = 0;
 	if (message.length () != 0) {
 		byte [] buffer = Converter.wcsToMbcs (message, true);
-		layoutMessage = OS.gtk_widget_create_pango_layout (handle, buffer);
+		layoutMessage = GTK.gtk_widget_create_pango_layout (handle, buffer);
 		OS.pango_layout_set_auto_dir (layoutMessage, false);
 		OS.pango_layout_set_wrap (layoutMessage, OS.PANGO_WRAP_WORD_CHAR);
 	}
-	if (OS.gtk_widget_get_visible (handle)) configure ();
+	if (GTK.gtk_widget_get_visible (handle)) configure ();
 }
 
 /**
@@ -772,7 +772,7 @@ public void setText (String string) {
 	layoutText = 0;
 	if (text.length () != 0) {
 		byte [] buffer = Converter.wcsToMbcs (text, true);
-		layoutText = OS.gtk_widget_create_pango_layout (handle, buffer);
+		layoutText = GTK.gtk_widget_create_pango_layout (handle, buffer);
 		OS.pango_layout_set_auto_dir (layoutText, false);
 		long /*int*/ boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD);
 		PangoAttribute attribute = new PangoAttribute ();
@@ -786,7 +786,7 @@ public void setText (String string) {
 		OS.pango_attr_list_unref (attrList);
 		OS.pango_layout_set_wrap (layoutText, OS.PANGO_WRAP_WORD_CHAR);
 	}
-	if (OS.gtk_widget_get_visible (handle)) configure ();
+	if (GTK.gtk_widget_get_visible (handle)) configure ();
 }
 
 /**
@@ -812,23 +812,23 @@ public void setVisible (boolean visible) {
 	if (visible) {
 		if ((style & SWT.BALLOON) != 0) {
 			configure ();
-			OS.gtk_widget_show (handle);
+			GTK.gtk_widget_show (handle);
 		} else {
 			long /*int*/ vboxHandle = parent.vboxHandle;
 			StringBuilder string = new StringBuilder (text);
 			if (text.length () > 0) string.append ("\n\n");
 			string.append (message);
 			byte [] buffer = Converter.wcsToMbcs (string.toString(), true);
-			OS.gtk_widget_set_tooltip_text(vboxHandle, buffer);
+			GTK.gtk_widget_set_tooltip_text(vboxHandle, buffer);
 		}
 		if (autohide) timerId = OS.g_timeout_add (DELAY, display.windowTimerProc, handle);
 	} else {
 		if ((style & SWT.BALLOON) != 0) {
-			OS.gtk_widget_hide (handle);
+			GTK.gtk_widget_hide (handle);
 		} else {
 			long /*int*/ vboxHandle = parent.vboxHandle;
 			byte[] buffer = Converter.wcsToMbcs("", true);
-			OS.gtk_widget_set_tooltip_text(vboxHandle, buffer);
+			GTK.gtk_widget_set_tooltip_text(vboxHandle, buffer);
 		}
 	}
 }
@@ -836,7 +836,7 @@ public void setVisible (boolean visible) {
 @Override
 long /*int*/ timerProc (long /*int*/ widget) {
 	if ((style & SWT.BALLOON) != 0) {
-		OS.gtk_widget_hide (handle);
+		GTK.gtk_widget_hide (handle);
 	}
 	return 0;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
index fa0102b26e..7b20b31782 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
@@ -312,9 +312,9 @@ void drawRectangles (Rectangle [] rects) {
 		window = gtk_widget_get_window (parent.paintHandle());
 	}
 	if (window == 0) return;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		if (overlay == 0) return;
-		OS.gtk_widget_shape_combine_region (overlay, 0);
+		GTK.gtk_widget_shape_combine_region (overlay, 0);
 		long /*int*/ region = OS.gdk_region_new ();
 		GdkRectangle rect = new GdkRectangle();
 		for (int i = 0; i < rects.length; i++) {
@@ -335,9 +335,9 @@ void drawRectangles (Rectangle [] rects) {
 			rect.height = 1;
 			OS.gdk_region_union_with_rect(region, rect);
 		}
-		OS.gtk_widget_shape_combine_region (overlay, region);
+		GTK.gtk_widget_shape_combine_region (overlay, region);
 		OS.gdk_region_destroy (region);
-		long /*int*/ overlayWindow = OS.gtk_widget_get_window (overlay);
+		long /*int*/ overlayWindow = GTK.gtk_widget_get_window (overlay);
 		OS.gdk_window_hide (overlayWindow);
 		OS.gdk_window_show (overlayWindow);
 		return;
@@ -494,7 +494,7 @@ long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
 				draw = true;
 			}
 			if (draw) {
-				if (!OS.GTK3) {
+				if (!GTK.GTK3) {
 					drawRectangles (rectsToErase);
 					update ();
 				}
@@ -621,7 +621,7 @@ long /*int*/ gtk_mouse (int eventType, long /*int*/ widget, long /*int*/ eventPt
 				draw = true;
 			}
 			if (draw) {
-				if (!OS.GTK3) {
+				if (!GTK.GTK3) {
 					drawRectangles (rectsToErase);
 					update ();
 				}
@@ -668,7 +668,7 @@ long /*int*/ gtk_mouse (int eventType, long /*int*/ widget, long /*int*/ eventPt
 				draw = true;
 			}
 			if (draw) {
-				if (!OS.GTK3) {
+				if (!GTK.GTK3) {
 					drawRectangles (rectsToErase);
 					update ();
 				}
@@ -718,7 +718,7 @@ public boolean open () {
 	if (window == 0) return false;
 	cancelled = false;
 	tracking = true;
-	if (!OS.GTK3) {
+	if (!GTK.GTK3) {
 		update ();
 		drawRectangles (rectangles);
 	}
@@ -758,35 +758,35 @@ public boolean open () {
 	grabbed = grab ();
 	lastCursor = this.cursor != null ? this.cursor.handle : 0;
 
-	if (OS.GTK3) {
-		overlay = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
-		OS.gtk_window_set_skip_taskbar_hint (overlay, true);
-		OS.gtk_window_set_title (overlay, new byte [1]);
-		OS.gtk_widget_realize (overlay);
-		long /*int*/ overlayWindow = OS.gtk_widget_get_window (overlay);
+	if (GTK.GTK3) {
+		overlay = GTK.gtk_window_new (GTK.GTK_WINDOW_POPUP);
+		GTK.gtk_window_set_skip_taskbar_hint (overlay, true);
+		GTK.gtk_window_set_title (overlay, new byte [1]);
+		GTK.gtk_widget_realize (overlay);
+		long /*int*/ overlayWindow = GTK.gtk_widget_get_window (overlay);
 		OS.gdk_window_set_override_redirect (overlayWindow, true);
-		if (OS.GTK_VERSION < OS.VERSION (3, 14, 0)) {
-			OS.gtk_widget_override_background_color (overlay, OS.GTK_STATE_FLAG_NORMAL, new GdkRGBA());
+		if (GTK.GTK_VERSION < OS.VERSION (3, 14, 0)) {
+			GTK.gtk_widget_override_background_color (overlay, GTK.GTK_STATE_FLAG_NORMAL, new GdkRGBA());
 		} else {
-			String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "window" : "GtkWindow";
+			String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "window" : "GtkWindow";
 			String css = name + " {background-color: rgb(0,0,0);}";
 			long /*int*/ provider = 0;
-			long /*int*/ context = OS.gtk_widget_get_style_context (overlay);
+			long /*int*/ context = GTK.gtk_widget_get_style_context (overlay);
 			if (provider == 0) {
-				provider = OS.gtk_css_provider_new ();
-				OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+				provider = GTK.gtk_css_provider_new ();
+				GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 				OS.g_object_unref (provider);
 			}
-			OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
+			GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (css, true), -1, null);
 		}
 		long /*int*/ region = OS.gdk_region_new ();
-		OS.gtk_widget_shape_combine_region (overlay, region);
-		OS.gtk_widget_input_shape_combine_region (overlay, region);
+		GTK.gtk_widget_shape_combine_region (overlay, region);
+		GTK.gtk_widget_input_shape_combine_region (overlay, region);
 		OS.gdk_region_destroy (region);
 		Rectangle bounds = display.getBoundsInPixels();
-		OS.gtk_window_move (overlay, bounds.x, bounds.y);
-		OS.gtk_window_resize (overlay, bounds.width, bounds.height);
-		OS.gtk_widget_show (overlay);
+		GTK.gtk_window_move (overlay, bounds.x, bounds.y);
+		GTK.gtk_window_resize (overlay, bounds.width, bounds.height);
+		GTK.gtk_widget_show (overlay);
 	}
 
 	/* Tracker behaves like a Dialog with its own OS event loop. */
@@ -814,14 +814,14 @@ public boolean open () {
 		display.tracker = oldTracker;
 	}
 	if (!isDisposed ()) {
-		if (!OS.GTK3) {
+		if (!GTK.GTK3) {
 			update ();
 			drawRectangles (rectangles);
 		}
 	}
 	ungrab ();
 	if (overlay != 0) {
-		OS.gtk_widget_destroy (overlay);
+		GTK.gtk_widget_destroy (overlay);
 		overlay = 0;
 	}
 	window = 0;
@@ -831,7 +831,7 @@ public boolean open () {
 boolean processEvent (long /*int*/ eventPtr) {
 	GdkEvent gdkEvent = new GdkEvent();
 	OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
-	long /*int*/ widget = OS.gtk_get_event_widget (eventPtr);
+	long /*int*/ widget = GTK.gtk_get_event_widget (eventPtr);
 	switch (gdkEvent.type) {
 		case OS.GDK_MOTION_NOTIFY: gtk_motion_notify_event (widget, eventPtr); break;
 		case OS.GDK_BUTTON_RELEASE: gtk_button_release_event (widget, eventPtr); break;
@@ -846,9 +846,9 @@ boolean processEvent (long /*int*/ eventPtr) {
 			break;
 		case OS.GDK_EXPOSE:
 			update ();
-			if (!OS.GTK3) drawRectangles (rectangles);
-			OS.gtk_main_do_event (eventPtr);
-			if (!OS.GTK3) drawRectangles (rectangles);
+			if (!GTK.GTK3) drawRectangles (rectangles);
+			GTK.gtk_main_do_event (eventPtr);
+			if (!GTK.GTK3) drawRectangles (rectangles);
 			break;
 		default:
 			return true;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java
index 8bf3604067..93bbf85b25 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java
@@ -155,10 +155,10 @@ void createWidget (int index) {
 @Override
 void createHandle (int index) {
 	state |= HANDLE;
-	handle = OS.gtk_status_icon_new ();
+	handle = GTK.gtk_status_icon_new ();
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-	imageHandle = OS.gtk_image_new ();
-	OS.gtk_status_icon_set_visible (handle,true);
+	imageHandle = GTK.gtk_image_new ();
+	GTK.gtk_status_icon_set_visible (handle,true);
 }
 
 @Override
@@ -254,7 +254,7 @@ long /*int*/ gtk_activate (long /*int*/ widget) {
 	long /*int*/ nextEvent = OS.gdk_event_peek ();
 	if (nextEvent != 0) {
 		int nextEventType = OS.GDK_EVENT_TYPE (nextEvent);
-		long /*int*/ currEvent = OS.gtk_get_current_event ();
+		long /*int*/ currEvent = GTK.gtk_get_current_event ();
 		int currEventType = 0;
 		if (currEvent != 0) {
 			currEventType = OS.GDK_EVENT_TYPE (currEvent);
@@ -290,9 +290,9 @@ long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
 	if (image != null && image.mask != 0) {
 		if (OS.gdk_drawable_get_depth (image.mask) == 1) {
 			GtkAllocation widgetAllocation = new GtkAllocation ();
-			OS.gtk_widget_get_allocation (widget, widgetAllocation);
-			int xoffset = (int) Math.floor (widgetAllocation.x + ((widgetAllocation.width -OS.GTK_WIDGET_REQUISITION_WIDTH (widget)) * 0.5) + 0.5);
-			int yoffset = (int) Math.floor (widgetAllocation.y + ((widgetAllocation.height - OS.GTK_WIDGET_REQUISITION_HEIGHT (widget)) * 0.5) + 0.5);
+			GTK.gtk_widget_get_allocation (widget, widgetAllocation);
+			int xoffset = (int) Math.floor (widgetAllocation.x + ((widgetAllocation.width -GTK.GTK_WIDGET_REQUISITION_WIDTH (widget)) * 0.5) + 0.5);
+			int yoffset = (int) Math.floor (widgetAllocation.y + ((widgetAllocation.height - GTK.GTK_WIDGET_REQUISITION_HEIGHT (widget)) * 0.5) + 0.5);
 			Rectangle b = image.getBoundsInPixels();
 			long /*int*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height);
 			if (gdkImagePtr == 0) error(SWT.ERROR_NO_HANDLES);
@@ -313,7 +313,7 @@ long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
 					}
 				}
 			}
-			OS.gtk_widget_realize (handle);
+			GTK.gtk_widget_realize (handle);
 			long /*int*/ window = gtk_widget_get_window (handle);
 			OS.gdk_window_shape_combine_region (window, region.handle, 0, 0);
 			region.dispose ();
@@ -355,7 +355,7 @@ void hookEvents () {
  */
 public boolean getVisible () {
 	checkWidget ();
-	return OS.gtk_status_icon_get_visible (handle);
+	return GTK.gtk_status_icon_get_visible (handle);
 }
 
 @Override
@@ -485,12 +485,12 @@ public void setImage (Image image) {
 			imageList.put (imageIndex, image);
 		}
 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
-		OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf);
-		OS.gtk_status_icon_set_visible (handle, true);
+		GTK.gtk_status_icon_set_from_pixbuf (handle, pixbuf);
+		GTK.gtk_status_icon_set_visible (handle, true);
 	} else {
-		OS.gtk_widget_set_size_request (handle, 1, 1);
-		OS.gtk_status_icon_set_from_pixbuf (handle, 0);
-		OS.gtk_status_icon_set_visible (handle, false);
+		GTK.gtk_widget_set_size_request (handle, 1, 1);
+		GTK.gtk_status_icon_set_from_pixbuf (handle, 0);
+		GTK.gtk_status_icon_set_visible (handle, false);
 	}
 }
 
@@ -542,7 +542,7 @@ public void setToolTipText (String string) {
 	if (string != null && string.length () > 0) {
 		buffer = Converter.wcsToMbcs (string, true);
 	}
-	OS.gtk_status_icon_set_tooltip_text (handle, buffer);
+	GTK.gtk_status_icon_set_tooltip_text (handle, buffer);
 }
 
 /**
@@ -558,7 +558,7 @@ public void setToolTipText (String string) {
  */
 public void setVisible (boolean visible) {
 	checkWidget ();
-	if(OS.gtk_status_icon_get_visible (handle) == visible) return;
+	if(GTK.gtk_status_icon_get_visible (handle) == visible) return;
 	if (visible) {
 		/*
 		* It is possible (but unlikely), that application
@@ -567,9 +567,9 @@ public void setVisible (boolean visible) {
 		*/
 		sendEvent (SWT.Show);
 		if (isDisposed ()) return;
-		OS.gtk_status_icon_set_visible (handle, visible);
+		GTK.gtk_status_icon_set_visible (handle, visible);
 	} else {
-		OS.gtk_status_icon_set_visible (handle, visible);
+		GTK.gtk_status_icon_set_visible (handle, visible);
 		sendEvent (SWT.Hide);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 6509d9ca58..ef6bacce72 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -167,25 +167,25 @@ void _addListener (int eventType, Listener listener) {
 TreeItem _getItem (long /*int*/ iter) {
 	int id = getId (iter, true);
 	if (items [id] != null) return items [id];
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-	int depth = OS.gtk_tree_path_get_depth (path);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+	int depth = GTK.gtk_tree_path_get_depth (path);
 	int [] indices = new int [depth];
-	C.memmove (indices, OS.gtk_tree_path_get_indices (path), 4*depth);
+	C.memmove (indices, GTK.gtk_tree_path_get_indices (path), 4*depth);
 	long /*int*/ parentIter = 0;
 	if (depth > 1) {
-		OS.gtk_tree_path_up (path);
-		parentIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		OS.gtk_tree_model_get_iter (modelHandle, parentIter, path);
+		GTK.gtk_tree_path_up (path);
+		parentIter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		GTK.gtk_tree_model_get_iter (modelHandle, parentIter, path);
 	}
 	items [id] = new TreeItem (this, parentIter, SWT.NONE, indices [indices.length -1], false);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	if (parentIter != 0) OS.g_free (parentIter);
 	return items [id];
 }
 
 TreeItem _getItem (long /*int*/ parentIter, int index) {
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	GTK.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
 	int id = getId (iter, true);
 	OS.g_free (iter);
 	if (items [id] != null) return items [id];
@@ -195,7 +195,7 @@ TreeItem _getItem (long /*int*/ parentIter, int index) {
 int getId (long /*int*/ iter, boolean queryModel) {
 	if (queryModel) {
 		int[] value = new int[1];
-		OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
+		GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
 		if (value [0] != -1) return value [0];
 	}
 	// find next available id
@@ -206,7 +206,7 @@ int getId (long /*int*/ iter, boolean queryModel) {
 		System.arraycopy (items, 0, newItems, 0, items.length);
 		items = newItems;
 	}
-	OS.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, id, -1);
+	GTK.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, id, -1);
 	return id;
 }
 
@@ -233,10 +233,10 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 	if (cell == ignoreCell) return 0;
 	TreeItem item = _getItem (iter);
 	if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);
-	boolean isPixbuf = OS.GTK_IS_CELL_RENDERER_PIXBUF (cell);
-	boolean isText = OS.GTK_IS_CELL_RENDERER_TEXT (cell);
-	if (isText && OS.GTK3) {
-		OS.gtk_cell_renderer_set_fixed_size (cell, -1, -1);
+	boolean isPixbuf = GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell);
+	boolean isText = GTK.GTK_IS_CELL_RENDERER_TEXT (cell);
+	if (isText && GTK.GTK3) {
+		GTK.gtk_cell_renderer_set_fixed_size (cell, -1, -1);
 	}
 	if (!(isPixbuf || isText)) return 0;
 	int modelIndex = -1;
@@ -263,12 +263,12 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 	if (setData) {
 		if (isPixbuf) {
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_PIXBUF, ptr, -1);
-			OS.g_object_set (cell, OS.GTK3 ? OS.gicon : OS.pixbuf, ptr [0], 0);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_PIXBUF, ptr, -1);
+			OS.g_object_set (cell, GTK.GTK3 ? OS.gicon : OS.pixbuf, ptr [0], 0);
 			if (ptr [0] != 0) OS.g_object_unref (ptr [0]);
 		} else {
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_TEXT, ptr, -1);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_TEXT, ptr, -1);
 			if (ptr [0] != 0) {
 				OS.g_object_set (cell, OS.text, ptr[0], 0);
 				OS.g_free (ptr[0]);
@@ -278,9 +278,9 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 	if (customDraw) {
 		if (!ownerDraw) {
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_BACKGROUND, ptr, -1);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_BACKGROUND, ptr, -1);
 			if (ptr [0] != 0) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					OS.g_object_set (cell, OS.cell_background_rgba, ptr[0], 0);
 					OS.gdk_rgba_free(ptr [0]);
 				} else {
@@ -291,9 +291,9 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 		}
 		if (!isPixbuf) {
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FOREGROUND, ptr, -1);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FOREGROUND, ptr, -1);
 			if (ptr [0] != 0) {
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					OS.g_object_set (cell, OS.foreground_rgba, ptr [0], 0);
 					OS.gdk_rgba_free (ptr [0]);
 				} else {
@@ -302,7 +302,7 @@ long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*i
 				}
 			}
 			ptr [0] = 0;
-			OS.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FONT, ptr, -1);
+			GTK.gtk_tree_model_get (tree_model, iter, modelIndex + CELL_FONT, ptr, -1);
 			if (ptr [0] != 0) {
 				OS.g_object_set (cell, OS.font_desc, ptr[0], 0);
 				OS.pango_font_description_free (ptr [0]);
@@ -326,7 +326,7 @@ boolean checkData (TreeItem item) {
 		event.item = item;
 		event.index = parentItem == null ? indexOf (item) : parentItem.indexOf (item);
 		int mask = OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
-		int signal_id = OS.g_signal_lookup (OS.row_changed, OS.gtk_tree_model_get_type ());
+		int signal_id = OS.g_signal_lookup (OS.row_changed, GTK.gtk_tree_model_get_type ());
 		OS.g_signal_handlers_block_matched (modelHandle, mask, signal_id, 0, 0, 0, handle);
 		currentItem = item;
 		sendEvent (SWT.SetData, event);
@@ -407,7 +407,7 @@ public void addTreeListener(TreeListener listener) {
 }
 
 int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) {
-	OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
+	GTK.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
 	/*
 	* Bug in GTK.  The width calculated by gtk_tree_view_column_cell_get_size()
 	* always grows in size regardless of the text or images in the table.
@@ -422,20 +422,20 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) {
 	int [] w = new int [1];
 	long /*int*/ path = 0;
 
-	if (OS.gtk_tree_view_get_expander_column (handle) == column) {
+	if (GTK.gtk_tree_view_get_expander_column (handle) == column) {
 		/* indent */
 		GdkRectangle rect = new GdkRectangle ();
-		OS.gtk_widget_realize (handle);
-		path = OS.gtk_tree_model_get_path (modelHandle, iter);
-		OS.gtk_tree_view_get_cell_area (handle, path, column, rect);
+		GTK.gtk_widget_realize (handle);
+		path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+		GTK.gtk_tree_view_get_cell_area (handle, path, column, rect);
 		width += rect.x;
 		/* expander */
-		OS.gtk_widget_style_get (handle, OS.expander_size, w, 0);
+		GTK.gtk_widget_style_get (handle, OS.expander_size, w, 0);
 		width += w [0] + TreeItem.EXPANDER_EXTRA_PADDING;
 	}
-	OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
+	GTK.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
 	width += 2 * w [0];
-	long /*int*/ list = OS.gtk_cell_layout_get_cells(column);
+	long /*int*/ list = GTK.gtk_cell_layout_get_cells(column);
 	if (list == 0) return 0;
 	long /*int*/ temp = list;
 	while (temp != 0) {
@@ -449,22 +449,22 @@ int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) {
 	OS.g_list_free (list);
 
 	if (recurse) {
-		if (path == 0) path = OS.gtk_tree_model_get_path (modelHandle, iter);
-		boolean expanded = OS.gtk_tree_view_row_expanded (handle, path);
+		if (path == 0) path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+		boolean expanded = GTK.gtk_tree_view_row_expanded (handle, path);
 		if (expanded) {
-			long /*int*/ childIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-			boolean valid = OS.gtk_tree_model_iter_children (modelHandle, childIter, iter);
+			long /*int*/ childIter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+			boolean valid = GTK.gtk_tree_model_iter_children (modelHandle, childIter, iter);
 			while (valid) {
 				width = Math.max (width, calculateWidth (column, childIter, true));
-				valid = OS.gtk_tree_model_iter_next (modelHandle, childIter);
+				valid = GTK.gtk_tree_model_iter_next (modelHandle, childIter);
 			}
 			OS.g_free (childIter);
 		}
 	}
 
-	if (path != 0) OS.gtk_tree_path_free (path);
-	if (OS.gtk_tree_view_get_grid_lines(handle) > OS.GTK_TREE_VIEW_GRID_LINES_NONE) {
-		OS.gtk_widget_style_get (handle, OS.grid_line_width, w, 0) ;
+	if (path != 0) GTK.gtk_tree_path_free (path);
+	if (GTK.gtk_tree_view_get_grid_lines(handle) > GTK.GTK_TREE_VIEW_GRID_LINES_NONE) {
+		GTK.gtk_widget_style_get (handle, OS.grid_line_width, w, 0) ;
 		width += 2 * w [0];
 	}
 	return width;
@@ -499,10 +499,10 @@ public void clear(int index, boolean all) {
 }
 
 void clear (long /*int*/ parentIter, int index, boolean all) {
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	GTK.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
 	int[] value = new int[1];
-	OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
+	GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
 	if (value [0] != -1) {
 		TreeItem item = items [value [0]];
 		item.clear ();
@@ -535,19 +535,19 @@ public void clearAll (boolean all) {
 	clearAll (all, 0);
 }
 void clearAll (boolean all, long /*int*/ parentIter) {
-	int length = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
+	int length = GTK.gtk_tree_model_iter_n_children (modelHandle, parentIter);
 	if (length == 0) return;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	boolean valid = GTK.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
 	int[] value = new int[1];
 	while (valid) {
-		OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
+		GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
 		if (value [0] != -1) {
 			TreeItem item = items [value [0]];
 			item.clear ();
 		}
 		if (all) clearAll (all, iter);
-		valid = OS.gtk_tree_model_iter_next (modelHandle, iter);
+		valid = GTK.gtk_tree_model_iter_next (modelHandle, iter);
 	}
 	OS.g_free (iter);
 }
@@ -557,7 +557,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	checkWidget ();
 	if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;
 	if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
-	OS.gtk_widget_realize(handle);
+	GTK.gtk_widget_realize(handle);
 	Point size = computeNativeSize (handle, wHint, hHint, changed);
 	if (size.x == 0 && wHint == SWT.DEFAULT) size.x = DEFAULT_WIDTH;
 
@@ -569,7 +569,7 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	 * When fixing that, be careful not to use getItems (), since that
 	 * would realize too many VIRTUAL TreeItems (similar to bug 490203).
 	 */
-	if (OS.GTK3 && hHint == SWT.DEFAULT && size.y == getHeaderHeight()) {
+	if (GTK.GTK3 && hHint == SWT.DEFAULT && size.y == getHeaderHeight()) {
 		size.y = getItemCount() * getItemHeightInPixels() + getHeaderHeight();
 	}
 
@@ -586,17 +586,17 @@ Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 }
 
 void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int newStart, long /*int*/ [] types, long /*int*/ oldParent, long /*int*/ newParent, int modelLength) {
-	long /*int*/ iter = OS.g_malloc(OS.GtkTreeIter_sizeof ());
-	if (OS.gtk_tree_model_iter_children (oldModel, iter, oldParent))  {
-		long /*int*/ [] oldItems = new long /*int*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)];
+	long /*int*/ iter = OS.g_malloc(GTK.GtkTreeIter_sizeof ());
+	if (GTK.gtk_tree_model_iter_children (oldModel, iter, oldParent))  {
+		long /*int*/ [] oldItems = new long /*int*/ [GTK.gtk_tree_model_iter_n_children (oldModel, oldParent)];
 		int oldIndex = 0;
 		long /*int*/ [] ptr = new long /*int*/ [1];
 		int [] ptr1 = new int [1];
 		do {
-			long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+			long /*int*/ newItem = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 			if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
-			OS.gtk_tree_store_append (newModel, newItem, newParent);
-			OS.gtk_tree_model_get (oldModel, iter, ID_COLUMN, ptr1, -1);
+			GTK.gtk_tree_store_append (newModel, newItem, newParent);
+			GTK.gtk_tree_model_get (oldModel, iter, ID_COLUMN, ptr1, -1);
 			int index = ptr1[0];
 			TreeItem item = null;
 			if (index != -1) {
@@ -606,14 +606,14 @@ void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int
 					oldItems[oldIndex++] = oldItem;
 					/* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
 					for (int j = 0; j < FOREGROUND_COLUMN; j++) {
-						OS.gtk_tree_model_get (oldModel, oldItem, j, ptr1, -1);
-						OS.gtk_tree_store_set (newModel, newItem, j, ptr1 [0], -1);
+						GTK.gtk_tree_model_get (oldModel, oldItem, j, ptr1, -1);
+						GTK.gtk_tree_store_set (newModel, newItem, j, ptr1 [0], -1);
 					}
 					for (int j = FOREGROUND_COLUMN; j < FIRST_COLUMN; j++) {
-						OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
-						OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);
+						GTK.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
+						GTK.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);
 						if (ptr [0] != 0) {
-							if (OS.GTK3) {
+							if (GTK.GTK3) {
 								if (types[j] == OS.GDK_TYPE_RGBA()) {
 									OS.gdk_rgba_free(ptr[0]);
 								}
@@ -633,10 +633,10 @@ void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int
 					}
 					for (int j= 0; j<modelLength - FIRST_COLUMN; j++) {
 						int newIndex = newStart + j;
-						OS.gtk_tree_model_get (oldModel, oldItem, oldStart + j, ptr, -1);
-						OS.gtk_tree_store_set (newModel, newItem, newIndex, ptr [0], -1);
+						GTK.gtk_tree_model_get (oldModel, oldItem, oldStart + j, ptr, -1);
+						GTK.gtk_tree_store_set (newModel, newItem, newIndex, ptr [0], -1);
 						if (ptr[0] != 0) {
-							if (OS.GTK3) {
+							if (GTK.GTK3) {
 								if (types[newIndex] == OS.GDK_TYPE_RGBA()) {
 									OS.gdk_rgba_free(ptr[0]);
 								}
@@ -656,7 +656,7 @@ void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int
 					}
 				}
 			} else {
-				OS.gtk_tree_store_set (newModel, newItem, ID_COLUMN, -1, -1);
+				GTK.gtk_tree_store_set (newModel, newItem, ID_COLUMN, -1, -1);
 			}
 			// recurse through children
 			copyModel(oldModel, oldStart, newModel, newStart, types, iter, newItem, modelLength);
@@ -666,11 +666,11 @@ void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int
 			} else {
 				OS.g_free (newItem);
 			}
-		} while (OS.gtk_tree_model_iter_next(oldModel, iter));
+		} while (GTK.gtk_tree_model_iter_next(oldModel, iter));
 		for (int i = 0; i < oldItems.length; i++) {
 			long /*int*/ oldItem = oldItems [i];
 			if (oldItem != 0) {
-				OS.gtk_tree_store_remove (oldModel, oldItem);
+				GTK.gtk_tree_store_remove (oldModel, oldItem);
 				OS.g_free (oldItem);
 			}
 		}
@@ -688,7 +688,7 @@ void createColumn (TreeColumn column, int index) {
 
 	int modelIndex = FIRST_COLUMN;
 	if (columnCount != 0) {
-		int modelLength = OS.gtk_tree_model_get_n_columns (modelHandle);
+		int modelLength = GTK.gtk_tree_model_get_n_columns (modelHandle);
 		boolean [] usedColumns = new boolean [modelLength];
 		for (int i=0; i<columnCount; i++) {
 			int columnIndex = columns [i].modelIndex;
@@ -703,14 +703,14 @@ void createColumn (TreeColumn column, int index) {
 		if (modelIndex == modelLength) {
 			long /*int*/ oldModel = modelHandle;
 			long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
-			long /*int*/ newModel = OS.gtk_tree_store_newv (types.length, types);
+			long /*int*/ newModel = GTK.gtk_tree_store_newv (types.length, types);
 			if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
 			copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, modelLength);
-			OS.gtk_tree_view_set_model (handle, newModel);
+			GTK.gtk_tree_view_set_model (handle, newModel);
 			setModel (newModel);
 		}
 	}
-	long /*int*/ columnHandle = OS.gtk_tree_view_column_new ();
+	long /*int*/ columnHandle = GTK.gtk_tree_view_column_new ();
 	if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	if (index == 0 && columnCount > 0) {
 		TreeColumn checkColumn = columns [0];
@@ -718,30 +718,30 @@ void createColumn (TreeColumn column, int index) {
 	}
 	createRenderers (columnHandle, modelIndex, index == 0, column == null ? 0 : column.style);
 	if ((style & SWT.VIRTUAL) == 0 && columnCount == 0) {
-		OS.gtk_tree_view_column_set_sizing (columnHandle, OS.GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+		GTK.gtk_tree_view_column_set_sizing (columnHandle, GTK.GTK_TREE_VIEW_COLUMN_GROW_ONLY);
 	} else {
-		OS.gtk_tree_view_column_set_sizing (columnHandle, OS.GTK_TREE_VIEW_COLUMN_FIXED);
+		GTK.gtk_tree_view_column_set_sizing (columnHandle, GTK.GTK_TREE_VIEW_COLUMN_FIXED);
 	}
-	OS.gtk_tree_view_column_set_resizable (columnHandle, true);
-	OS.gtk_tree_view_column_set_clickable (columnHandle, true);
-	OS.gtk_tree_view_column_set_min_width (columnHandle, 0);
-	OS.gtk_tree_view_insert_column (handle, columnHandle, index);
+	GTK.gtk_tree_view_column_set_resizable (columnHandle, true);
+	GTK.gtk_tree_view_column_set_clickable (columnHandle, true);
+	GTK.gtk_tree_view_column_set_min_width (columnHandle, 0);
+	GTK.gtk_tree_view_insert_column (handle, columnHandle, index);
 	/*
 	* Bug in GTK3.  The column header has the wrong CSS styling if it is hidden
 	* when inserting to the tree widget.  The fix is to hide the column only
 	* after it is inserted.
 	*/
-	if (columnCount != 0) OS.gtk_tree_view_column_set_visible (columnHandle, false);
+	if (columnCount != 0) GTK.gtk_tree_view_column_set_visible (columnHandle, false);
 	if (column != null) {
 		column.handle = columnHandle;
 		column.modelIndex = modelIndex;
 	}
 	if (!searchEnabled ()) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	} else {
 		/* Set the search column whenever the model changes */
 		int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex;
-		OS.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
+		GTK.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
 	}
 }
 
@@ -750,31 +750,31 @@ void createHandle (int index) {
 	state |= HANDLE;
 	fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
 	if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_widget_set_has_window (fixedHandle, true);
-	scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
+	GTK.gtk_widget_set_has_window (fixedHandle, true);
+	scrolledHandle = GTK.gtk_scrolled_window_new (0, 0);
 	if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
 	long /*int*/ [] types = getColumnTypes (1);
-	modelHandle = OS.gtk_tree_store_newv (types.length, types);
+	modelHandle = GTK.gtk_tree_store_newv (types.length, types);
 	if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	handle = OS.gtk_tree_view_new_with_model (modelHandle);
+	handle = GTK.gtk_tree_view_new_with_model (modelHandle);
 	if (handle == 0) error (SWT.ERROR_NO_HANDLES);
 	if ((style & SWT.CHECK) != 0) {
-		checkRenderer = OS.gtk_cell_renderer_toggle_new ();
+		checkRenderer = GTK.gtk_cell_renderer_toggle_new ();
 		if (checkRenderer == 0) error (SWT.ERROR_NO_HANDLES);
 		OS.g_object_ref (checkRenderer);
 	}
 	createColumn (null, 0);
-	OS.gtk_container_add (fixedHandle, scrolledHandle);
-	OS.gtk_container_add (scrolledHandle, handle);
-
-	int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
-	long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
-	OS.gtk_tree_selection_set_mode (selectionHandle, mode);
-	OS.gtk_tree_view_set_headers_visible (handle, false);
-	int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-	int vsp = (style & SWT.V_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-	OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
-	if ((style & SWT.BORDER) != 0) OS.gtk_scrolled_window_set_shadow_type (scrolledHandle, OS.GTK_SHADOW_ETCHED_IN);
+	GTK.gtk_container_add (fixedHandle, scrolledHandle);
+	GTK.gtk_container_add (scrolledHandle, handle);
+
+	int mode = (style & SWT.MULTI) != 0 ? GTK.GTK_SELECTION_MULTIPLE : GTK.GTK_SELECTION_BROWSE;
+	long /*int*/ selectionHandle = GTK.gtk_tree_view_get_selection (handle);
+	GTK.gtk_tree_selection_set_mode (selectionHandle, mode);
+	GTK.gtk_tree_view_set_headers_visible (handle, false);
+	int hsp = (style & SWT.H_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER;
+	int vsp = (style & SWT.V_SCROLL) != 0 ? GTK.GTK_POLICY_AUTOMATIC : GTK.GTK_POLICY_NEVER;
+	GTK.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
+	if ((style & SWT.BORDER) != 0) GTK.gtk_scrolled_window_set_shadow_type (scrolledHandle, GTK.GTK_SHADOW_ETCHED_IN);
 	/*
 	 * We enable fixed-height-mode for performance reasons (see bug 490203).
 	 */
@@ -782,7 +782,7 @@ void createHandle (int index) {
 		OS.g_object_set (handle, OS.fixed_height_mode, true, 0);
 	}
 	if (!searchEnabled ()) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	}
 }
 
@@ -799,9 +799,9 @@ void createItem (TreeColumn column, int index) {
 		column.style |= SWT.LEFT;
 	}
 	if (columnCount == 0) {
-		column.handle = OS.gtk_tree_view_get_column (handle, 0);
-		OS.gtk_tree_view_column_set_sizing (column.handle, OS.GTK_TREE_VIEW_COLUMN_FIXED);
-		OS.gtk_tree_view_column_set_visible (column.handle, false);
+		column.handle = GTK.gtk_tree_view_get_column (handle, 0);
+		GTK.gtk_tree_view_column_set_sizing (column.handle, GTK.GTK_TREE_VIEW_COLUMN_FIXED);
+		GTK.gtk_tree_view_column_set_visible (column.handle, false);
 		column.modelIndex = FIRST_COLUMN;
 		createRenderers (column.handle, column.modelIndex, true, column.style);
 		column.customDraw = firstCustomDraw;
@@ -809,29 +809,29 @@ void createItem (TreeColumn column, int index) {
 	} else {
 		createColumn (column, index);
 	}
-	long /*int*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 3);
+	long /*int*/ boxHandle = gtk_box_new (GTK.GTK_ORIENTATION_HORIZONTAL, false, 3);
 	if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
+	long /*int*/ labelHandle = GTK.gtk_label_new_with_mnemonic (null);
 	if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	long /*int*/ imageHandle = OS.gtk_image_new ();
+	long /*int*/ imageHandle = GTK.gtk_image_new ();
 	if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
-	OS.gtk_container_add (boxHandle, imageHandle);
-	OS.gtk_container_add (boxHandle, labelHandle);
-	OS.gtk_widget_show (boxHandle);
-	OS.gtk_widget_show (labelHandle);
+	GTK.gtk_container_add (boxHandle, imageHandle);
+	GTK.gtk_container_add (boxHandle, labelHandle);
+	GTK.gtk_widget_show (boxHandle);
+	GTK.gtk_widget_show (labelHandle);
 	column.labelHandle = labelHandle;
 	column.imageHandle = imageHandle;
-	OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
-	if (OS.GTK3) {
-		column.buttonHandle = OS.gtk_tree_view_column_get_button(column.handle);
+	GTK.gtk_tree_view_column_set_widget (column.handle, boxHandle);
+	if (GTK.GTK3) {
+		column.buttonHandle = GTK.gtk_tree_view_column_get_button(column.handle);
 	} else {
-		long /*int*/ widget = OS.gtk_widget_get_parent (boxHandle);
+		long /*int*/ widget = GTK.gtk_widget_get_parent (boxHandle);
 		while (widget != handle) {
-			if (OS.GTK_IS_BUTTON (widget)) {
+			if (GTK.GTK_IS_BUTTON (widget)) {
 				column.buttonHandle = widget;
 				break;
 			}
-			widget = OS.gtk_widget_get_parent (widget);
+			widget = GTK.gtk_widget_get_parent (widget);
 		}
 	}
 	if (columnCount == columns.length) {
@@ -870,19 +870,19 @@ void createItem (TreeColumn column, int index) {
 }
 
 void createItem (TreeItem item, long /*int*/ parentIter, int index) {
-	int count = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
+	int count = GTK.gtk_tree_model_iter_n_children (modelHandle, parentIter);
 	if (index == -1) index = count;
 	if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE);
-	item.handle = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	item.handle = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (item.handle == 0) error(SWT.ERROR_NO_HANDLES);
 	/*
 	* Feature in GTK.  It is much faster to append to a tree store
 	* than to insert at the end using gtk_tree_store_insert().
 	*/
 	if (index == count) {
-		OS.gtk_tree_store_append (modelHandle, item.handle, parentIter);
+		GTK.gtk_tree_store_append (modelHandle, item.handle, parentIter);
 	} else {
-		OS.gtk_tree_store_insert (modelHandle, item.handle, parentIter, index);
+		GTK.gtk_tree_store_insert (modelHandle, item.handle, parentIter, index);
 	}
 	int id = getId (item.handle, false);
 	items [id] = item;
@@ -890,24 +890,24 @@ void createItem (TreeItem item, long /*int*/ parentIter, int index) {
 }
 
 void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) {
-	OS.gtk_tree_view_column_clear (columnHandle);
+	GTK.gtk_tree_view_column_clear (columnHandle);
 	if ((style & SWT.CHECK) != 0 && check) {
-		OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-		OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.active, CHECKED_COLUMN);
-		OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.inconsistent, GRAYED_COLUMN);
-		if (!ownerDraw && !OS.GTK3) OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
-		if (!ownerDraw && OS.GTK3) OS.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
+		GTK.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
+		GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.active, CHECKED_COLUMN);
+		GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.inconsistent, GRAYED_COLUMN);
+		if (!ownerDraw && !GTK.GTK3) GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+		if (!ownerDraw && GTK.GTK3) GTK.gtk_tree_view_column_add_attribute (columnHandle, checkRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
 		if (ownerDraw) {
-			OS.gtk_tree_view_column_set_cell_data_func (columnHandle, checkRenderer, display.cellDataProc, handle, 0);
+			GTK.gtk_tree_view_column_set_cell_data_func (columnHandle, checkRenderer, display.cellDataProc, handle, 0);
 			OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
 		}
 	}
-	long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();
+	long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : GTK.gtk_cell_renderer_pixbuf_new ();
 	if (pixbufRenderer == 0) {
 		error (SWT.ERROR_NO_HANDLES);
 	} else {
 		// set default size this size is used for calculating the icon and text positions in a tree
-		if ((!ownerDraw) && (OS.GTK3)) {
+		if ((!ownerDraw) && (GTK.GTK3)) {
 			/*
 			 * When SWT.VIRTUAL is specified, size the pixbuf renderer
 			 * according to the size of the first image set. If no image
@@ -915,17 +915,17 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check,
 			 * styles. Fix for bug 480261.
 			 */
 			if ((style & SWT.VIRTUAL) != 0 && pixbufSizeSet)  {
-				OS.gtk_cell_renderer_set_fixed_size(pixbufRenderer, pixbufHeight, pixbufWidth);
+				GTK.gtk_cell_renderer_set_fixed_size(pixbufRenderer, pixbufHeight, pixbufWidth);
 			} else {
 				/*
 				 * For all other styles, set render size to 0x0 until we
 				 * actually add images, fix for bugs 469277 & 476419.
 				 */
-				OS.gtk_cell_renderer_set_fixed_size(pixbufRenderer, 0, 0);
+				GTK.gtk_cell_renderer_set_fixed_size(pixbufRenderer, 0, 0);
 			}
 		}
 	}
-	long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();
+	long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : GTK.gtk_cell_renderer_text_new ();
 	if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
 
 	if (ownerDraw) {
@@ -940,24 +940,24 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check,
 	* to be activatable.
 	*/
 	if ((style & SWT.CHECK) != 0 && check) {
-		OS.g_object_set (pixbufRenderer, OS.mode, OS.GTK_CELL_RENDERER_MODE_ACTIVATABLE, 0);
+		OS.g_object_set (pixbufRenderer, OS.mode, GTK.GTK_CELL_RENDERER_MODE_ACTIVATABLE, 0);
 	}
 
 	/* Set alignment */
 	if ((columnStyle & SWT.RIGHT) != 0) {
 		OS.g_object_set(textRenderer, OS.xalign, 1f, 0);
-		OS.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
-		OS.gtk_tree_view_column_pack_end (columnHandle, pixbufRenderer, false);
-		OS.gtk_tree_view_column_set_alignment (columnHandle, 1f);
+		GTK.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
+		GTK.gtk_tree_view_column_pack_end (columnHandle, pixbufRenderer, false);
+		GTK.gtk_tree_view_column_set_alignment (columnHandle, 1f);
 	} else if ((columnStyle & SWT.CENTER) != 0) {
 		OS.g_object_set(textRenderer, OS.xalign, 0.5f, 0);
-		OS.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
-		OS.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
-		OS.gtk_tree_view_column_set_alignment (columnHandle, 0.5f);
+		GTK.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
+		GTK.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
+		GTK.gtk_tree_view_column_set_alignment (columnHandle, 0.5f);
 	} else {
-		OS.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
-		OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
-		OS.gtk_tree_view_column_set_alignment (columnHandle, 0f);
+		GTK.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
+		GTK.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
+		GTK.gtk_tree_view_column_set_alignment (columnHandle, 0f);
 	}
 
 	/*
@@ -967,23 +967,23 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check,
 	 * no images. Fix for Bug 469277 & 476419. NOTE: this change has been ported to Tables since Tables/Trees both
 	 * use the same underlying GTK structure.
 	 */
-	OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.pixbuf, modelIndex + CELL_PIXBUF);
+	GTK.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.pixbuf, modelIndex + CELL_PIXBUF);
 	if (!ownerDraw) {
-		if (OS.GTK3) {
-			OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
-			OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
+		if (GTK.GTK3) {
+			GTK.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
+			GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_rgba, BACKGROUND_COLUMN);
 		} else {
-			OS.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
-			OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+			GTK.gtk_tree_view_column_add_attribute (columnHandle, pixbufRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
+			GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.cell_background_gdk, BACKGROUND_COLUMN);
 		}
 	}
-	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, modelIndex + CELL_TEXT);
-	if (OS.GTK3) {
-		OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_rgba, FOREGROUND_COLUMN);
+	GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, modelIndex + CELL_TEXT);
+	if (GTK.GTK3) {
+		GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_rgba, FOREGROUND_COLUMN);
 	} else {
-		OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_gdk, FOREGROUND_COLUMN);
+		GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.foreground_gdk, FOREGROUND_COLUMN);
 	}
-	OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.font_desc, FONT_COLUMN);
+	GTK.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.font_desc, FONT_COLUMN);
 
 	boolean customDraw = firstCustomDraw;
 	if (columnCount != 0) {
@@ -995,8 +995,8 @@ void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check,
 		}
 	}
 	if ((style & SWT.VIRTUAL) != 0 || customDraw || ownerDraw) {
-		OS.gtk_tree_view_column_set_cell_data_func (columnHandle, textRenderer, display.cellDataProc, handle, 0);
-		OS.gtk_tree_view_column_set_cell_data_func (columnHandle, pixbufRenderer, display.cellDataProc, handle, 0);
+		GTK.gtk_tree_view_column_set_cell_data_func (columnHandle, textRenderer, display.cellDataProc, handle, 0);
+		GTK.gtk_tree_view_column_set_cell_data_func (columnHandle, pixbufRenderer, display.cellDataProc, handle, 0);
 	}
 }
 
@@ -1008,7 +1008,7 @@ void createWidget (int index) {
 	columnCount = 0;
 	// In GTK 3 font description is inherited from parent widget which is not how SWT has always worked,
 	// reset to default font to get the usual behavior
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		setFontDescription(defaultFont().handle);
 	}
 }
@@ -1021,7 +1021,7 @@ GdkRGBA defaultBackground () {
 @Override
 void deregister () {
 	super.deregister ();
-	display.removeWidget (OS.gtk_tree_view_get_selection (handle));
+	display.removeWidget (GTK.gtk_tree_view_get_selection (handle));
 	if (checkRenderer != 0) display.removeWidget (checkRenderer);
 	display.removeWidget (modelHandle);
 }
@@ -1048,9 +1048,9 @@ public void deselect (TreeItem item) {
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_unselect_iter (selection, item.handle);
+	GTK.gtk_tree_selection_unselect_iter (selection, item.handle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
 }
@@ -1066,9 +1066,9 @@ public void deselect (TreeItem item) {
 public void deselectAll() {
 	checkWidget();
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_unselect_all (selection);
+	GTK.gtk_tree_selection_unselect_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
 }
@@ -1086,14 +1086,14 @@ void destroyItem (TreeColumn column) {
 	}
 	System.arraycopy (columns, index + 1, columns, index, --columnCount - index);
 	columns [columnCount] = null;
-	OS.gtk_tree_view_remove_column (handle, columnHandle);
+	GTK.gtk_tree_view_remove_column (handle, columnHandle);
 	if (columnCount == 0) {
 		long /*int*/ oldModel = modelHandle;
 		long /*int*/[] types = getColumnTypes (1);
-		long /*int*/ newModel = OS.gtk_tree_store_newv (types.length, types);
+		long /*int*/ newModel = GTK.gtk_tree_store_newv (types.length, types);
 		if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
 		copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, FIRST_COLUMN + CELL_TYPES);
-		OS.gtk_tree_view_set_model (handle, newModel);
+		GTK.gtk_tree_view_set_model (handle, newModel);
 		setModel (newModel);
 		createColumn (null, 0);
 	} else {
@@ -1102,11 +1102,11 @@ void destroyItem (TreeColumn column) {
 			if (item != null) {
 				long /*int*/ iter = item.handle;
 				int modelIndex = column.modelIndex;
-				OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long /*int*/)0, -1);
-				OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long /*int*/)0, -1);
-				OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long /*int*/)0, -1);
-				OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long /*int*/)0, -1);
-				OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long /*int*/)0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long /*int*/)0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long /*int*/)0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long /*int*/)0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long /*int*/)0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long /*int*/)0, -1);
 
 				Font [] cellFont = item.cellFont;
 				if (cellFont != null) {
@@ -1130,19 +1130,19 @@ void destroyItem (TreeColumn column) {
 		}
 	}
 	if (!searchEnabled ()) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	} else {
 		/* Set the search column whenever the model changes */
 		int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex;
-		OS.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
+		GTK.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
 	}
 }
 
 
 void destroyItem (TreeItem item) {
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_store_remove (modelHandle, item.handle);
+	GTK.gtk_tree_store_remove (modelHandle, item.handle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	modelChanged = true;
 }
@@ -1153,11 +1153,11 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 	if (OS.isX11()) { // Wayland
 		if (filter) {
 			long /*int*/ [] path = new long /*int*/ [1];
-			if (OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, x, y, path, null, null, null)) {
 				if (path [0] != 0) {
-					long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-					if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
-					OS.gtk_tree_path_free (path [0]);
+					long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+					if (GTK.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
+					GTK.gtk_tree_path_free (path [0]);
 				}
 			} else {
 				return false;
@@ -1170,11 +1170,11 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
 		double [] startX = new double[1];
 		double [] startY = new double [1];
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_gesture_drag_get_start_point(dragGesture, startX, startY)) {
+		if (GTK.gtk_gesture_drag_get_start_point(dragGesture, startX, startY)) {
 			if (getHeaderVisible()) {
 				startY[0]-= getHeaderHeightInPixels();
 			}
-			if (OS.gtk_tree_view_get_path_at_pos (handle, (int) startX[0], (int) startY[0], path, null, null, null)) {
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, (int) startX[0], (int) startY[0], path, null, null, null)) {
 				if (path [0] != 0) {
 					boolean dragDetect = super.dragDetect (x, y, filter, false, consume);
 					if (dragDetect && selected && consume != null) consume [0] = true;
@@ -1223,7 +1223,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
 
 @Override
 GdkColor getBackgroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getBaseGdkColor ();
 }
 
@@ -1231,20 +1231,20 @@ GdkColor getBackgroundGdkColor () {
 Rectangle getClientAreaInPixels () {
 	checkWidget ();
 	forceResize ();
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	long /*int*/ fixedWindow = gtk_widget_get_window (fixedHandle);
-	long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);
+	long /*int*/ binWindow = GTK.gtk_tree_view_get_bin_window (handle);
 	int [] binX = new int [1], binY = new int [1];
 	OS.gdk_window_get_origin (binWindow, binX, binY);
 	int [] fixedX = new int [1], fixedY = new int [1];
 	OS.gdk_window_get_origin (fixedWindow, fixedX, fixedY);
 	long /*int*/ clientHandle = clientHandle ();
 	GtkAllocation allocation = new GtkAllocation ();
-	OS.gtk_widget_get_allocation (clientHandle, allocation);
+	GTK.gtk_widget_get_allocation (clientHandle, allocation);
 	int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
 	int height = (state & ZERO_HEIGHT) != 0 ? 0 : allocation.height;
 	Rectangle rect = new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-	if (getHeaderVisible() && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (getHeaderVisible() && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		rect.y += getHeaderHeightInPixels();
 	}
 	return rect;
@@ -1253,8 +1253,8 @@ Rectangle getClientAreaInPixels () {
 @Override
 int getClientWidth () {
 	int [] w = new int [1], h = new int [1];
-	OS.gtk_widget_realize (handle);
-	gdk_window_get_size(OS.gtk_tree_view_get_bin_window(handle), w, h);
+	GTK.gtk_widget_realize (handle);
+	gdk_window_get_size(GTK.gtk_tree_view_get_bin_window(handle), w, h);
 	return w[0];
 }
 
@@ -1345,7 +1345,7 @@ public int getColumnCount () {
 public int [] getColumnOrder () {
 	checkWidget ();
 	if (columnCount == 0) return new int [0];
-	long /*int*/ list = OS.gtk_tree_view_get_columns (handle);
+	long /*int*/ list = GTK.gtk_tree_view_get_columns (handle);
 	if (list == 0) return new int [0];
 	int  i = 0, count = OS.g_list_length (list);
 	int [] order = new int [count];
@@ -1372,15 +1372,15 @@ long /*int*/[] getColumnTypes (int columnCount) {
 	types [ID_COLUMN] = OS.G_TYPE_INT ();
 	types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
 	types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-	types [FOREGROUND_COLUMN] = OS.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
-	types [BACKGROUND_COLUMN] = OS.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
+	types [FOREGROUND_COLUMN] = GTK.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
+	types [BACKGROUND_COLUMN] = GTK.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
 	types [FONT_COLUMN] = OS.PANGO_TYPE_FONT_DESCRIPTION ();
 	// per cell data
 	for (int i=FIRST_COLUMN; i<types.length; i+=CELL_TYPES) {
 		types [i + CELL_PIXBUF] = OS.GDK_TYPE_PIXBUF ();
 		types [i + CELL_TEXT] = OS.G_TYPE_STRING ();
-		types [i + CELL_FOREGROUND] = OS.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
-		types [i + CELL_BACKGROUND] = OS.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
+		types [i + CELL_FOREGROUND] = GTK.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
+		types [i + CELL_BACKGROUND] = GTK.GTK3? OS.GDK_TYPE_RGBA() : OS.GDK_TYPE_COLOR ();
 		types [i + CELL_FONT] = OS.PANGO_TYPE_FONT_DESCRIPTION ();
 	}
 	return types;
@@ -1424,7 +1424,7 @@ public TreeColumn [] getColumns () {
 
 @Override
 GdkRGBA getContextBackgroundGdkRGBA () {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	if (background != null) {
 		return background;
 	} else {
@@ -1436,7 +1436,7 @@ GdkRGBA getContextBackgroundGdkRGBA () {
 
 @Override
 GdkRGBA getContextColorGdkRGBA () {
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
 		if (foreground != null) {
 			return foreground;
 		} else {
@@ -1449,23 +1449,23 @@ GdkRGBA getContextColorGdkRGBA () {
 
 TreeItem getFocusItem () {
 	long /*int*/ [] path = new long /*int*/ [1];
-	OS.gtk_tree_view_get_cursor (handle, path, null);
+	GTK.gtk_tree_view_get_cursor (handle, path, null);
 	if (path [0] == 0) return null;
 	TreeItem item = null;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	if (GTK.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
 		int [] index = new int [1];
-		OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
+		GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
 		if (index [0] != -1) item = items [index [0]]; //TODO should we be creating this item when index is -1?
 	}
 	OS.g_free (iter);
-	OS.gtk_tree_path_free (path [0]);
+	GTK.gtk_tree_path_free (path [0]);
 	return item;
 }
 
 @Override
 GdkColor getForegroundGdkColor () {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	return getTextColor ();
 }
 
@@ -1542,7 +1542,7 @@ public int getHeaderHeight () {
 
 int getHeaderHeightInPixels () {
 	checkWidget ();
-	if (!OS.gtk_tree_view_get_headers_visible (handle)) return 0;
+	if (!GTK.gtk_tree_view_get_headers_visible (handle)) return 0;
 	if (columnCount > 0) {
 		GtkRequisition requisition = new GtkRequisition ();
 		int height = 0;
@@ -1555,9 +1555,9 @@ int getHeaderHeightInPixels () {
 		}
 		return height;
 	}
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	long /*int*/ fixedWindow = gtk_widget_get_window (fixedHandle);
-	long /*int*/ binWindow = OS.gtk_tree_view_get_bin_window (handle);
+	long /*int*/ binWindow = GTK.gtk_tree_view_get_bin_window (handle);
 	int [] binY = new int [1];
 	OS.gdk_window_get_origin (binWindow, null, binY);
 	int [] fixedY = new int [1];
@@ -1586,7 +1586,7 @@ int getHeaderHeightInPixels () {
  */
 public boolean getHeaderVisible () {
 	checkWidget();
-	return OS.gtk_tree_view_get_headers_visible (handle);
+	return GTK.gtk_tree_view_get_headers_visible (handle);
 }
 
 /**
@@ -1608,7 +1608,7 @@ public boolean getHeaderVisible () {
  */
 public TreeItem getItem (int index) {
 	checkWidget();
-	if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0)))  {
+	if (!(0 <= index && index < GTK.gtk_tree_model_iter_n_children (modelHandle, 0)))  {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
 	return _getItem (0, index);
@@ -1646,23 +1646,23 @@ TreeItem getItemInPixels (Point point) {
 	checkWidget ();
 	if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
 	long /*int*/ [] path = new long /*int*/ [1];
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	int x = point.x;
 	int y = point.y;
-	if (getHeaderVisible() && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (getHeaderVisible() && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		y -= getHeaderHeightInPixels();
 	}
 	if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - x;
 	long /*int*/ [] columnHandle = new long /*int*/ [1];
-	if (!OS.gtk_tree_view_get_path_at_pos (handle, x, y, path, columnHandle, null, null)) return null;
+	if (!GTK.gtk_tree_view_get_path_at_pos (handle, x, y, path, columnHandle, null, null)) return null;
 	if (path [0] == 0) return null;
 	TreeItem item = null;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	if (GTK.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
 		boolean overExpander = false;
-		if (OS.gtk_tree_view_get_expander_column (handle) == columnHandle [0]) {
+		if (GTK.gtk_tree_view_get_expander_column (handle) == columnHandle [0]) {
 			GdkRectangle rect = new GdkRectangle ();
-			OS.gtk_tree_view_get_cell_area (handle, path [0], columnHandle [0], rect);
+			GTK.gtk_tree_view_get_cell_area (handle, path [0], columnHandle [0], rect);
 			if ((style & SWT.MIRRORED) != 0) {
 				overExpander = x > rect.x + rect.width;
 			} else {
@@ -1674,7 +1674,7 @@ TreeItem getItemInPixels (Point point) {
 		}
 	}
 	OS.g_free (iter);
-	OS.gtk_tree_path_free (path [0]);
+	GTK.gtk_tree_path_free (path [0]);
 	return item;
 }
 
@@ -1693,7 +1693,7 @@ TreeItem getItemInPixels (Point point) {
  */
 public int getItemCount () {
 	checkWidget ();
-	return OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	return GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 }
 
 /**
@@ -1714,30 +1714,30 @@ public int getItemHeight () {
 
 int getItemHeightInPixels () {
 	checkWidget ();
-	int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+	int itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 	if (itemCount == 0) {
-		long /*int*/ column = OS.gtk_tree_view_get_column (handle, 0);
+		long /*int*/ column = GTK.gtk_tree_view_get_column (handle, 0);
 		int [] w = new int [1], h = new int [1];
 		ignoreSize = true;
-		OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
+		GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
 		int height = h [0];
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			long /*int*/ textRenderer = getTextRenderer (column);
-			OS.gtk_cell_renderer_get_preferred_height_for_width (textRenderer, handle, 0, h, null);
+			GTK.gtk_cell_renderer_get_preferred_height_for_width (textRenderer, handle, 0, h, null);
 			height += h [0];
 		}
 		ignoreSize = false;
 		return height;
 	} else {
 		int height = 0;
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		OS.gtk_tree_model_get_iter_first (modelHandle, iter);
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		GTK.gtk_tree_model_get_iter_first (modelHandle, iter);
 		int columnCount = Math.max (1, this.columnCount);
 		for (int i=0; i<columnCount; i++) {
-			long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);
-			OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
+			long /*int*/ column = GTK.gtk_tree_view_get_column (handle, i);
+			GTK.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
 			int [] w = new int [1], h = new int [1];
-			OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
+			GTK.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
 			height = Math.max (height, h [0]);
 		}
 		OS.g_free (iter);
@@ -1768,7 +1768,7 @@ public TreeItem [] getItems () {
 }
 
 TreeItem [] getItems (long /*int*/ parent) {
-	int length = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
+	int length = GTK.gtk_tree_model_iter_n_children (modelHandle, parent);
 	TreeItem[] result = new TreeItem [length];
 	if (length == 0) return result;
 	if ((style & SWT.VIRTUAL) != 0) {
@@ -1778,12 +1778,12 @@ TreeItem [] getItems (long /*int*/ parent) {
 	} else {
 		int i = 0;
 		int[] index = new int [1];
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parent);
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		boolean valid = GTK.gtk_tree_model_iter_children (modelHandle, iter, parent);
 		while (valid) {
-			OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
+			GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
 			result [i++] = items [index [0]];
-			valid = OS.gtk_tree_model_iter_next (modelHandle, iter);
+			valid = GTK.gtk_tree_model_iter_next (modelHandle, iter);
 		}
 		OS.g_free (iter);
 	}
@@ -1812,10 +1812,10 @@ TreeItem [] getItems (long /*int*/ parent) {
  */
 public boolean getLinesVisible() {
 	checkWidget();
-	if (OS.GTK3) {
-		return OS.gtk_tree_view_get_grid_lines(handle) > OS.GTK_TREE_VIEW_GRID_LINES_NONE;
+	if (GTK.GTK3) {
+		return GTK.gtk_tree_view_get_grid_lines(handle) > GTK.GTK_TREE_VIEW_GRID_LINES_NONE;
 	} else  {
-		return OS.gtk_tree_view_get_rules_hint (handle);
+		return GTK.gtk_tree_view_get_rules_hint (handle);
 	}
 }
 
@@ -1837,13 +1837,13 @@ public TreeItem getParentItem () {
 }
 
 long /*int*/ getPixbufRenderer (long /*int*/ column) {
-	long /*int*/ list = OS.gtk_cell_layout_get_cells(column);
+	long /*int*/ list = GTK.gtk_cell_layout_get_cells(column);
 	if (list == 0) return 0;
 	long /*int*/ originalList = list;
 	long /*int*/ pixbufRenderer = 0;
 	while (list != 0) {
 		long /*int*/ renderer = OS.g_list_data (list);
-		if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
+		if (GTK.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
 			pixbufRenderer = renderer;
 			break;
 		}
@@ -1871,8 +1871,8 @@ long /*int*/ getPixbufRenderer (long /*int*/ column) {
  */
 public TreeItem[] getSelection () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows (selection, null);
 	if (list != 0) {
 		long /*int*/ originalList = list;
 		int count = OS.g_list_length (list);
@@ -1880,14 +1880,14 @@ public TreeItem[] getSelection () {
 		int length = 0;
 		for (int i=0; i<count; i++) {
 			long /*int*/ data = OS.g_list_data (list);
-			long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-			if (OS.gtk_tree_model_get_iter (modelHandle, iter, data)) {
+			long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+			if (GTK.gtk_tree_model_get_iter (modelHandle, iter, data)) {
 				treeSelection [length] = _getItem (iter);
 				length++;
 			}
 			list = OS.g_list_next (list);
 			OS.g_free (iter);
-			OS.gtk_tree_path_free (data);
+			GTK.gtk_tree_path_free (data);
 		}
 		OS.g_list_free (originalList);
 		if (length < count) {
@@ -1912,8 +1912,8 @@ public TreeItem[] getSelection () {
  */
 public int getSelectionCount () {
 	checkWidget();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	return OS.gtk_tree_selection_count_selected_rows (selection);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	return GTK.gtk_tree_selection_count_selected_rows (selection);
 }
 
 /**
@@ -1959,13 +1959,13 @@ public int getSortDirection () {
 }
 
 long /*int*/ getTextRenderer (long /*int*/ column) {
-	long /*int*/ list = OS.gtk_cell_layout_get_cells(column);
+	long /*int*/ list = GTK.gtk_cell_layout_get_cells(column);
 	if (list == 0) return 0;
 	long /*int*/ originalList = list;
 	long /*int*/ textRenderer = 0;
 	while (list != 0) {
 		long /*int*/ renderer = OS.g_list_data (list);
-		if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
+		if (GTK.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
 			textRenderer = renderer;
 			break;
 		}
@@ -1997,13 +1997,13 @@ public TreeItem getTopItem () {
 	 * using the UI. Otherwise, fetch topItem using GtkTreeView API.
 	 */
 	long /*int*/ vAdjustment;
-	if (OS.GTK3) {
-		vAdjustment = OS.gtk_scrollable_get_vadjustment(handle);
+	if (GTK.GTK3) {
+		vAdjustment = GTK.gtk_scrollable_get_vadjustment(handle);
 	}
 	else {
-		vAdjustment = OS.gtk_tree_view_get_vadjustment(handle);
+		vAdjustment = GTK.gtk_tree_view_get_vadjustment(handle);
 	}
-	currentAdjustment = OS._gtk_adjustment_get_value(vAdjustment);
+	currentAdjustment = GTK._gtk_adjustment_get_value(vAdjustment);
 	TreeItem item = null;
 	if (cachedAdjustment == currentAdjustment) {
 		item = _getCachedTopItem();
@@ -2017,16 +2017,16 @@ public TreeItem getTopItem () {
 	}
 	// Use GTK method to get topItem if there has been changes to the vAdjustment
 	long /*int*/ [] path = new long /*int*/ [1];
-	OS.gtk_widget_realize (handle);
-	if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return null;
+	GTK.gtk_widget_realize (handle);
+	if (!GTK.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return null;
 	if (path [0] == 0) return null;
 	item = null;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());
-	if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof());
+	if (GTK.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
 		item = _getItem (iter);
 	}
 	OS.g_free (iter);
-	OS.gtk_tree_path_free (path [0]);
+	GTK.gtk_tree_path_free (path [0]);
 	topItem = item;
 	return item;
 }
@@ -2037,17 +2037,17 @@ TreeItem _getCachedTopItem() {
 	 *  in sync with the GTK view. If not, the real top item should be the last selected item, which is caused
 	 *  by setSelection().
 	 */
-	long /*int*/ treeSelect = OS.gtk_tree_view_get_selection(handle);
-	long /*int*/ list = OS.gtk_tree_selection_get_selected_rows(treeSelect, null);
+	long /*int*/ treeSelect = GTK.gtk_tree_view_get_selection(handle);
+	long /*int*/ list = GTK.gtk_tree_selection_get_selected_rows(treeSelect, null);
 	TreeItem treeSelection = null;
 	if (list != 0) {
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 		long /*int*/ data = OS.g_list_data (list);
-		if (OS.gtk_tree_model_get_iter (modelHandle, iter, data)) {
+		if (GTK.gtk_tree_model_get_iter (modelHandle, iter, data)) {
 			 treeSelection = _getItem (iter);
 		}
 		OS.g_free (iter);
-		OS.gtk_tree_path_free (data);
+		GTK.gtk_tree_path_free (data);
 		if (topItem == treeSelection) {
 			return topItem;
 		}
@@ -2058,8 +2058,8 @@ TreeItem _getCachedTopItem() {
 		if (topItem == null) {
 			// if topItem isn't set and there is nothing selected, topItem is the first item on the Tree
 			TreeItem item = null;
-			long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());
-			if (OS.gtk_tree_model_get_iter_first (modelHandle, iter)) {
+			long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof());
+			if (GTK.gtk_tree_model_get_iter_first (modelHandle, iter)) {
 				item = _getItem (iter);
 			}
 			OS.g_free (iter);
@@ -2074,7 +2074,7 @@ TreeItem _getCachedTopItem() {
 long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-	if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
+	if (gdkEvent.window != GTK.gtk_tree_view_get_bin_window (handle)) return 0;
 	long /*int*/ result = super.gtk_button_press_event (widget, event);
 	if (result != 0) return result;
 	/*
@@ -2089,12 +2089,12 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 		long /*int*/ nextEvent = OS.gdk_event_peek ();
 		if (nextEvent == 0) {
 			long /*int*/ [] path = new long /*int*/ [1];
-			long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-			if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
+			long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+			if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
 					path[0] != 0) {
 				//  selection count is used in the case of clicking an already selected item while holding Control
 				selectionCountOnPress = getSelectionCount();
-				if (OS.gtk_tree_selection_path_is_selected (selection, path[0])) {
+				if (GTK.gtk_tree_selection_path_is_selected (selection, path[0])) {
 					if (((gdkEvent.state & (OS.GDK_CONTROL_MASK|OS.GDK_SHIFT_MASK)) == 0) ||
 							((gdkEvent.state & OS.GDK_CONTROL_MASK) != 0)) {
 						/**
@@ -2104,8 +2104,8 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 						 * E.g to reproduce: Open DNDExample, select "Tree", select multiple items, try dragging.
 						 *   without line below, only one item is selected for drag.
 						 */
-						long /*int*/ gtk_false_funcPtr = OS.GET_FUNCTION_POINTER_gtk_false();
-						OS.gtk_tree_selection_set_select_function(selection, gtk_false_funcPtr, 0, 0);
+						long /*int*/ gtk_false_funcPtr = GTK.GET_FUNCTION_POINTER_gtk_false();
+						GTK.gtk_tree_selection_set_select_function(selection, gtk_false_funcPtr, 0, 0);
 					}
 				}
 			}
@@ -2124,11 +2124,11 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	int button = gdkEvent.button;
 	if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-				if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
-				OS.gtk_tree_path_free (path [0]);
+				long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+				if (GTK.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
+				GTK.gtk_tree_path_free (path [0]);
 			}
 		}
 	}
@@ -2142,13 +2142,13 @@ long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
 	*/
 	if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
 		long /*int*/ [] path = new long /*int*/ [1];
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
 			if (path [0] != 0) {
-				long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+				long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 				OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
+				GTK.gtk_tree_view_set_cursor (handle, path [0], 0, false);
 				OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-				OS.gtk_tree_path_free (path [0]);
+				GTK.gtk_tree_path_free (path [0]);
 			}
 		}
 	}
@@ -2209,7 +2209,7 @@ void sendTreeDefaultSelection() {
 long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
 	GdkEventButton gdkEvent = new GdkEventButton ();
 	OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-	if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
+	if (gdkEvent.window != GTK.gtk_tree_view_get_bin_window (handle)) return 0;
 	/*
 	 * Feature in GTK. In multi-select tree view there is a problem with using DnD operations while also selecting multiple items.
 	 * When doing a DnD, GTK de-selects all other items except for the widget being dragged from. By disabling the selection function
@@ -2219,19 +2219,19 @@ long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event)
 	 */
 	if ((state & DRAG_DETECT) != 0 && hooks (SWT.DragDetect) && !OS.isX11()) { //Wayland
 		long /*int*/ [] path = new long /*int*/ [1];
-		long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+		long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 		// free up the selection function on release.
-		OS.gtk_tree_selection_set_select_function(selection,0,0,0);
-		if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
-				path[0] != 0 && OS.gtk_tree_selection_path_is_selected (selection, path[0])) {
+		GTK.gtk_tree_selection_set_select_function(selection,0,0,0);
+		if (GTK.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null) &&
+				path[0] != 0 && GTK.gtk_tree_selection_path_is_selected (selection, path[0])) {
 			selectionCountOnRelease = getSelectionCount();
 			if ((gdkEvent.state & (OS.GDK_CONTROL_MASK|OS.GDK_SHIFT_MASK)) == 0) {
-				OS.gtk_tree_view_set_cursor(handle, path[0], 0,  false);
+				GTK.gtk_tree_view_set_cursor(handle, path[0], 0,  false);
 			}
 			 // Check to see if there has been a new tree item selected when holding Control in Path.
 			 // If not, deselect the item.
 			if ((gdkEvent.state & OS.GDK_CONTROL_MASK) != 0 && selectionCountOnRelease == selectionCountOnPress) {
-				OS.gtk_tree_selection_unselect_path (selection,path[0]);
+				GTK.gtk_tree_selection_unselect_path (selection,path[0]);
 			}
 		}
 	}
@@ -2260,7 +2260,7 @@ long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
 			* The fix is to detect this case in 'event_after' and send the
 			* expose event.
 			*/
-			if (OS.gtk_tree_model_iter_n_children (modelHandle, 0) == 0) {
+			if (GTK.gtk_tree_model_iter_n_children (modelHandle, 0) == 0) {
 				gtk_expose_event (widget, gdkEvent);
 			}
 			break;
@@ -2280,7 +2280,7 @@ void drawInheritedBackground (long /*int*/ eventPtr, long /*int*/ cairo) {
 	if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
 		Control control = findBackgroundControl ();
 		if (control != null) {
-			long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle);
+			long /*int*/ window = GTK.gtk_tree_view_get_bin_window (handle);
 			long /*int*/ rgn = 0;
 			if (eventPtr != 0) {
 				GdkEventExpose gdkEvent = new GdkEventExpose ();
@@ -2291,17 +2291,17 @@ void drawInheritedBackground (long /*int*/ eventPtr, long /*int*/ cairo) {
 			int [] width = new int [1], height = new int [1];
 			gdk_window_get_size (window, width, height);
 			long /*int*/ parent = 0;
-			int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
+			int itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, parent);
 			GdkRectangle rect = new GdkRectangle ();
 			boolean expanded = true;
 			while (itemCount != 0 && expanded && height [0] > (rect.y + rect.height)) {
-				long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-				OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parent, itemCount - 1);
-				itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, iter);
-				long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-				OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
-				expanded = OS.gtk_tree_view_row_expanded (handle, path);
-				OS.gtk_tree_path_free (path);
+				long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+				GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, parent, itemCount - 1);
+				itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, iter);
+				long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+				GTK.gtk_tree_view_get_cell_area (handle, path, 0, rect);
+				expanded = GTK.gtk_tree_view_row_expanded (handle, path);
+				GTK.gtk_tree_path_free (path);
 				if (parent != 0) OS.g_free (parent);
 				parent = iter;
 			}
@@ -2330,7 +2330,7 @@ long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
 @Override
 long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
 	long /*int*/ window = OS.GDK_EVENT_WINDOW (event);
-	if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
+	if (window != GTK.gtk_tree_view_get_bin_window (handle)) return 0;
 	return super.gtk_motion_notify_event (widget, event);
 }
 
@@ -2353,14 +2353,14 @@ long /*int*/ gtk_row_has_child_toggled (long /*int*/ model, long /*int*/ path, l
 	* gotten the first child row or lost its last child row.
 	*/
 	int [] index = new int [1];
-	OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
+	GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
 	if (index [0] >= items.length) return 0;
 	TreeItem item = items [index [0]];
 	if (item == null) return 0;
-	int childCount = OS.gtk_tree_model_iter_n_children (modelHandle, item.handle);
+	int childCount = GTK.gtk_tree_model_iter_n_children (modelHandle, item.handle);
 	if (childCount != 0 && item.isExpanded) {
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
-		OS.gtk_tree_view_expand_row (handle, path, false);
+		GTK.gtk_tree_view_expand_row (handle, path, false);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
 	}
 	return 0;
@@ -2386,7 +2386,7 @@ long /*int*/ gtk_start_interactive_search(long /*int*/ widget) {
 @Override
 long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {
 	int [] index = new int [1];
-	OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
+	GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
 	TreeItem item = items [index [0]];
 	Event event = new Event ();
 	event.item = item;
@@ -2399,7 +2399,7 @@ long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /
 	* to run.  The fix is to block the animation if the row is already
 	* collapsed.
 	*/
-	boolean changed = modelChanged || !OS.gtk_tree_view_row_expanded (handle, path);
+	boolean changed = modelChanged || !GTK.gtk_tree_view_row_expanded (handle, path);
 	modelChanged = oldModelChanged;
 	if (isDisposed () || item.isDisposed ()) return 1;
 	item.isExpanded = false;
@@ -2416,7 +2416,7 @@ long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /
 	*/
 	if (changed) {
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
-		OS.gtk_tree_view_collapse_row (handle, path);
+		GTK.gtk_tree_view_collapse_row (handle, path);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
 		return 1;
 	}
@@ -2426,7 +2426,7 @@ long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /
 @Override
 long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {
 	int [] index = new int [1];
-	OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
+	GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
 	TreeItem item = items [index [0]];
 	Event event = new Event ();
 	event.item = item;
@@ -2439,7 +2439,7 @@ long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*i
 	* to run.  The fix is to block the animation if the row is already
 	* expanded.
 	*/
-	boolean changed = modelChanged || OS.gtk_tree_view_row_expanded (handle, path);
+	boolean changed = modelChanged || GTK.gtk_tree_view_row_expanded (handle, path);
 	modelChanged = oldModelChanged;
 	if (isDisposed () || item.isDisposed ()) return 1;
 	item.isExpanded = true;
@@ -2460,7 +2460,7 @@ long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*i
 	*/
 	if (changed || expandAll) {
 		OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
-		OS.gtk_tree_view_expand_row (handle, path, false);
+		GTK.gtk_tree_view_expand_row (handle, path, false);
 		OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
 		return 1;
 	}
@@ -2469,15 +2469,15 @@ long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*i
 
 @Override
 long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {
-	long /*int*/ path = OS.gtk_tree_path_new_from_string (pathStr);
+	long /*int*/ path = GTK.gtk_tree_path_new_from_string (pathStr);
 	if (path == 0) return 0;
 	TreeItem item = null;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());
-	if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof());
+	if (GTK.gtk_tree_model_get_iter (modelHandle, iter, path)) {
 		item = _getItem (iter);
 	}
 	OS.g_free (iter);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	if (item != null) {
 		item.setChecked (!item.getChecked ());
 		Event event = new Event ();
@@ -2500,11 +2500,11 @@ void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {
 		super.gtk_widget_size_request (widget, requisition);
 		return;
 	}
-	long /*int*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;
+	long /*int*/ columns = GTK.gtk_tree_view_get_columns (handle), list = columns;
 	boolean fixVisible = columns != 0;
 	while (list != 0) {
 		long /*int*/ column = OS.g_list_data (list);
-		if (OS.gtk_tree_view_column_get_visible (column)) {
+		if (GTK.gtk_tree_view_column_get_visible (column)) {
 			fixVisible = false;
 			break;
 		}
@@ -2513,24 +2513,24 @@ void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {
 	long /*int*/ columnHandle = 0;
 	if (fixVisible) {
 		columnHandle = OS.g_list_data (columns);
-		OS.gtk_tree_view_column_set_visible (columnHandle, true);
+		GTK.gtk_tree_view_column_set_visible (columnHandle, true);
 	}
 	super.gtk_widget_size_request (widget, requisition);
 	if (fixVisible) {
-		OS.gtk_tree_view_column_set_visible (columnHandle, false);
+		GTK.gtk_tree_view_column_set_visible (columnHandle, false);
 	}
 	if (columns != 0) OS.g_list_free (columns);
 }
 
 void hideFirstColumn () {
-	long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
-	OS.gtk_tree_view_column_set_visible (firstColumn, false);
+	long /*int*/ firstColumn = GTK.gtk_tree_view_get_column (handle, 0);
+	GTK.gtk_tree_view_column_set_visible (firstColumn, false);
 }
 
 @Override
 void hookEvents () {
 	super.hookEvents ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection(handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection(handle);
 	OS.g_signal_connect_closure (selection, OS.changed, display.getClosure (CHANGED), false);
 	OS.g_signal_connect_closure (handle, OS.row_activated, display.getClosure (ROW_ACTIVATED), false);
 	OS.g_signal_connect_closure (handle, OS.test_expand_row, display.getClosure (TEST_EXPAND_ROW), false);
@@ -2600,17 +2600,17 @@ public int indexOf (TreeItem item) {
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
 	int index = -1;
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
-	int depth = OS.gtk_tree_path_get_depth (path);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, item.handle);
+	int depth = GTK.gtk_tree_path_get_depth (path);
 	if (depth == 1) {
-		long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
+		long /*int*/ indices = GTK.gtk_tree_path_get_indices (path);
 		if (indices != 0) {
 			int[] temp = new int[1];
 			C.memmove (temp, indices, 4);
 			index = temp[0];
 		}
 	}
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	return index;
 }
 
@@ -2634,26 +2634,26 @@ boolean mnemonicMatch (char key) {
 
 @Override
 long /*int*/ paintWindow () {
-	OS.gtk_widget_realize (handle);
-	if (fixedHandle != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
-		OS.gtk_widget_realize (fixedHandle);
-		return OS.gtk_widget_get_window(fixedHandle);
+	GTK.gtk_widget_realize (handle);
+	if (fixedHandle != 0 && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+		GTK.gtk_widget_realize (fixedHandle);
+		return GTK.gtk_widget_get_window(fixedHandle);
 	}
-	return OS.gtk_tree_view_get_bin_window (handle);
+	return GTK.gtk_tree_view_get_bin_window (handle);
 }
 
 void recreateRenderers () {
 	if (checkRenderer != 0) {
 		display.removeWidget (checkRenderer);
 		OS.g_object_unref (checkRenderer);
-		checkRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_toggle_get_type(), 0) : OS.gtk_cell_renderer_toggle_new ();
+		checkRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_toggle_get_type(), 0) : GTK.gtk_cell_renderer_toggle_new ();
 		if (checkRenderer == 0) error (SWT.ERROR_NO_HANDLES);
 		OS.g_object_ref (checkRenderer);
 		display.addWidget (checkRenderer, this);
 		OS.g_signal_connect_closure (checkRenderer, OS.toggled, display.getClosure (TOGGLED), false);
 	}
 	if (columnCount == 0) {
-		createRenderers (OS.gtk_tree_view_get_column (handle, 0), Tree.FIRST_COLUMN, true, 0);
+		createRenderers (GTK.gtk_tree_view_get_column (handle, 0), Tree.FIRST_COLUMN, true, 0);
 	} else {
 		for (int i = 0; i < columnCount; i++) {
 			TreeColumn column = columns [i];
@@ -2673,14 +2673,14 @@ void redrawBackgroundImage () {
 @Override
 void register () {
 	super.register ();
-	display.addWidget (OS.gtk_tree_view_get_selection (handle), this);
+	display.addWidget (GTK.gtk_tree_view_get_selection (handle), this);
 	if (checkRenderer != 0) display.addWidget (checkRenderer, this);
 	display.addWidget (modelHandle, this);
 }
 
 void releaseItem (TreeItem item, boolean release) {
 	int [] index = new int [1];
-	OS.gtk_tree_model_get (modelHandle, item.handle, ID_COLUMN, index, -1);
+	GTK.gtk_tree_model_get (modelHandle, item.handle, ID_COLUMN, index, -1);
 	if (index [0] == -1) return;
 	if (release) item.release (false);
 	items [index [0]] = null;
@@ -2688,18 +2688,18 @@ void releaseItem (TreeItem item, boolean release) {
 
 void releaseItems (long /*int*/ parentIter) {
 	int[] index = new int [1];
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-	boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+	boolean valid = GTK.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
 	while (valid) {
 		releaseItems (iter);
 		if (!isDisposed ()) {
-			OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
+			GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
 			if (index [0] != -1) {
 				TreeItem item = items [index [0]];
 				if (item != null) releaseItem (item, true);
 			}
 		}
-		valid = OS.gtk_tree_model_iter_next (modelHandle, iter);
+		valid = GTK.gtk_tree_model_iter_next (modelHandle, iter);
 	}
 	OS.g_free (iter);
 }
@@ -2742,26 +2742,26 @@ void releaseWidget () {
 
 void remove (long /*int*/ parentIter, int start, int end) {
 	if (start > end) return;
-	int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
+	int itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, parentIter);
 	if (!(0 <= start && start <= end && end < itemCount)) {
 		error (SWT.ERROR_INVALID_RANGE);
 	}
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (iter == 0) error (SWT.ERROR_NO_HANDLES);
 	if (fixAccessibility ()) {
 		ignoreAccessibility = true;
 	}
 	for (int i = start; i <= end; i++) {
-		OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parentIter, start);
+		GTK.gtk_tree_model_iter_nth_child (modelHandle, iter, parentIter, start);
 		int[] value = new int[1];
-		OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
+		GTK.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
 		TreeItem item = value [0] != -1 ? items [value [0]] : null;
 		if (item != null && !item.isDisposed ()) {
 			item.dispose ();
 		} else {
 			OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-			OS.gtk_tree_store_remove (modelHandle, iter);
+			GTK.gtk_tree_store_remove (modelHandle, iter);
 			OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		}
 	}
@@ -2787,7 +2787,7 @@ public void removeAll () {
 		if (item != null && !item.isDisposed ()) item.release (false);
 	}
 	items = new TreeItem[4];
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixAccessibility ()) {
 		ignoreAccessibility = true;
@@ -2797,9 +2797,9 @@ public void removeAll () {
 	 * and this causes AAIOB in getId as items are already cleared but the model is not yet.
 	 * By disconnecting the model from the handle while clearing no intermediate signals are emitted.
 	 */
-	OS.gtk_tree_view_set_model(handle, 0);
-	OS.gtk_tree_store_clear (modelHandle);
-	OS.gtk_tree_view_set_model(handle, modelHandle);
+	GTK.gtk_tree_view_set_model(handle, 0);
+	GTK.gtk_tree_store_clear (modelHandle);
+	GTK.gtk_tree_view_set_model(handle, modelHandle);
 	if (fixAccessibility ()) {
 		ignoreAccessibility = false;
 		OS.g_object_notify (handle, OS.model);
@@ -2807,11 +2807,11 @@ public void removeAll () {
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 
 	if (!searchEnabled ()) {
-		OS.gtk_tree_view_set_search_column (handle, -1);
+		GTK.gtk_tree_view_set_search_column (handle, -1);
 	} else {
 		/* Set the search column whenever the model changes */
 		int firstColumn = columnCount == 0 ? FIRST_COLUMN : columns [0].modelIndex;
-		OS.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
+		GTK.gtk_tree_view_set_search_column (handle, firstColumn + CELL_TEXT);
 	}
 }
 
@@ -2865,7 +2865,7 @@ public void removeTreeListener(TreeListener listener) {
 }
 
 void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ height) {
-	if (!ignoreSize && OS.GTK_IS_CELL_RENDERER_TEXT (cell) && hooks (SWT.MeasureItem)) {
+	if (!ignoreSize && GTK.GTK_IS_CELL_RENDERER_TEXT (cell) && hooks (SWT.MeasureItem)) {
 		long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
 		TreeItem item = null;
 		if (iter != 0) item = _getItem (iter);
@@ -2883,8 +2883,8 @@ void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ heigh
 			int [] contentWidth = new int [1], contentHeight = new int  [1];
 			if (width != 0) C.memmove (contentWidth, width, 4);
 			if (height != 0) C.memmove (contentHeight, height, 4);
-			if (OS.GTK3) {
-				OS.gtk_cell_renderer_get_preferred_height_for_width (cell, handle, contentWidth[0], contentHeight, null);
+			if (GTK.GTK3) {
+				GTK.gtk_cell_renderer_get_preferred_height_for_width (cell, handle, contentWidth[0], contentHeight, null);
 			}
 			Image image = item.getImage (columnIndex);
 			int imageWidth = 0;
@@ -2901,12 +2901,12 @@ void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ heigh
 			event.gc = gc;
 			Rectangle eventRect = new Rectangle (0, 0, contentWidth [0], contentHeight [0]);
 			event.setBounds (DPIUtil.autoScaleDown (eventRect));
-			long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-			long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
-			if (OS.gtk_tree_selection_path_is_selected (selection, path)) {
+			long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+			long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
+			if (GTK.gtk_tree_selection_path_is_selected (selection, path)) {
 				event.detail = SWT.SELECTED;
 			}
-			OS.gtk_tree_path_free (path);
+			GTK.gtk_tree_path_free (path);
 			sendEvent (SWT.MeasureItem, event);
 			gc.dispose ();
 			Rectangle rect = DPIUtil.autoScaleUp (event.getBounds ());
@@ -2914,8 +2914,8 @@ void sendMeasureEvent (long /*int*/ cell, long /*int*/ width, long /*int*/ heigh
 			if (contentHeight [0] < rect.height) contentHeight [0] = rect.height;
 			if (width != 0) C.memmove (width, contentWidth, 4);
 			if (height != 0) C.memmove (height, contentHeight, 4);
-			if (OS.GTK3) {
-				OS.gtk_cell_renderer_set_fixed_size (cell, contentWidth [0], contentHeight [0]);
+			if (GTK.GTK3) {
+				GTK.gtk_cell_renderer_set_fixed_size (cell, contentWidth [0], contentHeight [0]);
 			}
 		}
 	}
@@ -2969,35 +2969,35 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 		}
 	}
 	if (item != null) {
-		if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) ||
-				( (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) || OS.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
+		if (GTK.GTK_IS_CELL_RENDERER_TOGGLE (cell) ||
+				( (GTK.GTK_IS_CELL_RENDERER_PIXBUF (cell) || GTK.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
 			drawFlags = (int)/*64*/flags;
 			drawState = SWT.FOREGROUND;
 			long /*int*/ [] ptr = new long /*int*/ [1];
-			OS.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1);
+			GTK.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1);
 			if (ptr [0] == 0) {
 				int modelIndex = columnCount == 0 ? Tree.FIRST_COLUMN : columns [columnIndex].modelIndex;
-				OS.gtk_tree_model_get (modelHandle, item.handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
+				GTK.gtk_tree_model_get (modelHandle, item.handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
 			}
 			if (ptr [0] != 0) {
 				drawState |= SWT.BACKGROUND;
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					OS.gdk_rgba_free (ptr [0]);
 				} else {
 					OS.gdk_color_free (ptr [0]);
 				}
 			}
-			if ((flags & OS.GTK_CELL_RENDERER_SELECTED) != 0) drawState |= SWT.SELECTED;
-			if (!OS.GTK3 || (flags & OS.GTK_CELL_RENDERER_SELECTED) == 0) {
-				if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
+			if ((flags & GTK.GTK_CELL_RENDERER_SELECTED) != 0) drawState |= SWT.SELECTED;
+			if (!GTK.GTK3 || (flags & GTK.GTK_CELL_RENDERER_SELECTED) == 0) {
+				if ((flags & GTK.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
 			}
 
 			GdkRectangle rect = new GdkRectangle ();
-			long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-			OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
-			OS.gtk_tree_path_free (path);
+			long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+			GTK.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
+			GTK.gtk_tree_path_free (path);
 			// A workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459117
-			if (cr != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0) && OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
+			if (cr != 0 && GTK.GTK_VERSION > OS.VERSION(3, 9, 0) && GTK.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
 				GdkRectangle r2 = new GdkRectangle ();
 				OS.gdk_cairo_get_clip_rectangle (cr, r2);
 				rect.x = r2.x;
@@ -3009,7 +3009,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 					if (control != null) {
 						if (cr != 0) {
 							Cairo.cairo_save (cr);
-							if (!OS.GTK3) {
+							if (!GTK.GTK3) {
 								Cairo.cairo_reset_clip (cr);
 							}
 						}
@@ -3035,7 +3035,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				if (wasSelected) {
 					Control control = findBackgroundControl ();
 					if (control == null) control = this;
-					if (!OS.GTK3) {
+					if (!GTK.GTK3) {
 						if (cr != 0) {
 							Cairo.cairo_save (cr);
 							Cairo.cairo_reset_clip (cr);
@@ -3057,13 +3057,13 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				gc.setFont (item.getFont (columnIndex));
 				if ((style & SWT.MIRRORED) != 0) rect.x = getClientWidth () - rect.width - rect.x;
 
-				if (OS.GTK_VERSION >= OS.VERSION(3, 9, 0) && cr != 0) {
+				if (GTK.GTK_VERSION >= OS.VERSION(3, 9, 0) && cr != 0) {
 					GdkRectangle r = new GdkRectangle();
 					OS.gdk_cairo_get_clip_rectangle(cr, r);
 					Rectangle rect2 = DPIUtil.autoScaleDown(new Rectangle(rect.x, r.y, r.width, r.height));
 					// Caveat: rect2 is necessary because GC#setClipping(Rectangle) got broken by bug 446075
 					gc.setClipping(rect2.x, rect2.y, rect2.width, rect2.height);
-					if (OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
+					if (GTK.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
 						rect.width = r.width;
 					}
 				} else {
@@ -3079,25 +3079,25 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				event.setBounds (DPIUtil.autoScaleDown (eventRect));
 				event.detail = drawState;
 				sendEvent (SWT.EraseItem, event);
-				if (OS.GTK3) {
+				if (GTK.GTK3) {
 					drawForegroundRGBA = null;
 				} else {
 					drawForeground = null;
 				}
 				drawState = event.doit ? event.detail : 0;
-				drawFlags &= ~(OS.GTK_CELL_RENDERER_FOCUSED | OS.GTK_CELL_RENDERER_SELECTED);
-				if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
-				if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
+				drawFlags &= ~(GTK.GTK_CELL_RENDERER_FOCUSED | GTK.GTK_CELL_RENDERER_SELECTED);
+				if ((drawState & SWT.SELECTED) != 0) drawFlags |= GTK.GTK_CELL_RENDERER_SELECTED;
+				if ((drawState & SWT.FOCUSED) != 0) drawFlags |= GTK.GTK_CELL_RENDERER_FOCUSED;
 				if ((drawState & SWT.SELECTED) != 0) {
-					if (!OS.GTK3) {
-						long /*int*/ style = OS.gtk_widget_get_style (widget);
+					if (!GTK.GTK3) {
+						long /*int*/ style = GTK.gtk_widget_get_style (widget);
 						//TODO - parity and sorted
 						byte[] detail = Converter.wcsToMbcs ("cell_odd", true);
-						OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
+						GTK.gtk_paint_flat_box (style, window, GTK.GTK_STATE_SELECTED, GTK.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
 					}
 				} else {
 					if (wasSelected) {
-						if (OS.GTK3) {
+						if (GTK.GTK3) {
 							drawForegroundRGBA = gc.getForeground ().handleRGBA;
 						} else {
 							drawForeground = gc.getForeground ().handle;
@@ -3117,31 +3117,31 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 		gc.fillRectangle(DPIUtil.autoScaleDown(new Rectangle(rect.x, rect.y, rect.width, rect.height)));
 		gc.dispose ();
 	}
-	if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
+	if ((drawState & SWT.FOREGROUND) != 0 || GTK.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
 		long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
 		GtkCellRendererClass klass = new GtkCellRendererClass ();
 		OS.memmove (klass, g_class);
-		if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell) && !OS.GTK3) {
+		if (drawForeground != null && GTK.GTK_IS_CELL_RENDERER_TEXT (cell) && !GTK.GTK3) {
 			OS.g_object_set (cell, OS.foreground_gdk, drawForeground, 0);
-		} else if (drawForegroundRGBA != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell) && OS.GTK3) {
+		} else if (drawForegroundRGBA != null && GTK.GTK_IS_CELL_RENDERER_TEXT (cell) && GTK.GTK3) {
 			OS.g_object_set (cell, OS.foreground_rgba, drawForegroundRGBA, 0);
 		}
-		if (OS.GTK3) {
+		if (GTK.GTK3) {
 			OS.call (klass.render, cell, cr, widget, background_area, cell_area, drawFlags);
 		} else {
 			OS.call (klass.render, cell, window, widget, background_area, cell_area, expose_area, drawFlags);
 		}
 	}
 	if (item != null) {
-		if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
+		if (GTK.GTK_IS_CELL_RENDERER_TEXT (cell)) {
 			if (hooks (SWT.PaintItem)) {
 				if (wasSelected) drawState |= SWT.SELECTED;
 				GdkRectangle rect = new GdkRectangle ();
-				long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
-				OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);
-				OS.gtk_tree_path_free (path);
+				long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, iter);
+				GTK.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);
+				GTK.gtk_tree_path_free (path);
 				// A workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459117
-				if (cr != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0) && OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
+				if (cr != 0 && GTK.GTK_VERSION > OS.VERSION(3, 9, 0) && GTK.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
 					GdkRectangle r2 = new GdkRectangle ();
 					OS.gdk_cairo_get_clip_rectangle (cr, r2);
 					rect.x = r2.x;
@@ -3160,7 +3160,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				}
 				// On gtk >3.9 and <3.14.8 the clip rectangle does not have image area into clip rectangle
 				// need to adjust clip rectangle with image width
-				if (cr != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0) && OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
+				if (cr != 0 && GTK.GTK_VERSION > OS.VERSION(3, 9, 0) && GTK.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
 					rect.x -= imageWidth;
 					rect.width +=imageWidth;
 				}
@@ -3169,7 +3169,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				GC gc = getGC(cr);
 				if ((drawState & SWT.SELECTED) != 0) {
 					Color background, foreground;
-					if (OS.gtk_widget_has_focus (handle) || OS.GTK3) {
+					if (GTK.gtk_widget_has_focus (handle) || GTK.GTK3) {
 						background = display.getSystemColor (SWT.COLOR_LIST_SELECTION);
 						foreground = display.getSystemColor (SWT.COLOR_LIST_SELECTION_TEXT);
 					} else {
@@ -3186,7 +3186,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 				} else {
 					gc.setBackground (item.getBackground (columnIndex));
 					Color foreground;
-					if (OS.GTK3) {
+					if (GTK.GTK3) {
 						foreground = drawForegroundRGBA != null ? Color.gtk_new (display, drawForegroundRGBA) : item.getForeground (columnIndex);
 					} else {
 						foreground = drawForeground != null ? Color.gtk_new (display, drawForeground) : item.getForeground (columnIndex);
@@ -3218,7 +3218,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
 
 private GC getGC(long /*int*/ cr) {
 	GC gc;
-	if (OS.GTK3){
+	if (GTK.GTK3){
 		GCData gcData = new GCData();
 		gcData.cairo = cr;
 		gc = GC.gtk_new(this, gcData );
@@ -3234,9 +3234,9 @@ void resetCustomDraw () {
 	for (int i=0; i<end; i++) {
 		boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
 		if (customDraw) {
-			long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);
+			long /*int*/ column = GTK.gtk_tree_view_get_column (handle, i);
 			long /*int*/ textRenderer = getTextRenderer (column);
-			OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
+			GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
 			if (columnCount != 0) columns [i].customDraw = false;
 		}
 	}
@@ -3284,23 +3284,23 @@ boolean searchEnabled () {
 public void setInsertMark (TreeItem item, boolean before) {
 	checkWidget ();
 	if (item == null) {
-		OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
+		GTK.gtk_tree_view_set_drag_dest_row(handle, 0, GTK.GTK_TREE_VIEW_DROP_BEFORE);
 		return;
 	}
 	if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
 	if (item.parent != this) return;
 	Rectangle rect = item.getBoundsInPixels();
 	long /*int*/ [] path = new long /*int*/ [1];
-	OS.gtk_widget_realize (handle);
-	if (!OS.gtk_tree_view_get_path_at_pos(handle, rect.x, rect.y, path, null, null, null)) return;
+	GTK.gtk_widget_realize (handle);
+	if (!GTK.gtk_tree_view_get_path_at_pos(handle, rect.x, rect.y, path, null, null, null)) return;
 	if (path [0] == 0) return;
-	int position = before ? OS.GTK_TREE_VIEW_DROP_BEFORE : OS.GTK_TREE_VIEW_DROP_AFTER;
-	OS.gtk_tree_view_set_drag_dest_row(handle, path[0], position);
-	OS.gtk_tree_path_free (path [0]);
+	int position = before ? GTK.GTK_TREE_VIEW_DROP_BEFORE : GTK.GTK_TREE_VIEW_DROP_AFTER;
+	GTK.gtk_tree_view_set_drag_dest_row(handle, path[0], position);
+	GTK.gtk_tree_path_free (path [0]);
 }
 
 void setItemCount (long /*int*/ parentIter, int count) {
-	int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
+	int itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, parentIter);
 	if (count == itemCount) return;
 	boolean isVirtual = (style & SWT.VIRTUAL) != 0;
 	if (!isVirtual) setRedraw (false);
@@ -3310,10 +3310,10 @@ void setItemCount (long /*int*/ parentIter, int count) {
 			ignoreAccessibility = true;
 		}
 		for (int i=itemCount; i<count; i++) {
-			long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+			long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 			if (iter == 0) error (SWT.ERROR_NO_HANDLES);
-			OS.gtk_tree_store_append (modelHandle, iter, parentIter);
-			OS.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, -1, -1);
+			GTK.gtk_tree_store_append (modelHandle, iter, parentIter);
+			GTK.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, -1, -1);
 			OS.g_free (iter);
 		}
 		if (fixAccessibility ()) {
@@ -3369,9 +3369,9 @@ public void select (TreeItem item) {
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_select_iter (selection, item.handle);
+	GTK.gtk_tree_selection_select_iter (selection, item.handle);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
 }
@@ -3391,23 +3391,23 @@ public void selectAll () {
 	checkWidget();
 	if ((style & SWT.SINGLE) != 0) return;
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-	OS.gtk_tree_selection_select_all (selection);
+	GTK.gtk_tree_selection_select_all (selection);
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	if (fixColumn) hideFirstColumn ();
 }
 
 @Override
 void setBackgroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	super.setBackgroundGdkColor (color);
-	OS.gtk_widget_modify_base (handle, 0, color);
+	GTK.gtk_widget_modify_base (handle, 0, color);
 }
 
 @Override
 void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rgba) {
-	assert OS.GTK3 : "GTK3 code was run by GTK2";
+	assert GTK.GTK3 : "GTK3 code was run by GTK2";
 	/* Setting the background color overrides the selected background color.
 	 * To prevent this, we need to re-set the default. This can be done with CSS
 	 * on GTK3.14+, or by using GtkStateFlags as an argument to
@@ -3419,8 +3419,8 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 		background = rgba;
 	}
 	GdkRGBA selectedBackground = display.getSystemColor(SWT.COLOR_LIST_SELECTION).handleRGBA;
-	if (OS.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "treeview" : "GtkTreeView";
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 14, 0)) {
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "treeview" : "GtkTreeView";
 		String css = name + " {background-color: " + display.gtk_rgba_to_css_string(background) + ";}\n"
                 + name + ":selected {background-color: " + display.gtk_rgba_to_css_string(selectedBackground) + ";}";
 
@@ -3432,7 +3432,7 @@ void setBackgroundGdkRGBA (long /*int*/ context, long /*int*/ handle, GdkRGBA rg
 		gtk_css_provider_load_from_css(context, finalCss);
 	} else {
 		super.setBackgroundGdkRGBA(context, handle, rgba);
-		OS.gtk_widget_override_background_color(handle, OS.GTK_STATE_FLAG_SELECTED, selectedBackground);
+		GTK.gtk_widget_override_background_color(handle, GTK.GTK_STATE_FLAG_SELECTED, selectedBackground);
 	}
 }
 
@@ -3453,7 +3453,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
 	* a new shell is created. The fix is to ensure the tree view is realized
 	* after it has been resized.
 	*/
-	OS.gtk_widget_realize (handle);
+	GTK.gtk_widget_realize (handle);
 	return result;
 }
 
@@ -3499,7 +3499,7 @@ public void setColumnOrder (int [] order) {
 	long /*int*/ baseColumn = 0;
 	for (int i=0; i<order.length; i++) {
 		long /*int*/ column = columns [order [i]].handle;
-		OS.gtk_tree_view_move_column_after (handle, column, baseColumn);
+		GTK.gtk_tree_view_move_column_after (handle, column, baseColumn);
 		baseColumn = column;
 	}
 }
@@ -3517,7 +3517,7 @@ void setFontDescription (long /*int*/ font) {
 
 @Override
 void setForegroundGdkRGBA (GdkRGBA rgba) {
-	if (OS.GTK_VERSION >= OS.VERSION (3, 14, 0)) {
+	if (GTK.GTK_VERSION >= OS.VERSION (3, 14, 0)) {
 		foreground = rgba;
 		GdkRGBA toSet = rgba == null ? display.COLOR_LIST_FOREGROUND_RGBA : rgba;
 		setForegroundGdkRGBA (handle, toSet);
@@ -3528,7 +3528,7 @@ void setForegroundGdkRGBA (GdkRGBA rgba) {
 
 @Override
 void setForegroundGdkColor (GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (handle, color, false);
 }
 
@@ -3560,27 +3560,27 @@ public void setHeaderBackground (Color color) {
 			return;
 	} else if (headerBackground == null) return;
 	headerBackground = color;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA background;
 		if (headerBackground != null) {
 			background = headerBackground.handleRGBA;
 		} else {
 			background = defaultBackground();
 		}
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
 		// background works for 3.18 and later, background-color only as of 3.20
 		String css = name + " {background: " + display.gtk_rgba_to_css_string(background) + ";}\n";
 		headerCSSBackground = css;
 		String finalCss = display.gtk_css_create_css_color_string (headerCSSBackground, headerCSSForeground, SWT.BACKGROUND);
 		for (TreeColumn column : columns) {
 			if (column != null) {
-				long /*int*/ context = OS.gtk_widget_get_style_context(column.buttonHandle);
+				long /*int*/ context = GTK.gtk_widget_get_style_context(column.buttonHandle);
 				// Create provider as we need it attached to the proper context which is not the widget one
-				long /*int*/ provider = OS.gtk_css_provider_new ();
-				OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+				long /*int*/ provider = GTK.gtk_css_provider_new ();
+				GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 				OS.g_object_unref (provider);
-				OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (finalCss, true), -1, null);
-				OS.gtk_style_context_invalidate(context);
+				GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (finalCss, true), -1, null);
+				GTK.gtk_style_context_invalidate(context);
 			}
 		}
 	}
@@ -3615,26 +3615,26 @@ public void setHeaderForeground (Color color) {
 			return;
 	} else if (headerForeground == null) return;
 	headerForeground = color;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA foreground;
 		if (headerForeground != null) {
 			foreground = headerForeground.handleRGBA;
 		} else {
 			foreground = display.COLOR_LIST_FOREGROUND_RGBA;
 		}
-		String name = OS.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
+		String name = GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) ? "button" : "GtkButton";
 		String css = name + " {color: " + display.gtk_rgba_to_css_string(foreground) + ";}";
 		headerCSSForeground = css;
 		String finalCss = display.gtk_css_create_css_color_string (headerCSSBackground, headerCSSForeground, SWT.FOREGROUND);
 		for (TreeColumn column : columns) {
 			if (column != null) {
-				long /*int*/ context = OS.gtk_widget_get_style_context(column.buttonHandle);
+				long /*int*/ context = GTK.gtk_widget_get_style_context(column.buttonHandle);
 				// Create provider as we need it attached to the proper context which is not the widget one
-				long /*int*/ provider = OS.gtk_css_provider_new ();
-				OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+				long /*int*/ provider = GTK.gtk_css_provider_new ();
+				GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 				OS.g_object_unref (provider);
-				OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (finalCss, true), -1, null);
-				OS.gtk_style_context_invalidate(context);
+				GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs (finalCss, true), -1, null);
+				GTK.gtk_style_context_invalidate(context);
 			}
 		}
 	}
@@ -3661,7 +3661,7 @@ public void setHeaderForeground (Color color) {
  */
 public void setHeaderVisible (boolean show) {
 	checkWidget ();
-	OS.gtk_tree_view_set_headers_visible (handle, show);
+	GTK.gtk_tree_view_set_headers_visible (handle, show);
 }
 
 /**
@@ -3685,11 +3685,11 @@ public void setHeaderVisible (boolean show) {
  */
 public void setLinesVisible (boolean show) {
 	checkWidget();
-	if (!OS.GTK3) {
-		OS.gtk_tree_view_set_rules_hint (handle, show);
+	if (!GTK.GTK3) {
+		GTK.gtk_tree_view_set_rules_hint (handle, show);
 	}
 	//Note: this is overriden by the active theme in GTK3.
-	OS.gtk_tree_view_set_grid_lines (handle, show ? OS.GTK_TREE_VIEW_GRID_LINES_VERTICAL : OS.GTK_TREE_VIEW_GRID_LINES_NONE);
+	GTK.gtk_tree_view_set_grid_lines (handle, show ? GTK.GTK_TREE_VIEW_GRID_LINES_VERTICAL : GTK.GTK_TREE_VIEW_GRID_LINES_NONE);
 }
 
 void setModel (long /*int*/ newModel) {
@@ -3727,15 +3727,15 @@ void setParentBackground () {
 @Override
 void setParentWindow (long /*int*/ widget) {
 	long /*int*/ window = eventWindow ();
-	OS.gtk_widget_set_parent_window (widget, window);
+	GTK.gtk_widget_set_parent_window (widget, window);
 }
 
 void setScrollWidth (long /*int*/ column, TreeItem item) {
 	if (columnCount != 0 || currentItem == item) return;
-	int width = OS.gtk_tree_view_column_get_fixed_width (column);
+	int width = GTK.gtk_tree_view_column_get_fixed_width (column);
 	int itemWidth = calculateWidth (column, item.handle, true);
 	if (width < itemWidth) {
-		OS.gtk_tree_view_column_set_fixed_width (column, itemWidth);
+		GTK.gtk_tree_view_column_set_fixed_width (column, itemWidth);
 	}
 }
 
@@ -3796,7 +3796,7 @@ public void setSelection (TreeItem [] items) {
 	int length = items.length;
 	if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
 	boolean fixColumn = showFirstColumn ();
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (handle);
 	OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 	boolean first = true;
 	for (int i = 0; i < length; i++) {
@@ -3804,13 +3804,13 @@ public void setSelection (TreeItem [] items) {
 		if (item == null) continue;
 		if (item.isDisposed ()) break;
 		if (item.parent != this) continue;
-		long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
+		long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, item.handle);
 		showItem (path, false);
 		if (first) {
-			OS.gtk_tree_view_set_cursor (handle, path, 0, false);
+			GTK.gtk_tree_view_set_cursor (handle, path, 0, false);
 		}
-		OS.gtk_tree_selection_select_iter (selection, item.handle);
-		OS.gtk_tree_path_free (path);
+		GTK.gtk_tree_selection_select_iter (selection, item.handle);
+		GTK.gtk_tree_path_free (path);
 		first = false;
 	}
 	OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -3838,12 +3838,12 @@ public void setSortColumn (TreeColumn column) {
 	checkWidget ();
 	if (column != null && column.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	if (sortColumn != null && !sortColumn.isDisposed()) {
-		OS.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, false);
+		GTK.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, false);
 	}
 	sortColumn = column;
 	if (sortColumn != null && sortDirection != SWT.NONE) {
-		OS.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, true);
-		OS.gtk_tree_view_column_set_sort_order (sortColumn.handle, sortDirection == SWT.DOWN ? 0 : 1);
+		GTK.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, true);
+		GTK.gtk_tree_view_column_set_sort_order (sortColumn.handle, sortDirection == SWT.DOWN ? 0 : 1);
 	}
 }
 
@@ -3866,10 +3866,10 @@ public void setSortDirection  (int direction) {
 	sortDirection = direction;
 	if (sortColumn == null || sortColumn.isDisposed ()) return;
 	if (sortDirection == SWT.NONE) {
-		OS.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, false);
+		GTK.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, false);
 	} else {
-		OS.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, true);
-		OS.gtk_tree_view_column_set_sort_order (sortColumn.handle, sortDirection == SWT.DOWN ? 0 : 1);
+		GTK.gtk_tree_view_column_set_sort_indicator (sortColumn.handle, true);
+		GTK.gtk_tree_view_column_set_sort_order (sortColumn.handle, sortDirection == SWT.DOWN ? 0 : 1);
 	}
 }
 
@@ -3903,22 +3903,22 @@ public void setTopItem (TreeItem item) {
 	 * doesn't exist on GTK2.
 	 */
 	long /*int*/ vAdjustment;
-	if (OS.GTK3) {
-		vAdjustment = OS.gtk_scrollable_get_vadjustment(handle);
+	if (GTK.GTK3) {
+		vAdjustment = GTK.gtk_scrollable_get_vadjustment(handle);
 	}
 	else {
-		vAdjustment = OS.gtk_tree_view_get_vadjustment(handle);
+		vAdjustment = GTK.gtk_tree_view_get_vadjustment(handle);
 	}
-	cachedAdjustment = OS.gtk_adjustment_get_value(vAdjustment);
+	cachedAdjustment = GTK.gtk_adjustment_get_value(vAdjustment);
 	topItem = item;
 
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
 	if (item.parent != this) return;
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, item.handle);
 	showItem (path, false);
-	OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);
+	GTK.gtk_tree_path_free (path);
 }
 
 /**
@@ -3945,7 +3945,7 @@ public void showColumn (TreeColumn column) {
 	if (column.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
 	if (column.parent != this) return;
 
-	OS.gtk_tree_view_scroll_to_cell (handle, 0, column.handle, false, 0, 0);
+	GTK.gtk_tree_view_scroll_to_cell (handle, 0, column.handle, false, 0, 0);
 }
 
 boolean showFirstColumn () {
@@ -3955,11 +3955,11 @@ boolean showFirstColumn () {
 	*/
 	int columnCount = Math.max (1, this.columnCount);
 	for (int i=0; i<columnCount; i++) {
-		long /*int*/ column = OS.gtk_tree_view_get_column (handle, i);
-		if (OS.gtk_tree_view_column_get_visible (column)) return false;
+		long /*int*/ column = GTK.gtk_tree_view_get_column (handle, i);
+		if (GTK.gtk_tree_view_column_get_visible (column)) return false;
 	}
-	long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
-	OS.gtk_tree_view_column_set_visible (firstColumn, true);
+	long /*int*/ firstColumn = GTK.gtk_tree_view_get_column (handle, 0);
+	GTK.gtk_tree_view_column_set_visible (firstColumn, true);
 	return true;
 }
 
@@ -3982,34 +3982,34 @@ public void showSelection () {
 }
 
 void showItem (long /*int*/ path, boolean scroll) {
-	int depth = OS.gtk_tree_path_get_depth (path);
+	int depth = GTK.gtk_tree_path_get_depth (path);
 	if (depth > 1) {
 		int [] indices = new int [depth - 1];
-		long /*int*/ indicesPtr = OS.gtk_tree_path_get_indices (path);
+		long /*int*/ indicesPtr = GTK.gtk_tree_path_get_indices (path);
 		C.memmove (indices, indicesPtr, indices.length * 4);
-		long /*int*/ tempPath = OS.gtk_tree_path_new ();
+		long /*int*/ tempPath = GTK.gtk_tree_path_new ();
 		for (int i=0; i<indices.length; i++) {
-			OS.gtk_tree_path_append_index (tempPath, indices [i]);
-			OS.gtk_tree_view_expand_row (handle, tempPath, false);
+			GTK.gtk_tree_path_append_index (tempPath, indices [i]);
+			GTK.gtk_tree_view_expand_row (handle, tempPath, false);
 		}
-		OS.gtk_tree_path_free (tempPath);
+		GTK.gtk_tree_path_free (tempPath);
 	}
 	if (scroll) {
 		GdkRectangle cellRect = new GdkRectangle ();
-		OS.gtk_widget_realize (handle);
-		OS.gtk_tree_view_get_cell_area (handle, path, 0, cellRect);
+		GTK.gtk_widget_realize (handle);
+		GTK.gtk_tree_view_get_cell_area (handle, path, 0, cellRect);
 		boolean isHidden = cellRect.y == 0 && cellRect.height == 0;
 		int [] tx = new int [1], ty = new int [1];
-		OS.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
+		GTK.gtk_tree_view_convert_bin_window_to_tree_coords(handle, cellRect.x, cellRect.y, tx, ty);
 		if (!isHidden) {
 			GdkRectangle visibleRect = new GdkRectangle ();
-			OS.gtk_tree_view_get_visible_rect (handle, visibleRect);
+			GTK.gtk_tree_view_get_visible_rect (handle, visibleRect);
 			if (ty [0] < visibleRect.y || ty [0] + cellRect.height > visibleRect.y + visibleRect.height) {
 				isHidden = true;
 			}
 		}
 		if (isHidden) {
-			OS.gtk_tree_view_scroll_to_cell (handle, path, 0, depth != 1, 0.5f, 0.0f);
+			GTK.gtk_tree_view_scroll_to_cell (handle, path, 0, depth != 1, 0.5f, 0.0f);
 		}
 	}
 }
@@ -4037,9 +4037,9 @@ public void showItem (TreeItem item) {
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
 	if (item.parent != this) return;
-	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (modelHandle, item.handle);
 	showItem (path, true);
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 }
 
 @Override
@@ -4053,12 +4053,12 @@ void updateScrollBarValue (ScrollBar bar) {
 	* force the position to be corrected.
 	*/
 	long /*int*/ parentHandle = parentingHandle ();
-	long /*int*/ list = OS.gtk_container_get_children (parentHandle);
+	long /*int*/ list = GTK.gtk_container_get_children (parentHandle);
 	if (list == 0) return;
 	long /*int*/ temp = list;
 	while (temp != 0) {
 		long /*int*/ widget = OS.g_list_data (temp);
-		if (widget != 0) OS.gtk_widget_queue_resize  (widget);
+		if (widget != 0) GTK.gtk_widget_queue_resize  (widget);
 		temp = OS.g_list_next (temp);
 	}
 	OS.g_list_free (list);
@@ -4073,14 +4073,14 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us
 			 * expose events. The fix is to fill the background in the inverse expose
 			 * event.
 			 */
-			int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
+			int itemCount = GTK.gtk_tree_model_iter_n_children (modelHandle, 0);
 			if (itemCount == 0 && (state & OBSCURED) == 0) {
 				if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
 					Control control = findBackgroundControl ();
 					if (control != null) {
 						GdkEventExpose gdkEvent = new GdkEventExpose ();
 						OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
-						long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle);
+						long /*int*/ window = GTK.gtk_tree_view_get_bin_window (handle);
 						if (window == gdkEvent.window) {
 							drawBackground (control, window, gdkEvent.region, gdkEvent.area_x, gdkEvent.area_y, gdkEvent.area_width, gdkEvent.area_height);
 						}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java
index 4a273887ec..a8a7110e26 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java
@@ -258,7 +258,7 @@ public int getAlignment () {
  */
 public boolean getMoveable() {
 	checkWidget();
-	return OS.gtk_tree_view_column_get_reorderable (handle);
+	return GTK.gtk_tree_view_column_get_reorderable (handle);
 }
 
 /**
@@ -290,7 +290,7 @@ public Tree getParent () {
  */
 public boolean getResizable () {
 	checkWidget();
-	return OS.gtk_tree_view_column_get_resizable (handle);
+	return GTK.gtk_tree_view_column_get_resizable (handle);
 }
 
 /**
@@ -328,11 +328,11 @@ public int getWidth () {
 
 int getWidthInPixels () {
 	checkWidget();
-	if (!OS.gtk_tree_view_column_get_visible (handle)) {
+	if (!GTK.gtk_tree_view_column_get_visible (handle)) {
 		return 0;
 	}
-	if (useFixedWidth) return OS.gtk_tree_view_column_get_fixed_width (handle);
-	return OS.gtk_tree_view_column_get_width (handle);
+	if (useFixedWidth) return GTK.gtk_tree_view_column_get_fixed_width (handle);
+	return GTK.gtk_tree_view_column_get_width (handle);
 }
 
 @Override
@@ -346,7 +346,7 @@ long /*int*/ gtk_clicked (long /*int*/ widget) {
 	*/
 	boolean doubleClick = false;
 	boolean postEvent = true;
-	long /*int*/ eventPtr = OS.gtk_get_current_event ();
+	long /*int*/ eventPtr = GTK.gtk_get_current_event ();
 	if (eventPtr != 0) {
 		GdkEventButton gdkEvent = new GdkEventButton ();
 		OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
@@ -394,7 +394,7 @@ long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
 long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
 	useFixedWidth = false;
 	GtkAllocation widgetAllocation = new GtkAllocation();
-	OS.gtk_widget_get_allocation (widget, widgetAllocation);
+	GTK.gtk_widget_get_allocation (widget, widgetAllocation);
 	int x = widgetAllocation.x;
 	int width = widgetAllocation.width;
 	if (x != lastX) {
@@ -446,11 +446,11 @@ public void pack () {
 			}
 		}
 	} else {
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		if (GTK.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
 			do {
 				width = Math.max (width, parent.calculateWidth (handle, iter, true));
-			} while (OS.gtk_tree_model_iter_next(parent.modelHandle, iter));
+			} while (GTK.gtk_tree_model_iter_next(parent.modelHandle, iter));
 		}
 		OS.g_free (iter);
 	}
@@ -574,10 +574,10 @@ public void setImage (Image image) {
 		if (imageIndex == -1) imageIndex = headerImageList.add (image);
 		long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
 		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
-		OS.gtk_widget_show (imageHandle);
+		GTK.gtk_widget_show (imageHandle);
 	} else {
 		gtk_image_set_from_pixbuf (imageHandle, 0);
-		OS.gtk_widget_hide (imageHandle);
+		GTK.gtk_widget_hide (imageHandle);
 	}
 }
 
@@ -604,16 +604,16 @@ public void setImage (Image image) {
  */
 public void setMoveable (boolean moveable) {
 	checkWidget();
-	OS.gtk_tree_view_column_set_reorderable (handle, moveable);
+	GTK.gtk_tree_view_column_set_reorderable (handle, moveable);
 }
 
 @Override
 void setOrientation (boolean create) {
 	if ((parent.style & SWT.RIGHT_TO_LEFT) != 0 || !create) {
 		if (buttonHandle != 0) {
-			int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? OS.GTK_TEXT_DIR_RTL : OS.GTK_TEXT_DIR_LTR;
-			OS.gtk_widget_set_direction (buttonHandle, dir);
-			OS.gtk_container_forall (buttonHandle, display.setDirectionProc, dir);
+			int dir = (parent.style & SWT.RIGHT_TO_LEFT) != 0 ? GTK.GTK_TEXT_DIR_RTL : GTK.GTK_TEXT_DIR_LTR;
+			GTK.gtk_widget_set_direction (buttonHandle, dir);
+			GTK.gtk_container_forall (buttonHandle, display.setDirectionProc, dir);
 		}
 	}
 }
@@ -632,7 +632,7 @@ void setOrientation (boolean create) {
  */
 public void setResizable (boolean resizable) {
 	checkWidget();
-	OS.gtk_tree_view_column_set_resizable (handle, resizable);
+	GTK.gtk_tree_view_column_set_resizable (handle, resizable);
 }
 
 @Override
@@ -642,11 +642,11 @@ public void setText (String string) {
 	super.setText (string);
 	char [] chars = fixMnemonic (string);
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
-	OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
+	GTK.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
 	if (string.length () != 0) {
-		OS.gtk_widget_show (labelHandle);
+		GTK.gtk_widget_show (labelHandle);
 	} else {
-		OS.gtk_widget_hide (labelHandle);
+		GTK.gtk_widget_hide (labelHandle);
 	}
 }
 
@@ -704,15 +704,15 @@ void setWidthInPixels (int width) {
 	if (width == lastWidth) return;
 	if (width > 0) {
 		useFixedWidth = true;
-		OS.gtk_tree_view_column_set_fixed_width (handle, width);
+		GTK.gtk_tree_view_column_set_fixed_width (handle, width);
 	}
 	/*
 	 * Bug in GTK.  For some reason, calling gtk_tree_view_column_set_visible()
 	 * when the parent is not realized fails to show the column. The fix is to
 	 * ensure that the table has been realized.
 	 */
-	if (width != 0) OS.gtk_widget_realize (parent.handle);
-	OS.gtk_tree_view_column_set_visible (handle, width != 0);
+	if (width != 0) GTK.gtk_widget_realize (parent.handle);
+	GTK.gtk_tree_view_column_set_visible (handle, width != 0);
 	lastWidth = width;
 	/*
 	 * Bug in GTK. When the column is made visible the event window of column
@@ -723,7 +723,7 @@ void setWidthInPixels (int width) {
 	 */
 	if (width != 0) {
 		if (buttonHandle != 0) {
-			long /*int*/ window = OS.gtk_widget_get_parent_window (buttonHandle);
+			long /*int*/ window = GTK.gtk_widget_get_parent_window (buttonHandle);
 			if (window != 0) {
 				long /*int*/ windowList = OS.gdk_window_get_children (window);
 				if (windowList != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
index 51ea62b3ee..a880ad7390 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
@@ -188,8 +188,8 @@ TreeItem (Tree parent, long /*int*/ parentIter, int style, int index, boolean cr
 	if (create) {
 		parent.createItem (this, parentIter, index);
 	} else {
-		handle = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		OS.gtk_tree_model_iter_nth_child (parent.modelHandle, handle, parentIter, index);
+		handle = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		GTK.gtk_tree_model_iter_nth_child (parent.modelHandle, handle, parentIter, index);
 	}
 }
 
@@ -215,9 +215,9 @@ protected void checkSubclass () {
 
 Color _getBackground () {
 	long /*int*/ [] ptr = new long /*int*/ [1];
-	OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, ptr, -1);
 	if (ptr [0] == 0) return parent.getBackground ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = new GdkRGBA ();
 		OS.memmove(gdkRGBA, ptr [0], GdkRGBA.sizeof);
 		OS.gdk_rgba_free (ptr [0]);
@@ -235,9 +235,9 @@ Color _getBackground (int index) {
 	if (0 > index || index > count - 1) return _getBackground ();
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
 	if (ptr [0] == 0) return _getBackground ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = new GdkRGBA ();
 		OS.memmove(gdkRGBA, ptr [0], GdkRGBA.sizeof);
 		OS.gdk_rgba_free (ptr [0]);
@@ -252,15 +252,15 @@ Color _getBackground (int index) {
 
 boolean _getChecked () {
 	int [] ptr = new int [1];
-	OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
 	return ptr [0] != 0;
 }
 
 Color _getForeground () {
 	long /*int*/ [] ptr = new long /*int*/ [1];
-	OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1);
 	if (ptr [0] == 0) return parent.getForeground ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = new GdkRGBA ();
 		OS.memmove(gdkRGBA, ptr [0], GdkRGBA.sizeof);
 		OS.gdk_rgba_free (ptr [0]);
@@ -278,9 +278,9 @@ Color _getForeground (int index) {
 	if (0 > index || index > count - 1) return _getForeground ();
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	int modelIndex =  parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1);
 	if (ptr [0] == 0) return _getForeground ();
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = new GdkRGBA ();
 		OS.memmove(gdkRGBA, ptr [0], GdkRGBA.sizeof);
 		OS.gdk_rgba_free (ptr [0]);
@@ -298,7 +298,7 @@ Image _getImage (int index) {
 	if (0 > index || index > count - 1) return null;
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1);
 	if (ptr [0] == 0) return null;
 	ImageList imageList = parent.imageList;
 	int imageIndex = imageList.indexOf (ptr [0]);
@@ -312,7 +312,7 @@ String _getText (int index) {
 	if (0 > index || index > count - 1) return "";
 	long /*int*/ [] ptr = new long /*int*/ [1];
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);
 	if (ptr [0] == 0) return ""; //$NON-NLS-1$
 	int length = C.strlen (ptr [0]);
 	byte[] buffer = new byte [length];
@@ -324,13 +324,13 @@ String _getText (int index) {
 void clear () {
 	if (parent.currentItem == this) return;
 	if (cached || (parent.style & SWT.VIRTUAL) == 0) {
-		int columnCount = OS.gtk_tree_model_get_n_columns (parent.modelHandle);
+		int columnCount = GTK.gtk_tree_model_get_n_columns (parent.modelHandle);
 		/* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
 		for (int i=Tree.CHECKED_COLUMN; i<Tree.FOREGROUND_COLUMN; i++) {
-			OS.gtk_tree_store_set (parent.modelHandle, handle, i, 0, -1);
+			GTK.gtk_tree_store_set (parent.modelHandle, handle, i, 0, -1);
 		}
 		for (int i=Tree.FOREGROUND_COLUMN; i<columnCount; i++) {
-			OS.gtk_tree_store_set (parent.modelHandle, handle, i, (long /*int*/)0, -1);
+			GTK.gtk_tree_store_set (parent.modelHandle, handle, i, (long /*int*/)0, -1);
 		}
 	}
 	cached = false;
@@ -464,16 +464,16 @@ Rectangle getBoundsInPixels (int index) {
 	if (index >= 0 && index < parent.columnCount) {
 		column = parent.columns [index].handle;
 	} else {
-		column = OS.gtk_tree_view_get_column (parentHandle, index);
+		column = GTK.gtk_tree_view_get_column (parentHandle, index);
 	}
 	if (column == 0) return new Rectangle (0, 0, 0, 0);
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	OS.gtk_widget_realize (parentHandle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	GTK.gtk_widget_realize (parentHandle);
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
 
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 
 	if (index == 0 && (parent.style & SWT.CHECK) != 0) {
 		int [] x = new int [1], w = new int [1];
@@ -481,9 +481,9 @@ Rectangle getBoundsInPixels (int index) {
 		rect.x += x [0] + w [0];
 		rect.width -= x [0] + w [0];
 	}
-	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
+	int width = GTK.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
 	Rectangle r = new Rectangle (rect.x, rect.y, width, rect.height + 1);
-	if (parent.getHeaderVisible() && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (parent.getHeaderVisible() && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		r.y += parent.getHeaderHeightInPixels();
 	}
 	return r;
@@ -511,21 +511,21 @@ Rectangle getBoundsInPixels () {
 	checkWidget ();
 	if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
 	long /*int*/ parentHandle = parent.handle;
-	long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
+	long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, 0);
 	if (column == 0) return new Rectangle (0, 0, 0, 0);
 	long /*int*/ textRenderer = parent.getTextRenderer (column);
 	long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
 	if (textRenderer == 0 || pixbufRenderer == 0)  return new Rectangle (0, 0, 0, 0);
 
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	OS.gtk_widget_realize (parentHandle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	GTK.gtk_widget_realize (parentHandle);
 
-	boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-	boolean isExpanded = OS.gtk_tree_view_row_expanded (parentHandle, path);
-	OS.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, isExpander, isExpanded);
+	boolean isExpander = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
+	boolean isExpanded = GTK.gtk_tree_view_row_expanded (parentHandle, path);
+	GTK.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, isExpander, isExpanded);
 
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
 	int right = rect.x + rect.width;
 
@@ -535,9 +535,9 @@ Rectangle getBoundsInPixels () {
 	parent.ignoreSize = false;
 	rect.width = w [0];
 	int [] buffer = new int [1];
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 
-	OS.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
+	GTK.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
 	int horizontalSeparator = buffer[0];
 	rect.x += horizontalSeparator;
 
@@ -548,9 +548,9 @@ Rectangle getBoundsInPixels () {
 			rect.width = Math.max (0, right - rect.x);
 		}
 	}
-	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
+	int width = GTK.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
 	Rectangle r = new Rectangle (rect.x, rect.y, width, rect.height + 1);
-	if (parent.getHeaderVisible() && OS.GTK_VERSION > OS.VERSION(3, 9, 0)) {
+	if (parent.getHeaderVisible() && GTK.GTK_VERSION > OS.VERSION(3, 9, 0)) {
 		r.y += parent.getHeaderHeightInPixels();
 	}
 	return r;
@@ -590,9 +590,9 @@ public boolean getChecked () {
  */
 public boolean getExpanded () {
 	checkWidget();
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);
-	OS.gtk_tree_path_free (path);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	boolean answer = GTK.gtk_tree_view_row_expanded (parent.handle, path);
+	GTK.gtk_tree_path_free (path);
 	return answer;
 }
 
@@ -753,17 +753,17 @@ Rectangle getImageBoundsInPixels (int index) {
 	if (index >= 0 && index < parent.getColumnCount ()) {
 		column = parent.columns [index].handle;
 	} else {
-		column = OS.gtk_tree_view_get_column (parentHandle, index);
+		column = GTK.gtk_tree_view_get_column (parentHandle, index);
 	}
 	if (column == 0) return new Rectangle (0, 0, 0, 0);
 	long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
 	if (pixbufRenderer == 0)  return new Rectangle (0, 0, 0, 0);
 	GdkRectangle rect = new GdkRectangle ();
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	OS.gtk_widget_realize (parentHandle);
-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	GTK.gtk_widget_realize (parentHandle);
+	GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	/*
 	 * Feature in GTK. When a pixbufRenderer has size of 0x0, gtk_tree_view_column_cell_get_position
 	 * returns a position of 0 as well. This causes offset issues meaning that images/widgets/etc.
@@ -773,7 +773,7 @@ Rectangle getImageBoundsInPixels (int index) {
 	 */
 	int [] x = new int [1], w = new int [1];
 	gtk_tree_view_column_cell_get_position (column, pixbufRenderer, x, w);
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		if (parent.pixbufSizeSet) {
 			if (x [0] > 0) {
 				rect.x += x [0];
@@ -794,7 +794,7 @@ Rectangle getImageBoundsInPixels (int index) {
 		rect.x += x [0];
 	}
 	rect.width = w [0];
-	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width : 0;
+	int width = GTK.gtk_tree_view_column_get_visible (column) ? rect.width : 0;
 	return new Rectangle (rect.x, rect.y, width, rect.height + 1);
 }
 
@@ -812,7 +812,7 @@ Rectangle getImageBoundsInPixels (int index) {
 public int getItemCount () {
 	checkWidget();
 	if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
-	return OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle);
+	return GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle);
 }
 
 /**
@@ -836,7 +836,7 @@ public TreeItem getItem (int index) {
 	checkWidget();
 	if (index < 0) error (SWT.ERROR_INVALID_RANGE);
 	if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
-	int itemCount = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle);
+	int itemCount = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle);
 	if (index >= itemCount)  error (SWT.ERROR_INVALID_RANGE);
 	return  parent._getItem (handle, index);
 }
@@ -900,18 +900,18 @@ public Tree getParent () {
  */
 public TreeItem getParentItem () {
 	checkWidget();
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
 	TreeItem item = null;
-	int depth = OS.gtk_tree_path_get_depth (path);
+	int depth = GTK.gtk_tree_path_get_depth (path);
 	if (depth > 1) {
-		OS.gtk_tree_path_up (path);
-		long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-		if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {
+		GTK.gtk_tree_path_up (path);
+		long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
+		if (GTK.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {
 			item = parent._getItem (iter);
 		}
 		OS.g_free (iter);
 	}
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	return item;
 }
 
@@ -980,22 +980,22 @@ Rectangle getTextBoundsInPixels (int index) {
 	if (index >= 0 && index < parent.columnCount) {
 		column = parent.columns [index].handle;
 	} else {
-		column = OS.gtk_tree_view_get_column (parentHandle, index);
+		column = GTK.gtk_tree_view_get_column (parentHandle, index);
 	}
 	if (column == 0) return new Rectangle (0, 0, 0, 0);
 	long /*int*/ textRenderer = parent.getTextRenderer (column);
 	long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
 	if (textRenderer == 0 || pixbufRenderer == 0)  return new Rectangle (0, 0, 0, 0);
 
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	OS.gtk_widget_realize (parentHandle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	GTK.gtk_widget_realize (parentHandle);
 
-	boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-	boolean isExpanded = OS.gtk_tree_view_row_expanded (parentHandle, path);
-	OS.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, isExpander, isExpanded);
+	boolean isExpander = GTK.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
+	boolean isExpanded = GTK.gtk_tree_view_row_expanded (parentHandle, path);
+	GTK.gtk_tree_view_column_cell_set_cell_data (column, parent.modelHandle, handle, isExpander, isExpanded);
 
 	GdkRectangle rect = new GdkRectangle ();
-	OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
+	GTK.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
 	if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
 	int right = rect.x + rect.width;
 
@@ -1004,9 +1004,9 @@ Rectangle getTextBoundsInPixels (int index) {
 	gtk_cell_renderer_get_preferred_size (textRenderer, parentHandle, w, null);
 	parent.ignoreSize = false;
 	int [] buffer = new int [1];
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 
-	OS.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
+	GTK.gtk_widget_style_get (parentHandle, OS.horizontal_separator, buffer, 0);
 	int horizontalSeparator = buffer[0];
 	rect.x += horizontalSeparator;
 	gtk_tree_view_column_cell_get_position (column, textRenderer, x, null);
@@ -1017,7 +1017,7 @@ Rectangle getTextBoundsInPixels (int index) {
 	 * NOTE: this change has been ported to Tables since Tables/Trees both use the
 	 * same underlying GTK structure.
 	 */
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		Image image = _getImage(index);
 		int imageWidth = 0;
 		if (image != null) {
@@ -1036,7 +1036,7 @@ Rectangle getTextBoundsInPixels (int index) {
 			rect.width = Math.max (0, right - rect.x);
 		}
 	}
-	int width = OS.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
+	int width = GTK.gtk_tree_view_column_get_visible (column) ? rect.width + 1 : 0;
 	return new Rectangle (rect.x, rect.y, width, rect.height + 1);
 }
 
@@ -1066,25 +1066,25 @@ public int indexOf (TreeItem item) {
 	if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
 	int index = -1;
 	boolean isParent = false;
-	long /*int*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	long /*int*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
-	int depth = OS.gtk_tree_path_get_depth (parentPath);
-	if (depth > 1 && OS.gtk_tree_path_up(parentPath)) {
-		if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;
+	long /*int*/ currentPath = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	long /*int*/ parentPath = GTK.gtk_tree_model_get_path (parent.modelHandle, item.handle);
+	int depth = GTK.gtk_tree_path_get_depth (parentPath);
+	if (depth > 1 && GTK.gtk_tree_path_up(parentPath)) {
+		if (GTK.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;
 	}
-	OS.gtk_tree_path_free (currentPath);
-	OS.gtk_tree_path_free (parentPath);
+	GTK.gtk_tree_path_free (currentPath);
+	GTK.gtk_tree_path_free (parentPath);
 	if (!isParent) return index;
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, item.handle);
 	if (depth > 1) {
-		long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
+		long /*int*/ indices = GTK.gtk_tree_path_get_indices (path);
 		if (indices != 0) {
 			int[] temp = new int[depth];
 			C.memmove (temp, indices, 4 * temp.length);
 			index = temp[temp.length - 1];
 		}
 	}
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	return index;
 }
 
@@ -1125,23 +1125,23 @@ void releaseWidget () {
 public void removeAll () {
 	checkWidget ();
 	long /*int*/ modelHandle = parent.modelHandle;
-	int length = OS.gtk_tree_model_iter_n_children (modelHandle, handle);
+	int length = GTK.gtk_tree_model_iter_n_children (modelHandle, handle);
 	if (length == 0) return;
-	long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+	long /*int*/ iter = OS.g_malloc (GTK.GtkTreeIter_sizeof ());
 	if (iter == 0) error (SWT.ERROR_NO_HANDLES);
 	if (parent.fixAccessibility ()) {
 		parent.ignoreAccessibility = true;
 	}
-	long /*int*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
+	long /*int*/ selection = GTK.gtk_tree_view_get_selection (parent.handle);
 	int [] value = new int [1];
-	while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
-		OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
+	while (GTK.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
+		GTK.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
 		TreeItem item = value [0] != -1 ? parent.items [value [0]] : null;
 		if (item != null && !item.isDisposed ()) {
 			item.dispose ();
 		} else {
 			OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-			OS.gtk_tree_store_remove (modelHandle, iter);
+			GTK.gtk_tree_store_remove (modelHandle, iter);
 			OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
 		}
 	}
@@ -1176,12 +1176,12 @@ public void setBackground (Color color) {
 		error (SWT.ERROR_INVALID_ARGUMENT);
 	}
 	if (_getBackground ().equals (color)) return;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color != null ? color.handleRGBA : null;
-		OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, gdkRGBA, -1);
+		GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, gdkRGBA, -1);
 	} else {
 		GdkColor gdkColor = color != null ? color.handle : null;
-		OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, gdkColor, -1);
+		GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, gdkColor, -1);
 	}
 	cached = true;
 }
@@ -1214,12 +1214,12 @@ public void setBackground (int index, Color color) {
 	int count = Math.max (1, parent.getColumnCount ());
 	if (0 > index || index > count - 1) return;
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color != null ? color.handleRGBA : null;
-		OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, gdkRGBA, -1);
+		GTK.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, gdkRGBA, -1);
 	} else {
 		GdkColor gdkColor = color != null ? color.handle : null;
-		OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, gdkColor, -1);
+		GTK.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, gdkColor, -1);
 	}
 	cached = true;
 
@@ -1233,13 +1233,13 @@ public void setBackground (int index, Color color) {
 				if (parent.columnCount > 0) {
 					column = parent.columns [index].handle;
 				} else {
-					column = OS.gtk_tree_view_get_column (parentHandle, index);
+					column = GTK.gtk_tree_view_get_column (parentHandle, index);
 				}
 				if (column == 0) return;
 				long /*int*/ textRenderer = parent.getTextRenderer (column);
 				long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
-				OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
-				OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
 			}
 			if (parent.columnCount == 0) {
 				parent.firstCustomDraw = true;
@@ -1265,13 +1265,13 @@ public void setChecked (boolean checked) {
 	checkWidget();
 	if ((parent.style & SWT.CHECK) == 0) return;
 	if (_getChecked () == checked) return;
-	OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.CHECKED_COLUMN, checked, -1);
+	GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.CHECKED_COLUMN, checked, -1);
 	/*
 	* GTK+'s "inconsistent" state does not match SWT's concept of grayed.  To
 	* show checked+grayed differently from unchecked+grayed, we must toggle the
 	* grayed state on check and uncheck.
 	*/
-	OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, !checked ? false : grayed, -1);
+	GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, !checked ? false : grayed, -1);
 	cached = true;
 }
 
@@ -1288,20 +1288,20 @@ public void setChecked (boolean checked) {
  */
 public void setExpanded (boolean expanded) {
 	checkWidget();
-	long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
-	if (expanded != OS.gtk_tree_view_row_expanded (parent.handle, path)) {
+	long /*int*/ path = GTK.gtk_tree_model_get_path (parent.modelHandle, handle);
+	if (expanded != GTK.gtk_tree_view_row_expanded (parent.handle, path)) {
 		if (expanded) {
 			OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
-			OS.gtk_tree_view_expand_row (parent.handle, path, false);
+			GTK.gtk_tree_view_expand_row (parent.handle, path, false);
 			OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
 		} else {
 			OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
-			OS.gtk_widget_realize (parent.handle);
-			OS.gtk_tree_view_collapse_row (parent.handle, path);
+			GTK.gtk_widget_realize (parent.handle);
+			GTK.gtk_tree_view_collapse_row (parent.handle, path);
 			OS.g_signal_handlers_unblock_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_COLLAPSE_ROW);
 		}
 	}
-	OS.gtk_tree_path_free (path);
+	GTK.gtk_tree_path_free (path);
 	isExpanded = expanded;
 }
 
@@ -1333,7 +1333,7 @@ public void setFont (Font font){
 	this.font = font;
 	if (oldFont != null && oldFont.equals (font)) return;
 	long /*int*/ fontHandle = font != null ? font.handle : 0;
-	OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);
+	GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);
 	cached = true;
 }
 
@@ -1374,7 +1374,7 @@ public void setFont (int index, Font font) {
 
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
 	long /*int*/ fontHandle  = font != null ? font.handle : 0;
-	OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);
+	GTK.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);
 	cached = true;
 
 	if (font != null) {
@@ -1386,13 +1386,13 @@ public void setFont (int index, Font font) {
 				if (parent.columnCount > 0) {
 					column = parent.columns [index].handle;
 				} else {
-					column = OS.gtk_tree_view_get_column (parentHandle, index);
+					column = GTK.gtk_tree_view_get_column (parentHandle, index);
 				}
 				if (column == 0) return;
 				long /*int*/ textRenderer = parent.getTextRenderer (column);
 				long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
-				OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
-				OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
 			}
 			if (parent.columnCount == 0) {
 				parent.firstCustomDraw = true;
@@ -1427,12 +1427,12 @@ public void setForeground (Color color){
 		error (SWT.ERROR_INVALID_ARGUMENT);
 	}
 	if (_getForeground ().equals (color)) return;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color != null ? color.handleRGBA : null;
-		OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, gdkRGBA, -1);
+		GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, gdkRGBA, -1);
 	} else {
 		GdkColor gdkColor = color != null ? color.handle : null;
-		OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, gdkColor, -1);
+		GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, gdkColor, -1);
 	}
 	cached = true;
 }
@@ -1465,12 +1465,12 @@ public void setForeground (int index, Color color){
 	int count = Math.max (1, parent.getColumnCount ());
 	if (0 > index || index > count - 1) return;
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GdkRGBA gdkRGBA = color != null ? color.handleRGBA : null;
-		OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, gdkRGBA, -1);
+		GTK.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, gdkRGBA, -1);
 	} else {
 		GdkColor gdkColor = color != null ? color.handle : null;
-		OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, gdkColor, -1);
+		GTK.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, gdkColor, -1);
 	}
 	cached = true;
 
@@ -1483,13 +1483,13 @@ public void setForeground (int index, Color color){
 				if (parent.columnCount > 0) {
 					column = parent.columns [index].handle;
 				} else {
-					column = OS.gtk_tree_view_get_column (parentHandle, index);
+					column = GTK.gtk_tree_view_get_column (parentHandle, index);
 				}
 				if (column == 0) return;
 				long /*int*/ textRenderer = parent.getTextRenderer (column);
 				long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
-				OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
-				OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
+				GTK.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
 			}
 			if (parent.columnCount == 0) {
 				parent.firstCustomDraw = true;
@@ -1521,8 +1521,8 @@ public void setGrayed (boolean grayed) {
 	* Render checked+grayed as "inconsistent", unchecked+grayed as blank.
 	*/
 	int [] ptr = new int [1];
-	OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
-	OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
+	GTK.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
+	GTK.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
 	cached = true;
 }
 
@@ -1571,19 +1571,19 @@ public void setImage (int index, Image image) {
 	 * change has been ported to Tables since Tables/Trees both use the same
 	 * underlying GTK structure.
 	 */
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/parentHandle = parent.handle;
-		long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+		long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, index);
 		long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
 		int [] currentWidth = new int [1];
 		int [] currentHeight= new int [1];
-		OS.gtk_cell_renderer_get_fixed_size (pixbufRenderer, currentWidth, currentHeight);
+		GTK.gtk_cell_renderer_get_fixed_size (pixbufRenderer, currentWidth, currentHeight);
 		if (!parent.pixbufSizeSet) {
 			if (image != null) {
 				int iWidth = image.getBoundsInPixels ().width;
 				int iHeight = image.getBoundsInPixels ().height;
 				if (iWidth > currentWidth [0] || iHeight > currentHeight [0]) {
-					OS.gtk_cell_renderer_set_fixed_size (pixbufRenderer, iWidth, iHeight);
+					GTK.gtk_cell_renderer_set_fixed_size (pixbufRenderer, iWidth, iHeight);
 					parent.pixbufSizeSet = true;
 					parent.pixbufHeight = iHeight;
 					parent.pixbufWidth = iWidth;
@@ -1614,11 +1614,11 @@ public void setImage (int index, Image image) {
 			 * which results in icons being set to 0. Fix is to compare only positive sizes.
 			 */
 			if (parent.pixbufWidth > Math.max(currentWidth [0], 0) || parent.pixbufHeight > Math.max(currentHeight [0], 0)) {
-				OS.gtk_cell_renderer_set_fixed_size (pixbufRenderer, parent.pixbufWidth, parent.pixbufHeight);
+				GTK.gtk_cell_renderer_set_fixed_size (pixbufRenderer, parent.pixbufWidth, parent.pixbufHeight);
 			}
 		}
 	}
-	OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, pixbuf, -1);
+	GTK.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, pixbuf, -1);
 	/*
 	* Bug in GTK.  When using fixed-height-mode, GTK does not recalculate the cell renderer width
 	* when the image is changed in the model.  The fix is to force it to recalculate the width if
@@ -1627,7 +1627,7 @@ public void setImage (int index, Image image) {
 	if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
 		if (image != null) {
 			long /*int*/parentHandle = parent.handle;
-			long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+			long /*int*/ column = GTK.gtk_tree_view_get_column (parentHandle, index);
 			int [] w = new int [1];
 			long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);
 			gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
@@ -1637,8 +1637,8 @@ public void setImage (int index, Image image) {
 				 * are relying on the fact that it is done as part of modifying
 				 * the style.
 				 */
-				if (!OS.GTK3) {
-					long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+				if (!GTK.GTK3) {
+					long /*int*/ style = GTK.gtk_widget_get_modifier_style (parentHandle);
 					parent.modifyStyle (parentHandle, style);
 				}
 			}
@@ -1731,7 +1731,7 @@ public void setText (int index, String string) {
 	}
 	byte[] buffer = Converter.wcsToMbcs (string, true);
 	int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
-	OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, buffer, -1);
+	GTK.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, buffer, -1);
 	cached = true;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
index 754d759ecf..45140d31d9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
@@ -460,7 +460,7 @@ void destroyWidget () {
 	long /*int*/ topHandle = topHandle ();
 	releaseHandle ();
 	if (topHandle != 0 && (state & HANDLE) != 0) {
-		OS.gtk_widget_destroy (topHandle);
+		GTK.gtk_widget_destroy (topHandle);
 	}
 }
 
@@ -661,12 +661,12 @@ long /*int*/ gtk_activate (long /*int*/ widget) {
 }
 
 void gtk_adjustment_get (long /*int*/ hAdjustment, GtkAdjustment adjustment) {
-	adjustment.lower = OS.gtk_adjustment_get_lower (hAdjustment);
-	adjustment.upper = OS.gtk_adjustment_get_upper (hAdjustment);
-	adjustment.page_increment = OS.gtk_adjustment_get_page_increment (hAdjustment);
-	adjustment.step_increment = OS.gtk_adjustment_get_step_increment (hAdjustment);
-	adjustment.page_size = OS.gtk_adjustment_get_page_size (hAdjustment);
-	adjustment.value = OS.gtk_adjustment_get_value (hAdjustment);
+	adjustment.lower = GTK.gtk_adjustment_get_lower (hAdjustment);
+	adjustment.upper = GTK.gtk_adjustment_get_upper (hAdjustment);
+	adjustment.page_increment = GTK.gtk_adjustment_get_page_increment (hAdjustment);
+	adjustment.step_increment = GTK.gtk_adjustment_get_step_increment (hAdjustment);
+	adjustment.page_size = GTK.gtk_adjustment_get_page_size (hAdjustment);
+	adjustment.value = GTK.gtk_adjustment_get_value (hAdjustment);
 }
 
 long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
@@ -925,13 +925,13 @@ long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {
  * prevents a stack overflow from occurring.
  */
 boolean gtk_tree_view_column_cell_get_position (long /*int*/ column, long /*int*/ cell_renderer, int[] start_pos, int[] width) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		Callback.setEnabled(false);
-		boolean result = OS.gtk_tree_view_column_cell_get_position (column, cell_renderer, start_pos, width);
+		boolean result = GTK.gtk_tree_view_column_cell_get_position (column, cell_renderer, start_pos, width);
 		Callback.setEnabled(true);
 		return result;
 	} else {
-		return OS.gtk_tree_view_column_cell_get_position (column, cell_renderer, start_pos, width);
+		return GTK.gtk_tree_view_column_cell_get_position (column, cell_renderer, start_pos, width);
 	}
 }
 
@@ -961,8 +961,8 @@ long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
 void gtk_widget_reparent (long /*int*/ widget, long /*int*/ newParent) {
 	//Note, we do not actually call  * 'gtk_widget_reparent(...) as it's deprecated as of gtk 3.14
 	OS.g_object_ref (widget); //so that it won't get destroyed due to lack of references.
-	OS.gtk_container_remove (OS.gtk_widget_get_parent (widget), widget);
-	OS.gtk_container_add (newParent, widget);
+	GTK.gtk_container_remove (GTK.gtk_widget_get_parent (widget), widget);
+	GTK.gtk_container_add (newParent, widget);
 	OS.g_object_unref (widget);
 }
 
@@ -971,7 +971,7 @@ long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) {
 }
 
 int fontHeight (long /*int*/ font, long /*int*/ widgetHandle) {
-	long /*int*/ context = OS.gtk_widget_get_pango_context (widgetHandle);
+	long /*int*/ context = GTK.gtk_widget_get_pango_context (widgetHandle);
 	long /*int*/ lang = OS.pango_context_get_language (context);
 	long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang);
 	int ascent = OS.pango_font_metrics_get_ascent (metrics);
@@ -1116,19 +1116,19 @@ long /*int*/ hoverProc (long /*int*/ widget) {
 boolean mnemonicHit (long /*int*/ mnemonicHandle, char key) {
 	if (!mnemonicMatch (mnemonicHandle, key)) return false;
 	OS.g_signal_handlers_block_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE);
-	boolean result = OS.gtk_widget_mnemonic_activate (mnemonicHandle, false);
+	boolean result = GTK.gtk_widget_mnemonic_activate (mnemonicHandle, false);
 	OS.g_signal_handlers_unblock_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE);
 	return result;
 }
 
 boolean mnemonicMatch (long /*int*/ mnemonicHandle, char key) {
 	long keyval1 = OS.gdk_keyval_to_lower (OS.gdk_unicode_to_keyval (key));
-	long keyval2 = OS.gdk_keyval_to_lower (OS.gtk_label_get_mnemonic_keyval (mnemonicHandle));
+	long keyval2 = OS.gdk_keyval_to_lower (GTK.gtk_label_get_mnemonic_keyval (mnemonicHandle));
 	return keyval1 == keyval2;
 }
 
 void modifyStyle (long /*int*/ handle, long /*int*/ style) {
-	OS.gtk_widget_modify_style (handle, style);
+	GTK.gtk_widget_modify_style (handle, style);
 }
 
 /**
@@ -1420,7 +1420,7 @@ char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {
 	int index = 0, count = 0, state = 0;
 	long /*int*/ ptr = 0;
 	if (keyEvent == null) {
-		ptr = OS.gtk_get_current_event ();
+		ptr = GTK.gtk_get_current_event ();
 		if (ptr != 0) {
 			keyEvent = new GdkEventKey ();
 			OS.memmove (keyEvent, ptr, GdkEventKey.sizeof);
@@ -1437,7 +1437,7 @@ char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {
 	}
 	if (keyEvent == null) {
 		int [] buffer = new int [1];
-		OS.gtk_get_current_event_state (buffer);
+		GTK.gtk_get_current_event_state (buffer);
 		state = buffer [0];
 	}
 	while (index < chars.length) {
@@ -1482,7 +1482,7 @@ void sendSelectionEvent (int eventType, Event event, boolean send) {
 		return;
 	}
 	if (event == null) event = new Event ();
-	long /*int*/ ptr = OS.gtk_get_current_event ();
+	long /*int*/ ptr = GTK.gtk_get_current_event ();
 	if (ptr != 0) {
 		GdkEvent gdkEvent = new GdkEvent ();
 		OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
@@ -1614,34 +1614,34 @@ public void setData (String key, Object value) {
 		}
 	}
 	if (key.equals(SWT.SKIN_CLASS) || key.equals(SWT.SKIN_ID)) this.reskin(SWT.ALL);
-	if (OS.GTK_VERSION >= OS.VERSION(3, 20, 0) && key.equals(KEY_GTK_CSS) && value instanceof String) {
-		long /*int*/ context = OS.gtk_widget_get_style_context (cssHandle());
-		long /*int*/ provider = OS.gtk_css_provider_new();
+	if (GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) && key.equals(KEY_GTK_CSS) && value instanceof String) {
+		long /*int*/ context = GTK.gtk_widget_get_style_context (cssHandle());
+		long /*int*/ provider = GTK.gtk_css_provider_new();
 		if (context != 0 && provider != 0) {
-			OS.gtk_style_context_add_provider (context, provider, OS.GTK_STYLE_PROVIDER_PRIORITY_USER);
-			OS.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs ((String) value, true), -1, null);
+			GTK.gtk_style_context_add_provider (context, provider, GTK.GTK_STYLE_PROVIDER_PRIORITY_USER);
+			GTK.gtk_css_provider_load_from_data (provider, Converter.wcsToMbcs ((String) value, true), -1, null);
 			OS.g_object_unref (provider);
 		}
 	}
 }
 
 void setFontDescription (long /*int*/ widget, long /*int*/ font) {
-	if (OS.GTK3) {
-		OS.gtk_widget_override_font (widget, font);
-		long /*int*/ context = OS.gtk_widget_get_style_context (widget);
-		OS.gtk_style_context_invalidate (context);
+	if (GTK.GTK3) {
+		GTK.gtk_widget_override_font (widget, font);
+		long /*int*/ context = GTK.gtk_widget_get_style_context (widget);
+		GTK.gtk_style_context_invalidate (context);
 	} else {
-		OS.gtk_widget_modify_font (widget, font);
+		GTK.gtk_widget_modify_font (widget, font);
 	}
 }
 
 void setForegroundColor (long /*int*/ handle, GdkColor color) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	setForegroundColor (handle, color, true);
 }
 
 void setForegroundColor (long /*int*/ handle, GdkColor color, boolean setStateActive) {
-	assert !OS.GTK3 : "GTK2 code was run by GTK3";
+	assert !GTK.GTK3 : "GTK2 code was run by GTK3";
 	/*
 	 * Feature in GTK. When the widget doesn't have focus, then
 	 * gtk_default_draw_flat_box () changes the background color state_type
@@ -1649,35 +1649,35 @@ void setForegroundColor (long /*int*/ handle, GdkColor color, boolean setStateAc
 	 * gtk_paint_flat_box or gtk_default_draw_flat_box have to pass false for
 	 * setStateActive.
 	 */
-	long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
-	OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color);
-	if (setStateActive) OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color);
-	OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color);
-	int flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL);
-	flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG;
-	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_NORMAL, flags);
+	long /*int*/ style = GTK.gtk_widget_get_modifier_style (handle);
+	GTK.gtk_rc_style_set_fg (style, GTK.GTK_STATE_NORMAL, color);
+	if (setStateActive) GTK.gtk_rc_style_set_fg (style, GTK.GTK_STATE_ACTIVE, color);
+	GTK.gtk_rc_style_set_fg (style, GTK.GTK_STATE_PRELIGHT, color);
+	int flags = GTK.gtk_rc_style_get_color_flags (style, GTK.GTK_STATE_NORMAL);
+	flags = (color == null) ? flags & ~GTK.GTK_RC_FG: flags | GTK.GTK_RC_FG;
+	GTK.gtk_rc_style_set_color_flags (style, GTK.GTK_STATE_NORMAL, flags);
 	if (setStateActive) {
-		flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_ACTIVE);
-		flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG;
-		OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_ACTIVE, flags);
+		flags = GTK.gtk_rc_style_get_color_flags (style, GTK.GTK_STATE_ACTIVE);
+		flags = (color == null) ? flags & ~GTK.GTK_RC_FG: flags | GTK.GTK_RC_FG;
+		GTK.gtk_rc_style_set_color_flags (style, GTK.GTK_STATE_ACTIVE, flags);
 	}
-	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_PRELIGHT);
-	flags = (color == null) ? flags & ~OS.GTK_RC_FG: flags | OS.GTK_RC_FG;
-	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_PRELIGHT, flags);
-
-	OS.gtk_rc_style_set_text (style, OS.GTK_STATE_NORMAL, color);
-	if (setStateActive) OS.gtk_rc_style_set_text (style, OS.GTK_STATE_ACTIVE, color);
-	OS.gtk_rc_style_set_text (style, OS.GTK_STATE_PRELIGHT, color);
-	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL);
-	flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT;
-	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_NORMAL, flags);
-	flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_PRELIGHT);
-	flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT;
-	OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_PRELIGHT, flags);
+	flags = GTK.gtk_rc_style_get_color_flags (style, GTK.GTK_STATE_PRELIGHT);
+	flags = (color == null) ? flags & ~GTK.GTK_RC_FG: flags | GTK.GTK_RC_FG;
+	GTK.gtk_rc_style_set_color_flags (style, GTK.GTK_STATE_PRELIGHT, flags);
+
+	GTK.gtk_rc_style_set_text (style, GTK.GTK_STATE_NORMAL, color);
+	if (setStateActive) GTK.gtk_rc_style_set_text (style, GTK.GTK_STATE_ACTIVE, color);
+	GTK.gtk_rc_style_set_text (style, GTK.GTK_STATE_PRELIGHT, color);
+	flags = GTK.gtk_rc_style_get_color_flags (style, GTK.GTK_STATE_NORMAL);
+	flags = (color == null) ? flags & ~GTK.GTK_RC_TEXT: flags | GTK.GTK_RC_TEXT;
+	GTK.gtk_rc_style_set_color_flags (style, GTK.GTK_STATE_NORMAL, flags);
+	flags = GTK.gtk_rc_style_get_color_flags (style, GTK.GTK_STATE_PRELIGHT);
+	flags = (color == null) ? flags & ~GTK.GTK_RC_TEXT: flags | GTK.GTK_RC_TEXT;
+	GTK.gtk_rc_style_set_color_flags (style, GTK.GTK_STATE_PRELIGHT, flags);
 	if (setStateActive) {
-		flags = OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_ACTIVE);
-		flags = (color == null) ? flags & ~OS.GTK_RC_TEXT: flags | OS.GTK_RC_TEXT;
-		OS.gtk_rc_style_set_color_flags (style, OS.GTK_STATE_ACTIVE, flags);
+		flags = GTK.gtk_rc_style_get_color_flags (style, GTK.GTK_STATE_ACTIVE);
+		flags = (color == null) ? flags & ~GTK.GTK_RC_TEXT: flags | GTK.GTK_RC_TEXT;
+		GTK.gtk_rc_style_set_color_flags (style, GTK.GTK_STATE_ACTIVE, flags);
 	}
 	modifyStyle (handle, style);
 }
@@ -1801,20 +1801,20 @@ long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int
 }
 
 long /*int*/ gtk_widget_get_window (long /*int*/ widget){
-	if (OS.GTK3) {
-		OS.gtk_widget_realize(widget);
+	if (GTK.GTK3) {
+		GTK.gtk_widget_realize(widget);
 	}
-	return OS.gtk_widget_get_window (widget);
+	return GTK.gtk_widget_get_window (widget);
 }
 
 void gtk_widget_set_visible (long /*int*/ widget, boolean visible) {
-	if (OS.GTK3) {
-		OS.gtk_widget_set_visible (widget,visible);
+	if (GTK.GTK3) {
+		GTK.gtk_widget_set_visible (widget,visible);
 	} else {
 		if (visible) {
-			OS.GTK_WIDGET_SET_FLAGS (widget, OS.GTK_VISIBLE);
+			GTK.GTK_WIDGET_SET_FLAGS (widget, GTK.GTK_VISIBLE);
 		} else {
-			OS.GTK_WIDGET_UNSET_FLAGS (widget, OS.GTK_VISIBLE);
+			GTK.GTK_WIDGET_UNSET_FLAGS (widget, GTK.GTK_VISIBLE);
 		}
 	}
 }
@@ -1839,21 +1839,21 @@ int gdk_event_get_state (long /*int*/ event) {
 
 long /*int*/ gtk_box_new (int orientation, boolean homogeneous, int spacing) {
 	long /*int*/ box = 0;
-	if (OS.GTK3) {
-		box = OS.gtk_box_new (orientation, spacing);
-		OS.gtk_box_set_homogeneous (box, homogeneous);
+	if (GTK.GTK3) {
+		box = GTK.gtk_box_new (orientation, spacing);
+		GTK.gtk_box_set_homogeneous (box, homogeneous);
 	} else {
-		if (orientation == OS.GTK_ORIENTATION_HORIZONTAL) {
-			box = OS.gtk_hbox_new (homogeneous, spacing);
+		if (orientation == GTK.GTK_ORIENTATION_HORIZONTAL) {
+			box = GTK.gtk_hbox_new (homogeneous, spacing);
 		} else {
-			box = OS.gtk_vbox_new (homogeneous, spacing);
+			box = GTK.gtk_vbox_new (homogeneous, spacing);
 		}
 	}
 	return box;
 }
 
 int gdk_pointer_grab (long /*int*/ window, int grab_ownership, boolean owner_events, int event_mask, long /*int*/ confine_to, long /*int*/ cursor, int time_) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/ display = 0;
 		if( window != 0) {
 			display = OS.gdk_window_get_display (window);
@@ -1870,7 +1870,7 @@ int gdk_pointer_grab (long /*int*/ window, int grab_ownership, boolean owner_eve
 }
 
 void gdk_pointer_ungrab (long /*int*/ window, int time_) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/ display = OS.gdk_window_get_display (window);
 		long /*int*/ device_manager = OS.gdk_display_get_device_manager (display);
 		long /*int*/ pointer = OS.gdk_device_manager_get_client_pointer (device_manager);
@@ -1938,8 +1938,8 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {
 long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
 	switch ((int)/*64*/user_data) {
 		case EXPOSE_EVENT_INVERSE: {
-			if (OS.GTK3) {
-				if (OS.GTK_VERSION >= OS.VERSION (3, 9, 0) && OS.GTK_IS_CONTAINER (handle)) {
+			if (GTK.GTK3) {
+				if (GTK.GTK_VERSION >= OS.VERSION (3, 9, 0) && GTK.GTK_IS_CONTAINER (handle)) {
 					return gtk_draw (handle, arg0);
 				}
 			} else {
@@ -1966,8 +1966,8 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us
 		case EVENT: return gtk_event (handle, arg0);
 		case EVENT_AFTER: return gtk_event_after (handle, arg0);
 		case EXPOSE_EVENT: {
-			if (OS.GTK3) {
-				if (OS.GTK_VERSION < OS.VERSION (3, 9, 0) || !OS.GTK_IS_CONTAINER (handle)) {
+			if (GTK.GTK3) {
+				if (GTK.GTK_VERSION < OS.VERSION (3, 9, 0) || !GTK.GTK_IS_CONTAINER (handle)) {
 					return gtk_draw (handle, arg0);
 				}
 			} else {
@@ -2027,7 +2027,7 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ ar
 }
 
 void gdk_cursor_unref (long /*int*/ cursor) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		OS.g_object_unref (cursor);
 	} else {
 		OS.gdk_cursor_unref(cursor);
@@ -2035,7 +2035,7 @@ void gdk_cursor_unref (long /*int*/ cursor) {
 }
 
 long /*int*/ gdk_window_get_device_position (long /*int*/ window, int[] x, int[] y, int[] mask) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		long /*int*/ display = 0;
 		if( window != 0) {
 			display = OS.gdk_window_get_display (window);
@@ -2052,29 +2052,29 @@ long /*int*/ gdk_window_get_device_position (long /*int*/ window, int[] x, int[]
 }
 
 void gtk_cell_renderer_get_preferred_size (long /*int*/ cell, long /*int*/ widget,  int[] width, int[] height) {
-	if (OS.GTK3) {
+	if (GTK.GTK3) {
 		GtkRequisition minimum_size = new GtkRequisition ();
-		OS.gtk_cell_renderer_get_preferred_size (cell, widget, minimum_size, null);
+		GTK.gtk_cell_renderer_get_preferred_size (cell, widget, minimum_size, null);
 		if (width != null) width [0] = minimum_size.width;
 		if (height != null) height[0] = minimum_size.height;
 	} else {
-		OS.gtk_cell_renderer_get_size (cell, widget, null, null, null, width, height);
+		GTK.gtk_cell_renderer_get_size (cell, widget, null, null, null, width, height);
 	}
 }
 
 void gtk_widget_get_preferred_size (long /*int*/ widget, GtkRequisition requisition){
-	if (OS.GTK3) {
-		OS.gtk_widget_get_preferred_size (widget, requisition, null);
+	if (GTK.GTK3) {
+		GTK.gtk_widget_get_preferred_size (widget, requisition, null);
 	} else {
-		OS.gtk_widget_size_request (widget, requisition);
+		GTK.gtk_widget_size_request (widget, requisition);
 	}
 }
 
 void gtk_image_set_from_pixbuf (long /*int*/ imageHandle, long /*int*/ pixbuf){
-	if (OS.GTK3) {
-		OS.gtk_image_set_from_gicon(imageHandle, pixbuf, OS.GTK_ICON_SIZE_SMALL_TOOLBAR);
+	if (GTK.GTK3) {
+		GTK.gtk_image_set_from_gicon(imageHandle, pixbuf, GTK.GTK_ICON_SIZE_SMALL_TOOLBAR);
 	} else {
-		OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+		GTK.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
 	}
 }
 
diff --git a/tests/org.eclipse.swt.tests.gtk/Bug Snippets/org/eclipse/swt/tests/gtk/snippets/Bug526083_MenuGetBounds.java b/tests/org.eclipse.swt.tests.gtk/Bug Snippets/org/eclipse/swt/tests/gtk/snippets/Bug526083_MenuGetBounds.java
index 4dff95e40d..034f03f86b 100644
--- a/tests/org.eclipse.swt.tests.gtk/Bug Snippets/org/eclipse/swt/tests/gtk/snippets/Bug526083_MenuGetBounds.java
+++ b/tests/org.eclipse.swt.tests.gtk/Bug Snippets/org/eclipse/swt/tests/gtk/snippets/Bug526083_MenuGetBounds.java
@@ -1,131 +1,132 @@
-package org.eclipse.swt.tests.gtk.snippets;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.internal.gtk.GtkAllocation;
-import org.eclipse.swt.internal.gtk.OS;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-
-
-/*
- * Title: Bug 526083 - [GTK3] Menu.getBounds() returns wrong x & y coordinate
- * How to run: launch snippet, right click in the boxes, observe messages printed in the console
- * Bug description: The "getBounds" line has incorrect values
- * Expected results: The "getBounds" line should have the same values as the "correct bounds" line
- * GTK Version(s): GTK3
- */
-public class Bug526083_MenuGetBounds {
-
-	public static void main(String[] args) {
-		final Display display = new Display();
-		Shell shell = new Shell(display);
-		shell.setLayout(new GridLayout(2, false));
-		Composite c1 = new Composite(shell, SWT.BORDER);
-		c1.setLayoutData(new GridData(100, 100));
-		Composite c2 = new Composite(shell, SWT.BORDER);
-		c2.setLayoutData(new GridData(100, 100));
-		final Menu menu = new Menu(shell, SWT.POP_UP);
-		MenuItem item = new MenuItem(menu, SWT.PUSH);
-		item.setText("Popup");
-		menu.addListener(SWT.Show, event -> display.asyncExec(() -> {
-			try {
-				// menu.getBounds call
-				System.err.println("getBounds: " + invoke(menu, "getBounds"));
-				System.err.println("-----------------------------------------");
-				// menu.getBounds implementation
-//							long /*int*/ window = gtk_widget_get_window (menu.handle);
-				long /*int*/ window = ((Long)invoke(Widget.class, "gtk_widget_get_window", true, menu, new Object[] { Long.valueOf(menu.handle) })).longValue();
-				int [] origin_x = new int [1], origin_y = new int [1];
-				OS.gdk_window_get_origin (window, origin_x, origin_y);
-				GtkAllocation allocation = new GtkAllocation ();
-				OS.gtk_widget_get_allocation (menu.handle, allocation);
-				System.err.println(origin_x[0] + " " + origin_y[0] + " " + allocation.x + " " + allocation.y + " " + allocation.width + " " + allocation.height);
-				int x = origin_x [0] + allocation.x;
-				int y = origin_y [0] + allocation.y;
-				int width = allocation.width;
-				int height = allocation.height;
-				Rectangle bounds = new Rectangle (x, y, width, height);
-				System.err.println("allocation: " + allocation.x + " " + allocation.y + " " + allocation.width + " " + allocation.height);
-				System.err.println("bounds: " + bounds);
-				System.err.println("-----------------------------------------");
-				// correct bounds (without allocation)
-				x = origin_x [0];
-				y = origin_y [0];
-				bounds = new Rectangle (x, y, width, height);
-				System.err.println("correct bounds: " + bounds);
-			} catch (Throwable t) {
-				t.printStackTrace();
-			}
-		}));
-		c1.setMenu(menu);
-		c2.setMenu(menu);
-		shell.setMenu(menu);
-		shell.setSize(300, 300);
-		shell.setLocation(100, 100);
-		shell.open();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
-		display.dispose();
-	}
-
-	public final static Object invoke(final String clazzName, final String methodName, final Object... args)
-			throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		return invoke(clazzName, methodName, false, args);
-	}
-
-	public final static Object invoke(final String clazzName, final String methodName, final Class<?>[] params, final Object... args)
-			throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		return invoke(Class.forName(clazzName), methodName, false, null, params, args);
-	}
-
-	public final static Object invoke(final String clazzName, final String methodName, final boolean declaredMethod, final Object... args)
-			throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		return invoke(Class.forName(clazzName), methodName, declaredMethod, null, args);
-	}
-
-	public final static Object invoke(final Object obj, final String methodName, final Object... args)
-			throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		return invoke(obj.getClass(), methodName, true, obj, args);
-	}
-
-	public final static Object invoke(final Class<?> clazz, final String methodName, final boolean declaredMethod, final Object obj, final Object... args)
-			throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		Class<?>[] params = new Class[args.length];
-		for (int i = 0; i < args.length; i++) {
-			Class<?> argClazz = args[i].getClass();
-			try {
-				Field typeField = argClazz.getField("TYPE"); //$NON-NLS-1$
-				params[i] = (Class<?>) typeField.get(null);
-			} catch (NoSuchFieldException e) {
-				params[i] = argClazz;
-			}
-		}
-		return invoke(clazz, methodName, declaredMethod, obj, params, args);
-	}
-
-	public final static Object invoke(final Class<?> clazz, final String methodName, final boolean declaredMethod, final Object obj, final Class<?>[] params, final Object... args)
-			throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		Method method;
-		if (declaredMethod) {
-			method = clazz.getDeclaredMethod(methodName, params);
-			method.setAccessible(true);
-		} else {
-			method = clazz.getMethod(methodName, params);
-		}
-		return method.invoke(obj, args);
-	}
-
-}
\ No newline at end of file
+//package org.eclipse.swt.tests.gtk.snippets;
+//
+//import java.lang.reflect.Field;
+//import java.lang.reflect.InvocationTargetException;
+//import java.lang.reflect.Method;
+//
+//import org.eclipse.swt.SWT;
+//import org.eclipse.swt.graphics.Rectangle;
+//import org.eclipse.swt.internal.gtk.GTK;
+//import org.eclipse.swt.internal.gtk.GtkAllocation;
+//import org.eclipse.swt.internal.gtk.OS;
+//import org.eclipse.swt.layout.GridData;
+//import org.eclipse.swt.layout.GridLayout;
+//import org.eclipse.swt.widgets.Composite;
+//import org.eclipse.swt.widgets.Display;
+//import org.eclipse.swt.widgets.Menu;
+//import org.eclipse.swt.widgets.MenuItem;
+//import org.eclipse.swt.widgets.Shell;
+//import org.eclipse.swt.widgets.Widget;
+//
+//
+///*
+// * Title: Bug 526083 - [GTK3] Menu.getBounds() returns wrong x & y coordinate
+// * How to run: launch snippet, right click in the boxes, observe messages printed in the console
+// * Bug description: The "getBounds" line has incorrect values
+// * Expected results: The "getBounds" line should have the same values as the "correct bounds" line
+// * GTK Version(s): GTK3
+// */
+//public class Bug526083_MenuGetBounds {
+//
+//	public static void main(String[] args) {
+//		final Display display = new Display();
+//		Shell shell = new Shell(display);
+//		shell.setLayout(new GridLayout(2, false));
+//		Composite c1 = new Composite(shell, SWT.BORDER);
+//		c1.setLayoutData(new GridData(100, 100));
+//		Composite c2 = new Composite(shell, SWT.BORDER);
+//		c2.setLayoutData(new GridData(100, 100));
+//		final Menu menu = new Menu(shell, SWT.POP_UP);
+//		MenuItem item = new MenuItem(menu, SWT.PUSH);
+//		item.setText("Popup");
+//		menu.addListener(SWT.Show, event -> display.asyncExec(() -> {
+//			try {
+//				// menu.getBounds call
+//				System.err.println("getBounds: " + invoke(menu, "getBounds"));
+//				System.err.println("-----------------------------------------");
+//				// menu.getBounds implementation
+////							long /*int*/ window = gtk_widget_get_window (menu.handle);
+//				long /*int*/ window = ((Long)invoke(Widget.class, "gtk_widget_get_window", true, menu, new Object[] { Long.valueOf(menu.handle) })).longValue();
+//				int [] origin_x = new int [1], origin_y = new int [1];
+//				OS.gdk_window_get_origin (window, origin_x, origin_y);
+//				GtkAllocation allocation = new GtkAllocation ();
+//				GTK.gtk_widget_get_allocation (menu.handle, allocation);
+//				System.err.println(origin_x[0] + " " + origin_y[0] + " " + allocation.x + " " + allocation.y + " " + allocation.width + " " + allocation.height);
+//				int x = origin_x [0] + allocation.x;
+//				int y = origin_y [0] + allocation.y;
+//				int width = allocation.width;
+//				int height = allocation.height;
+//				Rectangle bounds = new Rectangle (x, y, width, height);
+//				System.err.println("allocation: " + allocation.x + " " + allocation.y + " " + allocation.width + " " + allocation.height);
+//				System.err.println("bounds: " + bounds);
+//				System.err.println("-----------------------------------------");
+//				// correct bounds (without allocation)
+//				x = origin_x [0];
+//				y = origin_y [0];
+//				bounds = new Rectangle (x, y, width, height);
+//				System.err.println("correct bounds: " + bounds);
+//			} catch (Throwable t) {
+//				t.printStackTrace();
+//			}
+//		}));
+//		c1.setMenu(menu);
+//		c2.setMenu(menu);
+//		shell.setMenu(menu);
+//		shell.setSize(300, 300);
+//		shell.setLocation(100, 100);
+//		shell.open();
+//		while (!shell.isDisposed()) {
+//			if (!display.readAndDispatch())
+//				display.sleep();
+//		}
+//		display.dispose();
+//	}
+//
+//	public final static Object invoke(final String clazzName, final String methodName, final Object... args)
+//			throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+//		return invoke(clazzName, methodName, false, args);
+//	}
+//
+//	public final static Object invoke(final String clazzName, final String methodName, final Class<?>[] params, final Object... args)
+//			throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+//		return invoke(Class.forName(clazzName), methodName, false, null, params, args);
+//	}
+//
+//	public final static Object invoke(final String clazzName, final String methodName, final boolean declaredMethod, final Object... args)
+//			throws ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+//		return invoke(Class.forName(clazzName), methodName, declaredMethod, null, args);
+//	}
+//
+//	public final static Object invoke(final Object obj, final String methodName, final Object... args)
+//			throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+//		return invoke(obj.getClass(), methodName, true, obj, args);
+//	}
+//
+//	public final static Object invoke(final Class<?> clazz, final String methodName, final boolean declaredMethod, final Object obj, final Object... args)
+//			throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+//		Class<?>[] params = new Class[args.length];
+//		for (int i = 0; i < args.length; i++) {
+//			Class<?> argClazz = args[i].getClass();
+//			try {
+//				Field typeField = argClazz.getField("TYPE"); //$NON-NLS-1$
+//				params[i] = (Class<?>) typeField.get(null);
+//			} catch (NoSuchFieldException e) {
+//				params[i] = argClazz;
+//			}
+//		}
+//		return invoke(clazz, methodName, declaredMethod, obj, params, args);
+//	}
+//
+//	public final static Object invoke(final Class<?> clazz, final String methodName, final boolean declaredMethod, final Object obj, final Class<?>[] params, final Object... args)
+//			throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
+//		Method method;
+//		if (declaredMethod) {
+//			method = clazz.getDeclaredMethod(methodName, params);
+//			method.setAccessible(true);
+//		} else {
+//			method = clazz.getMethod(methodName, params);
+//		}
+//		return method.invoke(obj, args);
+//	}
+//
+//}
\ No newline at end of file