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>

83 files changed, 24925 insertions, 24990 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)
+JNI