Bug 431789 - PrintDialog.open crashes with GTK 3.10

No need to dynamically load all these functions now that Gtk 2.10 is the
min required version. This ensures that parameters are correct
everywhere and etc. Preparational work for working on fixing the crash.

Change-Id: I958261727ac703a2c6f2daf7d2522d9e7685ceaf
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 004fbdf..6bce587 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -54,7 +54,7 @@
 CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
 
 # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
-GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION)`
+GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
 ifeq ($(GTK_VERSION), 3.0)
 GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0 -lXtst
 else
@@ -66,7 +66,7 @@
 AWT_LFLAGS = -shared ${SWT_LFLAGS} 
 AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
 
-ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION)`
+ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)`
 ATKLIBS = `pkg-config --libs-only-L atk` -latk-1.0 
 
 GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
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 dfebd0f..c788238 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
@@ -10123,15 +10123,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1enumerate_1printers_FUNC);
-/*
-	gtk_enumerate_printers(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_enumerate_printers)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, gpointer, GDestroyNotify, gboolean))fp)(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
-		}
-	}
+	gtk_enumerate_printers((GtkPrinterFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
 	OS_NATIVE_EXIT(env, that, _1gtk_1enumerate_1printers_FUNC);
 }
 #endif
@@ -12116,15 +12108,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
-/*
-	rc = (jdouble)gtk_page_setup_get_bottom_margin(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_bottom_margin)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_page_setup_get_bottom_margin((GtkPageSetup *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
 	return rc;
 }
@@ -12136,15 +12120,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
-/*
-	rc = (jdouble)gtk_page_setup_get_left_margin(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_left_margin)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_page_setup_get_left_margin((GtkPageSetup *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
 	return rc;
 }
@@ -12156,15 +12132,7 @@
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
-/*
-	rc = (jint)gtk_page_setup_get_orientation(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_orientation)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jint)gtk_page_setup_get_orientation((GtkPageSetup *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
 	return rc;
 }
@@ -12176,15 +12144,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
-/*
-	rc = (jdouble)gtk_page_setup_get_page_height(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_page_height)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_page_setup_get_page_height((GtkPageSetup *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
 	return rc;
 }
@@ -12196,15 +12156,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
-/*
-	rc = (jdouble)gtk_page_setup_get_page_width(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_page_width)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_page_setup_get_page_width((GtkPageSetup *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
 	return rc;
 }
@@ -12216,15 +12168,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
-/*
-	rc = (jdouble)gtk_page_setup_get_paper_height(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_height)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_page_setup_get_paper_height((GtkPageSetup *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
 	return rc;
 }
@@ -12236,15 +12180,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
-/*
-	rc = (jintLong)gtk_page_setup_get_paper_size(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_size)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_page_setup_get_paper_size((GtkPageSetup *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
 	return rc;
 }
@@ -12256,15 +12192,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
-/*
-	rc = (jdouble)gtk_page_setup_get_paper_width(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_paper_width)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_page_setup_get_paper_width((GtkPageSetup *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
 	return rc;
 }
@@ -12276,15 +12204,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
-/*
-	rc = (jdouble)gtk_page_setup_get_right_margin(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_right_margin)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_page_setup_get_right_margin((GtkPageSetup *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
 	return rc;
 }
@@ -12296,15 +12216,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
-/*
-	rc = (jdouble)gtk_page_setup_get_top_margin(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_get_top_margin)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_page_setup_get_top_margin((GtkPageSetup *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
 	return rc;
 }
@@ -12316,15 +12228,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1new_FUNC);
-/*
 	rc = (jintLong)gtk_page_setup_new();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_new)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
-		}
-	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1new_FUNC);
 	return rc;
 }
@@ -12335,15 +12239,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
-/*
-	gtk_page_setup_set_bottom_margin(arg0, arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_set_bottom_margin)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
-		}
-	}
+	gtk_page_setup_set_bottom_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
 }
 #endif
@@ -12353,15 +12249,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
-/*
-	gtk_page_setup_set_left_margin(arg0, arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_set_left_margin)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
-		}
-	}
+	gtk_page_setup_set_left_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
 }
 #endif
@@ -12371,15 +12259,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
-/*
-	gtk_page_setup_set_orientation(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_set_orientation)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	gtk_page_setup_set_orientation((GtkPageSetup *)arg0, (GtkPageOrientation)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
 }
 #endif
@@ -12389,15 +12269,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
-/*
-	gtk_page_setup_set_paper_size(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_set_paper_size)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
+	gtk_page_setup_set_paper_size((GtkPageSetup *)arg0, (GtkPaperSize *)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
 }
 #endif
@@ -12407,15 +12279,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
-/*
-	gtk_page_setup_set_right_margin(arg0, arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_set_right_margin)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
-		}
-	}
+	gtk_page_setup_set_right_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
 }
 #endif
@@ -12425,15 +12289,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
-/*
-	gtk_page_setup_set_top_margin(arg0, arg1, arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_page_setup_set_top_margin)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
-		}
-	}
+	gtk_page_setup_set_top_margin((GtkPageSetup *)arg0, (gdouble)arg1, (GtkUnit)arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
 }
 #endif
@@ -12816,15 +12672,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1free_FUNC);
-/*
-	gtk_paper_size_free(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_free)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	gtk_paper_size_free((GtkPaperSize *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1free_FUNC);
 }
 #endif
@@ -12835,15 +12683,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
-/*
-	rc = (jintLong)gtk_paper_size_get_display_name(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_get_display_name)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_paper_size_get_display_name((GtkPaperSize *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
 	return rc;
 }
@@ -12855,15 +12695,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
-/*
-	rc = (jdouble)gtk_paper_size_get_height(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_get_height)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_paper_size_get_height((GtkPaperSize *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
 	return rc;
 }
@@ -12875,15 +12707,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
-/*
-	rc = (jintLong)gtk_paper_size_get_name(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_get_name)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_paper_size_get_name((GtkPaperSize *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
 	return rc;
 }
@@ -12895,15 +12719,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
-/*
-	rc = (jintLong)gtk_paper_size_get_ppd_name(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_get_ppd_name)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_paper_size_get_ppd_name((GtkPaperSize *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
 	return rc;
 }
@@ -12915,15 +12731,7 @@
 {
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
-/*
-	rc = (jdouble)gtk_paper_size_get_width(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_get_width)
-		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	rc = (jdouble)gtk_paper_size_get_width((GtkPaperSize *)arg0, (GtkUnit)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
 	return rc;
 }
@@ -12935,15 +12743,7 @@
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
-/*
-	rc = (jboolean)gtk_paper_size_is_custom(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_is_custom)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jboolean)gtk_paper_size_is_custom((GtkPaperSize *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
 	return rc;
 }
@@ -12957,15 +12757,7 @@
 	jintLong rc = 0;
 	OS_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(lparg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_new)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
-		}
-	}
+	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);
@@ -12983,15 +12775,7 @@
 	OS_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(lparg0, lparg1, arg2, arg3, arg4);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_new_custom)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble, jint))fp)(lparg0, lparg1, arg2, arg3, arg4);
-		}
-	}
+	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);
@@ -13010,15 +12794,7 @@
 	OS_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(lparg0, lparg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_paper_size_new_from_ppd)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble))fp)(lparg0, lparg1, arg2, arg3);
-		}
-	}
+	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);
@@ -13047,15 +12823,7 @@
 	jintLong rc = 0;
 	OS_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(arg0, (GError **)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_job_get_surface)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, GError **))fp)(arg0, (GError **)lparg1);
-		}
-	}
+	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);
@@ -13071,15 +12839,7 @@
 	jintLong rc = 0;
 	OS_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, arg1, arg2, arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_job_new)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, jintLong, jintLong, jintLong))fp)((const gchar *)lparg0, arg1, arg2, arg3);
-		}
-	}
+	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);
@@ -13092,15 +12852,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1send_FUNC);
-/*
-	gtk_print_job_send(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_job_send)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer, GDestroyNotify))fp)(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3);
-		}
-	}
+	gtk_print_job_send((GtkPrintJob *)arg0, (GtkPrintJobCompleteFunc)arg1, (gpointer)arg2, (GDestroyNotify)arg3);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1send_FUNC);
 }
 #endif
@@ -13110,15 +12862,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1foreach_FUNC);
-/*
-	gtk_print_settings_foreach(arg0, arg1, (gpointer)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_foreach)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer))fp)(arg0, arg1, (gpointer)arg2);
-		}
-	}
+	gtk_print_settings_foreach((GtkPrintSettings *)arg0, (GtkPrintSettingsFunc)arg1, (gpointer)arg2);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1foreach_FUNC);
 }
 #endif
@@ -13131,15 +12875,7 @@
 	jintLong rc = 0;
 	OS_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(arg0, (const gchar *)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_get)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1);
-		}
-	}
+	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);
@@ -13153,15 +12889,7 @@
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
-/*
-	rc = (jboolean)gtk_print_settings_get_collate(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_get_collate)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jboolean)gtk_print_settings_get_collate((GtkPrintSettings *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
 	return rc;
 }
@@ -13173,15 +12901,7 @@
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1duplex_FUNC);
-/*
-	rc = (jint)gtk_print_settings_get_duplex(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_get_duplex)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jint)gtk_print_settings_get_duplex((GtkPrintSettings *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1duplex_FUNC);
 	return rc;
 }
@@ -13193,15 +12913,7 @@
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
-/*
-	rc = (jint)gtk_print_settings_get_n_copies(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_get_n_copies)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jint)gtk_print_settings_get_n_copies((GtkPrintSettings *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
 	return rc;
 }
@@ -13215,15 +12927,7 @@
 	jintLong rc = 0;
 	OS_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(arg0, (gint *)lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_get_page_ranges)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint *))fp)(arg0, (gint *)lparg1);
-		}
-	}
+	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);
@@ -13237,15 +12941,7 @@
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
-/*
-	rc = (jint)gtk_print_settings_get_print_pages(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_get_print_pages)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jint)gtk_print_settings_get_print_pages((GtkPrintSettings *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
 	return rc;
 }
@@ -13257,15 +12953,7 @@
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
-/*
-	rc = (jint)gtk_print_settings_get_resolution(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_get_resolution)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jint)gtk_print_settings_get_resolution((GtkPrintSettings *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
 	return rc;
 }
@@ -13277,15 +12965,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1new_FUNC);
-/*
 	rc = (jintLong)gtk_print_settings_new();
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_new)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
-		}
-	}
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1new_FUNC);
 	return rc;
 }
@@ -13300,15 +12980,7 @@
 	OS_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(arg0, (const gchar *)lparg1, (const gchar *)lparg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_set)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, const gchar *, const gchar *))fp)(arg0, (const gchar *)lparg1, (const gchar *)lparg2);
-		}
-	}
+	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);
@@ -13321,15 +12993,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
-/*
-	gtk_print_settings_set_collate(arg0, (gboolean)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_set_collate)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, gboolean))fp)(arg0, (gboolean)arg1);
-		}
-	}
+	gtk_print_settings_set_collate((GtkPrintSettings *)arg0, (gboolean)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
 }
 #endif
@@ -13339,15 +13003,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1duplex_FUNC);
-/*
-	gtk_print_settings_set_duplex(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_set_duplex)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	gtk_print_settings_set_duplex((GtkPrintSettings *)arg0, (GtkPrintDuplex)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1duplex_FUNC);
 }
 #endif
@@ -13357,15 +13013,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
-/*
-	gtk_print_settings_set_n_copies(arg0, (gint)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_set_n_copies)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1);
-		}
-	}
+	gtk_print_settings_set_n_copies((GtkPrintSettings *)arg0, (gint)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
 }
 #endif
@@ -13375,15 +13023,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
-/*
-	gtk_print_settings_set_orientation(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_set_orientation)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	gtk_print_settings_set_orientation((GtkPrintSettings *)arg0, (GtkPageOrientation)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
 }
 #endif
@@ -13395,15 +13035,7 @@
 	jint *lparg1=NULL;
 	OS_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(arg0, lparg1, (gint)arg2);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_set_page_ranges)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jint *, gint))fp)(arg0, lparg1, (gint)arg2);
-		}
-	}
+	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);
@@ -13415,15 +13047,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
-/*
-	gtk_print_settings_set_print_pages(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_set_print_pages)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
-		}
-	}
+	gtk_print_settings_set_print_pages((GtkPrintSettings *)arg0, (GtkPrintPages)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
 }
 #endif
@@ -13435,15 +13059,7 @@
 	jbyte *lparg1=NULL;
 	OS_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(arg0, lparg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_settings_set_printer)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
-		}
-	}
+	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);
@@ -13456,15 +13072,7 @@
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
-/*
-	rc = (jint)gtk_print_unix_dialog_get_current_page(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_current_page)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jint)gtk_print_unix_dialog_get_current_page((GtkPrintUnixDialog *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
 	return rc;
 }
@@ -13476,15 +13084,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
-/*
-	rc = (jintLong)gtk_print_unix_dialog_get_page_setup(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_page_setup)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_print_unix_dialog_get_page_setup((GtkPrintUnixDialog *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
 	return rc;
 }
@@ -13496,15 +13096,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
-/*
-	rc = (jintLong)gtk_print_unix_dialog_get_selected_printer(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_selected_printer)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_print_unix_dialog_get_selected_printer((GtkPrintUnixDialog *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
 	return rc;
 }
@@ -13516,15 +13108,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
-/*
-	rc = (jintLong)gtk_print_unix_dialog_get_settings(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_settings)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_print_unix_dialog_get_settings((GtkPrintUnixDialog *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
 	return rc;
 }
@@ -13538,15 +13122,7 @@
 	jintLong rc = 0;
 	OS_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);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_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_1print_1unix_1dialog_1new_FUNC);
@@ -13559,15 +13135,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
-/*
-	gtk_print_unix_dialog_set_current_page(arg0, (gint)arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_current_page)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1);
-		}
-	}
+	gtk_print_unix_dialog_set_current_page((GtkPrintUnixDialog *)arg0, (gint)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
 }
 #endif
@@ -13595,15 +13163,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
-/*
-	gtk_print_unix_dialog_set_manual_capabilities(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_manual_capabilities)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
+	gtk_print_unix_dialog_set_manual_capabilities((GtkPrintUnixDialog *)arg0, (GtkPrintCapabilities)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
 }
 #endif
@@ -13613,15 +13173,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
-/*
-	gtk_print_unix_dialog_set_page_setup(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_page_setup)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
+	gtk_print_unix_dialog_set_page_setup((GtkPrintUnixDialog *)arg0, (GtkPageSetup *)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
 }
 #endif
@@ -13631,15 +13183,7 @@
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
-/*
-	gtk_print_unix_dialog_set_settings(arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_settings)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
-		}
-	}
+	gtk_print_unix_dialog_set_settings((GtkPrintUnixDialog *)arg0, (GtkPrintSettings *)arg1);
 	OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
 }
 #endif
@@ -13650,15 +13194,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1backend_FUNC);
-/*
-	rc = (jintLong)gtk_printer_get_backend(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_printer_get_backend)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_printer_get_backend((GtkPrinter *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1backend_FUNC);
 	return rc;
 }
@@ -13670,15 +13206,7 @@
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1name_FUNC);
-/*
-	rc = (jintLong)gtk_printer_get_name(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_printer_get_name)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jintLong)gtk_printer_get_name((GtkPrinter *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1name_FUNC);
 	return rc;
 }
@@ -13690,15 +13218,7 @@
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, _1gtk_1printer_1is_1default_FUNC);
-/*
-	rc = (jboolean)gtk_printer_is_default(arg0);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gtk_printer_is_default)
-		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
-		}
-	}
+	rc = (jboolean)gtk_printer_is_default((GtkPrinter *)arg0);
 	OS_NATIVE_EXIT(env, that, _1gtk_1printer_1is_1default_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index 3529430..69bbe4e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <gtk/gtkunixprint.h>
 #if GTK_CHECK_VERSION(3,0,0)
 #include <gtk/gtkx.h>
 #include <gdk/gdkx.h>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
index ed4074d..a30af52 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
@@ -395,7 +395,6 @@
 #define gdk_cairo_create_LIB LIB_GDK
 #define gdk_colormap_alloc_color_LIB LIB_GDK
 #define gdk_colormap_free_colors_LIB LIB_GDK
-#define gtk_enumerate_printers_LIB LIB_GTK
 #define gtk_orientable_set_orientation_LIB LIB_GTK
 #define gtk_paint_arrow_LIB LIB_GTK
 #define gtk_paint_box_LIB LIB_GTK
@@ -412,75 +411,7 @@
 #define gtk_paint_shadow_gap_LIB LIB_GTK
 #define gtk_paint_option_LIB LIB_GTK
 #define gtk_paint_layout_LIB LIB_GTK
-#define gtk_page_setup_get_bottom_margin_LIB LIB_GTK
-#define gtk_page_setup_get_left_margin_LIB LIB_GTK
-#define gtk_page_setup_get_orientation_LIB LIB_GTK
-#define gtk_page_setup_get_page_height_LIB LIB_GTK
-#define gtk_page_setup_get_page_width_LIB LIB_GTK
-#define gtk_page_setup_get_paper_height_LIB LIB_GTK
-#define gtk_page_setup_get_paper_size_LIB LIB_GTK
-#define gtk_page_setup_get_paper_width_LIB LIB_GTK
-#define gtk_page_setup_get_right_margin_LIB LIB_GTK
-#define gtk_page_setup_get_top_margin_LIB LIB_GTK
-#define gtk_page_setup_new_LIB LIB_GTK
-#define gtk_page_setup_set_bottom_margin_LIB LIB_GTK
-#define gtk_page_setup_set_left_margin_LIB LIB_GTK
-#define gtk_page_setup_set_orientation_LIB LIB_GTK
-#define gtk_page_setup_set_paper_size_LIB LIB_GTK
-#define gtk_page_setup_set_right_margin_LIB LIB_GTK
-#define gtk_page_setup_set_top_margin_LIB LIB_GTK
-#define gtk_paper_size_free_LIB LIB_GTK
-#define gtk_paper_size_get_display_name_LIB LIB_GTK
-#define gtk_paper_size_get_name_LIB LIB_GTK
-#define gtk_paper_size_get_ppd_name_LIB LIB_GTK
-#define gtk_paper_size_get_height_LIB LIB_GTK
-#define gtk_paper_size_get_width_LIB LIB_GTK
-#define gtk_paper_size_is_custom_LIB LIB_GTK
-#define gtk_paper_size_new_LIB LIB_GTK
-#define gtk_paper_size_new_custom_LIB LIB_GTK
-#define gtk_paper_size_new_from_ppd_LIB LIB_GTK
-#define gtk_print_job_get_printer_LIB LIB_GTK
-#define gtk_print_job_get_settings_LIB LIB_GTK
-#define gtk_print_job_get_status_LIB LIB_GTK
-#define gtk_print_job_get_surface_LIB LIB_GTK
-#define gtk_print_job_get_title_LIB LIB_GTK
-#define gtk_print_job_new_LIB LIB_GTK
-#define gtk_print_job_send_LIB LIB_GTK
-#define gtk_print_job_set_source_file_LIB LIB_GTK
-#define gtk_print_settings_foreach_LIB LIB_GTK
-#define gtk_print_settings_get_LIB LIB_GTK
-#define gtk_print_settings_get_collate_LIB LIB_GTK
-#define gtk_print_settings_get_duplex_LIB LIB_GTK
-#define gtk_print_settings_get_n_copies_LIB LIB_GTK
-#define gtk_print_settings_get_orientation_LIB LIB_GTK
-#define gtk_print_settings_get_page_ranges_LIB LIB_GTK
-#define gtk_print_settings_get_paper_height_LIB LIB_GTK
-#define gtk_print_settings_get_paper_width_LIB LIB_GTK
-#define gtk_print_settings_get_print_pages_LIB LIB_GTK
-#define gtk_print_settings_get_printer_LIB LIB_GTK
-#define gtk_print_settings_get_resolution_LIB LIB_GTK
-#define gtk_print_settings_new_LIB LIB_GTK
-#define gtk_print_settings_set_LIB LIB_GTK
-#define gtk_print_settings_set_collate_LIB LIB_GTK
-#define gtk_print_settings_set_duplex_LIB LIB_GTK
-#define gtk_print_settings_set_n_copies_LIB LIB_GTK
-#define gtk_print_settings_set_orientation_LIB LIB_GTK
-#define gtk_print_settings_set_page_ranges_LIB LIB_GTK
-#define gtk_print_settings_set_print_pages_LIB LIB_GTK
-#define gtk_print_settings_set_printer_LIB LIB_GTK
-#define gtk_print_unix_dialog_get_current_page_LIB LIB_GTK
-#define gtk_print_unix_dialog_get_page_setup_LIB LIB_GTK
-#define gtk_print_unix_dialog_get_selected_printer_LIB LIB_GTK
-#define gtk_print_unix_dialog_get_settings_LIB LIB_GTK
-#define gtk_print_unix_dialog_new_LIB LIB_GTK
-#define gtk_print_unix_dialog_set_current_page_LIB LIB_GTK
-#define gtk_print_unix_dialog_set_manual_capabilities_LIB LIB_GTK
 #define gtk_print_unix_dialog_set_embed_page_setup_LIB LIB_GTK
-#define gtk_print_unix_dialog_set_page_setup_LIB LIB_GTK
-#define gtk_print_unix_dialog_set_settings_LIB LIB_GTK
-#define gtk_printer_get_backend_LIB LIB_GTK
-#define gtk_printer_get_name_LIB LIB_GTK
-#define gtk_printer_is_default_LIB LIB_GTK
 #define gtk_render_check_LIB LIB_GTK
 #define gtk_render_extension_LIB LIB_GTK
 #define gtk_render_expander_LIB LIB_GTK
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 2005a4c..d9f1dda 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -9052,7 +9052,6 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
 public static final native long /*int*/ _gtk_page_setup_new ();
 public static final long /*int*/ gtk_page_setup_new () {
 	lock.lock();
@@ -9062,7 +9061,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ */
 public static final native int _gtk_page_setup_get_orientation(long /*int*/ setup);
 public static final int gtk_page_setup_get_orientation(long /*int*/ setup) {
 	lock.lock();
@@ -9072,7 +9073,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param orientation cast=(GtkPageOrientation)
+ */
 public static final native void _gtk_page_setup_set_orientation(long /*int*/ setup, int orientation);
 public static final void gtk_page_setup_set_orientation(long /*int*/ setup, int orientation) {
 	lock.lock();
@@ -9082,7 +9086,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ */
 public static final native long /*int*/ _gtk_page_setup_get_paper_size(long /*int*/ setup);
 public static final long /*int*/ gtk_page_setup_get_paper_size(long /*int*/ setup) {
 	lock.lock();
@@ -9092,7 +9098,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param size cast=(GtkPaperSize *)
+ */
 public static final native void _gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size);
 public static final void gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size) {
 	lock.lock();
@@ -9102,7 +9111,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_page_setup_get_top_margin(long /*int*/ setup, int unit);
 public static final double gtk_page_setup_get_top_margin(long /*int*/ setup, int unit) {
 	lock.lock();
@@ -9112,7 +9124,11 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param margin cast=(gdouble)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native void _gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit);
 public static final void gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit) {
 	lock.lock();
@@ -9122,7 +9138,11 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param setup cast=(GtkPageSetup *)
+ * @param unit cast=(GtkUnit)
+ *  
+ */
 public static final native double _gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit);
 public static final double gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit) {
 	lock.lock();
@@ -9132,7 +9152,11 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param margin cast=(gdouble)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native void _gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit);
 public static final void gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit) {
 	lock.lock();
@@ -9142,7 +9166,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_page_setup_get_left_margin(long /*int*/ setup, int unit);
 public static final double gtk_page_setup_get_left_margin(long /*int*/ setup, int unit) {
 	lock.lock();
@@ -9152,7 +9179,11 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param margin cast=(gdouble)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native void _gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit);
 public static final void gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit) {
 	lock.lock();
@@ -9162,7 +9193,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_page_setup_get_right_margin(long /*int*/ setup, int unit);
 public static final double gtk_page_setup_get_right_margin(long /*int*/ setup, int unit) {
 	lock.lock();
@@ -9172,7 +9206,11 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param margin cast=(gdouble)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native void _gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit);
 public static final void gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit) {
 	lock.lock();
@@ -9182,7 +9220,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_page_setup_get_paper_width(long /*int*/ setup, int unit);
 public static final double gtk_page_setup_get_paper_width(long /*int*/ setup, int unit) {
 	lock.lock();
@@ -9192,7 +9233,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_page_setup_get_paper_height(long /*int*/ setup, int unit);
 public static final double gtk_page_setup_get_paper_height(long /*int*/ setup, int unit) {
 	lock.lock();
@@ -9202,7 +9246,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_page_setup_get_page_width(long /*int*/ setup, int unit);
 public static final double gtk_page_setup_get_page_width(long /*int*/ setup, int unit) {
 	lock.lock();
@@ -9212,7 +9259,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param setup cast=(GtkPageSetup *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_page_setup_get_page_height(long /*int*/ setup, int unit);
 public static final double gtk_page_setup_get_page_height(long /*int*/ setup, int unit) {
 	lock.lock();
@@ -9628,7 +9678,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param size cast=(GtkPaperSize *)
+ */
 public static final native void _gtk_paper_size_free(long /*int*/ size);
 public static final void gtk_paper_size_free(long /*int*/ size) {
 	lock.lock();
@@ -9638,7 +9690,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param name cast=(const gchar *)
+ */
 public static final native long /*int*/ _gtk_paper_size_new(byte [] name);
 public static final long /*int*/ gtk_paper_size_new(byte [] name) {
 	lock.lock();
@@ -9648,7 +9702,12 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param ppd_name cast=(const gchar *)
+ * @param ppd_display_name cast=(const gchar *)
+ * @param width cast=(gdouble)
+ * @param height cast=(gdouble)
+ */
 public static final native long /*int*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);
 public static final long /*int*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {
 	lock.lock();
@@ -9658,7 +9717,13 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param name cast=(const gchar *)
+ * @param display_name cast=(const gchar *)
+ * @param width cast=(gdouble)
+ * @param height cast=(gdouble)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native long /*int*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);
 public static final long /*int*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {
 	lock.lock();
@@ -9668,7 +9733,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param size cast=(GtkPaperSize *)
+ */
 public static final native long /*int*/ _gtk_paper_size_get_name(long /*int*/ size);
 public static final long /*int*/ gtk_paper_size_get_name(long /*int*/ size) {
 	lock.lock();
@@ -9678,7 +9745,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param size cast=(GtkPaperSize *)
+ */
 public static final native long /*int*/ _gtk_paper_size_get_display_name(long /*int*/ size);
 public static final long /*int*/ gtk_paper_size_get_display_name(long /*int*/ size) {
 	lock.lock();
@@ -9688,7 +9757,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param size cast=(GtkPaperSize *)
+ */
 public static final native long /*int*/ _gtk_paper_size_get_ppd_name(long /*int*/ size);
 public static final long /*int*/ gtk_paper_size_get_ppd_name(long /*int*/ size) {
 	lock.lock();
@@ -9698,7 +9769,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param size cast=(GtkPaperSize *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_paper_size_get_width(long /*int*/ size, int unit);
 public static final double gtk_paper_size_get_width(long /*int*/ size, int unit) {
 	lock.lock();
@@ -9708,7 +9782,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param size cast=(GtkPaperSize *)
+ * @param unit cast=(GtkUnit)
+ */
 public static final native double _gtk_paper_size_get_height(long /*int*/ size, int unit);
 public static final double gtk_paper_size_get_height(long /*int*/ size, int unit) {
 	lock.lock();
@@ -9718,7 +9795,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param size cast=(GtkPaperSize *)
+ */
 public static final native boolean _gtk_paper_size_is_custom(long /*int*/ size);
 public static final boolean gtk_paper_size_is_custom(long /*int*/ size) {
 	lock.lock();
@@ -9737,7 +9816,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param printer cast=(GtkPrinter *)
+ */
 public static final native long /*int*/ _gtk_printer_get_backend(long /*int*/ printer);
 public static final long /*int*/ gtk_printer_get_backend(long /*int*/ printer) {
 	lock.lock();
@@ -9747,7 +9828,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param printer cast=(GtkPrinter *)
+ */
 public static final native long /*int*/ _gtk_printer_get_name(long /*int*/ printer);
 public static final long /*int*/ gtk_printer_get_name(long /*int*/ printer) {
 	lock.lock();
@@ -9757,7 +9840,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param printer cast=(GtkPrinter *)
+ */
 public static final native boolean _gtk_printer_is_default(long /*int*/ printer);
 public static final boolean gtk_printer_is_default(long /*int*/ printer) {
 	lock.lock();
@@ -9768,7 +9853,7 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param func cast=(GtkPrinterFunc)
  * @param data cast=(gpointer)
  * @param destroy cast=(GDestroyNotify)
  * @param wait cast=(gboolean)
@@ -9783,8 +9868,10 @@
 	}
 }
 /**
- * @method flags=dynamic
  * @param title cast=(const gchar *)
+ * @param printer cast=(GtkPrinter *)
+ * @param settings cast=(GtkPrintSettings *)
+ * @param page_setup cast=(GtkPageSetup *)
  */
 public static final native long /*int*/ _gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup);
 public static final long /*int*/ gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup) {
@@ -9796,7 +9883,7 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param job cast=(GtkPrintJob *)
  * @param error cast=(GError **)
  */
 public static final native long /*int*/ _gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]);
@@ -9809,7 +9896,8 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param job cast=(GtkPrintJob *)
+ * @param callback cast=(GtkPrintJobCompleteFunc)
  * @param user_data cast=(gpointer)
  * @param dnotify cast=(GDestroyNotify)
  */
@@ -9822,7 +9910,6 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
 public static final native long /*int*/ _gtk_print_settings_new();
 public static final long /*int*/ gtk_print_settings_new() {
 	lock.lock();
@@ -9833,7 +9920,8 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param settings cast=(GtkPrintSettings *)
+ * @param func cast=(GtkPrintSettingsFunc)
  * @param data cast=(gpointer)
  */
 public static final native void _gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data);
@@ -9846,7 +9934,7 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param settings cast=(GtkPrintSettings *)
  * @param key cast=(const gchar *)
  */
 public static final native long /*int*/ _gtk_print_settings_get(long /*int*/ settings, byte [] key);
@@ -9859,7 +9947,7 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param settings cast=(GtkPrintSettings *)
  * @param key cast=(const gchar *)
  * @param value cast=(const gchar *)
  */
@@ -9872,7 +9960,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ * @param printer cast=(const gchar *)
+ */
 public static final native void _gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer);
 public static final void gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer) {
 	lock.lock();
@@ -9882,7 +9973,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ * @param orientation cast=(GtkPageOrientation)
+ */
 public static final native void _gtk_print_settings_set_orientation(long /*int*/ settings, int orientation);
 public static final void gtk_print_settings_set_orientation(long /*int*/ settings, int orientation) {
 	lock.lock();
@@ -9892,7 +9986,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ */
 public static final native boolean _gtk_print_settings_get_collate(long /*int*/ settings);
 public static final boolean gtk_print_settings_get_collate(long /*int*/ settings) {
 	lock.lock();
@@ -9903,7 +9999,7 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param settings cast=(GtkPrintSettings *)
  * @param collate cast=(gboolean)
  */
 public static final native void _gtk_print_settings_set_collate(long /*int*/ settings, boolean collate);
@@ -9915,7 +10011,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ */
 public static final native int _gtk_print_settings_get_duplex(long /*int*/ settings);
 public static final int gtk_print_settings_get_duplex(long /*int*/ settings) {
 	lock.lock();
@@ -9925,7 +10023,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ * @param duplex cast=(GtkPrintDuplex)
+ */
 public static final native void _gtk_print_settings_set_duplex(long /*int*/ settings, int duplex);
 public static final void gtk_print_settings_set_duplex(long /*int*/ settings, int duplex) {
 	lock.lock();
@@ -9935,7 +10036,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ */
 public static final native int _gtk_print_settings_get_n_copies(long /*int*/ settings);
 public static final int gtk_print_settings_get_n_copies(long /*int*/ settings) {
 	lock.lock();
@@ -9946,7 +10049,7 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param settings cast=(GtkPrintSettings *)
  * @param num_copies cast=(gint)
  */
 public static final native void _gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies);
@@ -9958,7 +10061,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ */
 public static final native int _gtk_print_settings_get_print_pages(long /*int*/ settings);
 public static final int gtk_print_settings_get_print_pages(long /*int*/ settings) {
 	lock.lock();
@@ -9968,7 +10073,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ * @param pages cast=(GtkPrintPages)
+ */
 public static final native void _gtk_print_settings_set_print_pages(long /*int*/ settings, int pages);
 public static final void gtk_print_settings_set_print_pages(long /*int*/ settings, int pages) {
 	lock.lock();
@@ -9979,7 +10087,7 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param settings cast=(GtkPrintSettings *)
  * @param num_ranges cast=(gint *)
  */
 public static final native long /*int*/ _gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges);
@@ -9992,7 +10100,8 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param settings cast=(GtkPrintSettings *)
+ * @param page_ranges cast=(GtkPageRange *)
  * @param num_ranges cast=(gint)
  */
 public static final native void _gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges);
@@ -10004,7 +10113,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/**
+ * @param settings cast=(GtkPrintSettings *)
+ */
 public static final native int _gtk_print_settings_get_resolution(long /*int*/ settings);
 public static final int gtk_print_settings_get_resolution(long /*int*/ settings) {
 	lock.lock();
@@ -10015,7 +10126,6 @@
 	}
 }
 /**
- * @method flags=dynamic
  * @param title cast=(const gchar *)
  * @param parent cast=(GtkWindow *)
  */
@@ -10038,7 +10148,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param dialog cast=(GtkPrintUnixDialog *)
+ * @param page_setup cast=(GtkPageSetup *)
+ */
 public static final native void _gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup);
 public static final void gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup) {
 	lock.lock();
@@ -10048,7 +10161,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param dialog cast=(GtkPrintUnixDialog *)
+ */
 public static final native long /*int*/ _gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog);
 public static final long /*int*/ gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog) {
 	lock.lock();
@@ -10059,7 +10174,7 @@
 	}
 }
 /**
- * @method flags=dynamic
+ * @param dialog cast=(GtkPrintUnixDialog *)
  * @param current_page cast=(gint)
  */
 public static final native void _gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page);
@@ -10071,7 +10186,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param dialog cast=(GtkPrintUnixDialog *)
+ */
 public static final native int _gtk_print_unix_dialog_get_current_page(long /*int*/ dialog);
 public static final int gtk_print_unix_dialog_get_current_page(long /*int*/ dialog) {
 	lock.lock();
@@ -10081,7 +10198,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param dialog cast=(GtkPrintUnixDialog *)
+ * @param settings cast=(GtkPrintSettings *)
+ */
 public static final native void _gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings);
 public static final void gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings) {
 	lock.lock();
@@ -10091,7 +10211,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param dialog cast=(GtkPrintUnixDialog *)
+ */
 public static final native long /*int*/ _gtk_print_unix_dialog_get_settings(long /*int*/ dialog);
 public static final long /*int*/ gtk_print_unix_dialog_get_settings(long /*int*/ dialog) {
 	lock.lock();
@@ -10101,7 +10223,9 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param dialog cast=(GtkPrintUnixDialog *)
+ */
 public static final native long /*int*/ _gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog);
 public static final long /*int*/ gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog) {
 	lock.lock();
@@ -10111,7 +10235,10 @@
 		lock.unlock();
 	}
 }
-/** @method flags=dynamic */
+/** 
+ * @param dialog cast=(GtkPrintUnixDialog *)
+ * @param capabilities cast=(GtkPrintCapabilities)
+ */
 public static final native void _gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities);
 public static final void gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities) {
 	lock.lock();