changes to support 64bit

9 files changed, 1070 insertions, 931 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_gtk.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_gtk.mak
index 42ac8c0bf3..af7396a72c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_gtk.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_gtk.mak
@@ -86,7 +86,7 @@ LIBS = -shared -fpic -fPIC
 #  Target Rules
 #
 
-all: make_swt make_awt make_atk make_gnome make_mozilla
+all: make_swt #make_awt make_atk make_gnome make_mozilla
 
 #
 # SWT libs
@@ -102,7 +102,7 @@ callback.o: callback.c callback.h
 $(SWTPI_LIB): $(SWTPI_OBJECTS)
 	$(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
 
-os.o: os.c os.h swt.h
+os.o: os.c os.h swt.h os_custom.h
 	$(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
 os_structs.o: os_structs.c os_structs.h os.h swt.h
 	$(CC) $(CFLAGS) $(GTKCFLAGS) -c os_structs.c 
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 069aa4dd4c..b9f6e8428c 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
@@ -54,6 +54,40 @@ JNIEXPORT jint JNICALL OS_NATIVE(GDK_1TYPE_1PIXBUF)
 }
 #endif
 
+#ifndef NO_GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING\n")
+	rc = (jint)GTK_ACCEL_LABEL_GET_ACCEL_STRING((GtkAccelLabel *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING
+JNIEXPORT void JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING\n")
+	GTK_ACCEL_LABEL_SET_ACCEL_STRING((GtkAccelLabel *)arg0, (gchar *)arg1);
+	NATIVE_EXIT(env, that, "GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING\n")
+}
+#endif
+
+#ifndef NO_GTK_1ENTRY_1IM_1CONTEXT
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1ENTRY_1IM_1CONTEXT\n")
+	rc = (jint)GTK_ENTRY_IM_CONTEXT((GtkEntry *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1ENTRY_1IM_1CONTEXT\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_GTK_1IS_1BUTTON
 JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1IS_1BUTTON)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -90,6 +124,54 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1IS_1IMAGE_1MENU_1ITEM)
 }
 #endif
 
+#ifndef NO_GTK_1SCROLLED_1WINDOW_1HSCROLLBAR
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1SCROLLED_1WINDOW_1HSCROLLBAR\n")
+	rc = (jint)GTK_SCROLLED_WINDOW_HSCROLLBAR((GtkScrolledWindow *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1SCROLLED_1WINDOW_1HSCROLLBAR\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING\n")
+	rc = (jint)GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING((GtkScrolledWindow *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GTK_1SCROLLED_1WINDOW_1VSCROLLBAR
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1SCROLLED_1WINDOW_1VSCROLLBAR\n")
+	rc = (jint)GTK_SCROLLED_WINDOW_VSCROLLBAR((GtkScrolledWindow *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1SCROLLED_1WINDOW_1VSCROLLBAR\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GTK_1TEXTVIEW_1IM_1CONTEXT
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1TEXTVIEW_1IM_1CONTEXT\n")
+	rc = (jint)GTK_TEXTVIEW_IM_CONTEXT((GtkTextView *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1TEXTVIEW_1IM_1CONTEXT\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_GTK_1WIDGET_1FLAGS
 JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1FLAGS)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -126,6 +208,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1WIDGET_1HAS_1FOCUS)
 }
 #endif
 
+#ifndef NO_GTK_1WIDGET_1HEIGHT
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1HEIGHT)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1WIDGET_1HEIGHT\n")
+	rc = (jint)GTK_WIDGET_HEIGHT((GtkWidget *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1WIDGET_1HEIGHT\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_GTK_1WIDGET_1IS_1SENSITIVE
 JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1WIDGET_1IS_1SENSITIVE)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -194,6 +288,54 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GTK_1WIDGET_1VISIBLE)
 }
 #endif
 
+#ifndef NO_GTK_1WIDGET_1WIDTH
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WIDTH)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1WIDGET_1WIDTH\n")
+	rc = (jint)GTK_WIDGET_WIDTH((GtkWidget *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1WIDGET_1WIDTH\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GTK_1WIDGET_1WINDOW
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1WIDGET_1WINDOW\n")
+	rc = (jint)GTK_WIDGET_WINDOW((GtkWidget *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1WIDGET_1WINDOW\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GTK_1WIDGET_1X
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1X)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1WIDGET_1X\n")
+	rc = (jint)GTK_WIDGET_X((GtkWidget *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1WIDGET_1X\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GTK_1WIDGET_1Y
+JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1Y)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GTK_1WIDGET_1Y\n")
+	rc = (jint)GTK_WIDGET_Y((GtkWidget *)arg0);
+	NATIVE_EXIT(env, that, "GTK_1WIDGET_1Y\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_G_1TYPE_1BOOLEAN
 JNIEXPORT jint JNICALL OS_NATIVE(G_1TYPE_1BOOLEAN)
 	(JNIEnv *env, jclass that)
@@ -230,6 +372,294 @@ JNIEXPORT jint JNICALL OS_NATIVE(G_1TYPE_1STRING)
 }
 #endif
 
+#ifndef NO_GdkColor_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkColor_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkColor_1sizeof\n")
+	rc = (jint)GdkColor_sizeof();
+	NATIVE_EXIT(env, that, "GdkColor_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkDragContext_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkDragContext_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkDragContext_1sizeof\n")
+	rc = (jint)GdkDragContext_sizeof();
+	NATIVE_EXIT(env, that, "GdkDragContext_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventButton_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventButton_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkEventButton_1sizeof\n")
+	rc = (jint)GdkEventButton_sizeof();
+	NATIVE_EXIT(env, that, "GdkEventButton_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventCrossing_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventCrossing_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkEventCrossing_1sizeof\n")
+	rc = (jint)GdkEventCrossing_sizeof();
+	NATIVE_EXIT(env, that, "GdkEventCrossing_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventExpose_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventExpose_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkEventExpose_1sizeof\n")
+	rc = (jint)GdkEventExpose_sizeof();
+	NATIVE_EXIT(env, that, "GdkEventExpose_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventFocus_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventFocus_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkEventFocus_1sizeof\n")
+	rc = (jint)GdkEventFocus_sizeof();
+	NATIVE_EXIT(env, that, "GdkEventFocus_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventKey_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventKey_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkEventKey_1sizeof\n")
+	rc = (jint)GdkEventKey_sizeof();
+	NATIVE_EXIT(env, that, "GdkEventKey_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEventWindowState_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEventWindowState_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkEventWindowState_1sizeof\n")
+	rc = (jint)GdkEventWindowState_sizeof();
+	NATIVE_EXIT(env, that, "GdkEventWindowState_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkEvent_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkEvent_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkEvent_1sizeof\n")
+	rc = (jint)GdkEvent_sizeof();
+	NATIVE_EXIT(env, that, "GdkEvent_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkGCValues_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkGCValues_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkGCValues_1sizeof\n")
+	rc = (jint)GdkGCValues_sizeof();
+	NATIVE_EXIT(env, that, "GdkGCValues_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkImage_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkImage_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkImage_1sizeof\n")
+	rc = (jint)GdkImage_sizeof();
+	NATIVE_EXIT(env, that, "GdkImage_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkRectangle_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkRectangle_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkRectangle_1sizeof\n")
+	rc = (jint)GdkRectangle_sizeof();
+	NATIVE_EXIT(env, that, "GdkRectangle_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GdkVisual_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GdkVisual_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GdkVisual_1sizeof\n")
+	rc = (jint)GdkVisual_sizeof();
+	NATIVE_EXIT(env, that, "GdkVisual_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkAdjustment_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkAdjustment_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkAdjustment_1sizeof\n")
+	rc = (jint)GtkAdjustment_sizeof();
+	NATIVE_EXIT(env, that, "GtkAdjustment_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkAllocation_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkAllocation_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkAllocation_1sizeof\n")
+	rc = (jint)GtkAllocation_sizeof();
+	NATIVE_EXIT(env, that, "GtkAllocation_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkColorSelectionDialog_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkColorSelectionDialog_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkColorSelectionDialog_1sizeof\n")
+	rc = (jint)GtkColorSelectionDialog_sizeof();
+	NATIVE_EXIT(env, that, "GtkColorSelectionDialog_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkCombo_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkCombo_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkCombo_1sizeof\n")
+	rc = (jint)GtkCombo_sizeof();
+	NATIVE_EXIT(env, that, "GtkCombo_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkFileSelection_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkFileSelection_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkFileSelection_1sizeof\n")
+	rc = (jint)GtkFileSelection_sizeof();
+	NATIVE_EXIT(env, that, "GtkFileSelection_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkFixed_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkFixed_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkFixed_1sizeof\n")
+	rc = (jint)GtkFixed_sizeof();
+	NATIVE_EXIT(env, that, "GtkFixed_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkRequisition_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkRequisition_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkRequisition_1sizeof\n")
+	rc = (jint)GtkRequisition_sizeof();
+	NATIVE_EXIT(env, that, "GtkRequisition_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkSelectionData_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkSelectionData_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkSelectionData_1sizeof\n")
+	rc = (jint)GtkSelectionData_sizeof();
+	NATIVE_EXIT(env, that, "GtkSelectionData_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkTargetEntry_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkTargetEntry_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkTargetEntry_1sizeof\n")
+	rc = (jint)GtkTargetEntry_sizeof();
+	NATIVE_EXIT(env, that, "GtkTargetEntry_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkTargetPair_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkTargetPair_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkTargetPair_1sizeof\n")
+	rc = (jint)GtkTargetPair_sizeof();
+	NATIVE_EXIT(env, that, "GtkTargetPair_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_GtkTreeIter_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(GtkTreeIter_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "GtkTreeIter_1sizeof\n")
+	rc = (jint)GtkTreeIter_sizeof();
+	NATIVE_EXIT(env, that, "GtkTreeIter_1sizeof\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_PANGO_1PIXELS
 JNIEXPORT jint JNICALL OS_NATIVE(PANGO_1PIXELS)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -254,6 +684,42 @@ JNIEXPORT jint JNICALL OS_NATIVE(PANGO_1TYPE_1FONT_1DESCRIPTION)
 }
 #endif
 
+#ifndef NO_PTR_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PTR_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "PTR_1sizeof\n")
+	rc = (jint)PTR_sizeof();
+	NATIVE_EXIT(env, that, "PTR_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoAttribute_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoAttribute_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "PangoAttribute_1sizeof\n")
+	rc = (jint)PangoAttribute_sizeof();
+	NATIVE_EXIT(env, that, "PangoAttribute_1sizeof\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_PangoRectangle_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(PangoRectangle_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "PangoRectangle_1sizeof\n")
+	rc = (jint)PangoRectangle_sizeof();
+	NATIVE_EXIT(env, that, "PangoRectangle_1sizeof\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_XDefaultScreen
 JNIEXPORT jint JNICALL OS_NATIVE(XDefaultScreen)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -293,6 +759,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(XSetInputFocus)
 }
 #endif
 
+#ifndef NO_XWindowChanges_1sizeof
+JNIEXPORT jint JNICALL OS_NATIVE(XWindowChanges_1sizeof)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "XWindowChanges_1sizeof\n")
+	rc = (jint)XWindowChanges_sizeof();
+	NATIVE_EXIT(env, that, "XWindowChanges_1sizeof\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_g_1filename_1from_1uri
 JNIEXPORT jint JNICALL OS_NATIVE(g_1filename_1from_1uri)
 	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
@@ -422,14 +900,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(g_1list_1length)
 }
 #endif
 
-#ifndef NO_g_1list_1next__I
-JNIEXPORT jint JNICALL OS_NATIVE(g_1list_1next__I)
+#ifndef NO_g_1list_1next
+JNIEXPORT jint JNICALL OS_NATIVE(g_1list_1next)
 	(JNIEnv *env, jclass that, jint arg0)
 {
 	jint rc;
-	NATIVE_ENTER(env, that, "g_1list_1next__I\n")
+	NATIVE_ENTER(env, that, "g_1list_1next\n")
 	rc = (jint)g_list_next(arg0);
-	NATIVE_EXIT(env, that, "g_1list_1next__I\n")
+	NATIVE_EXIT(env, that, "g_1list_1next\n")
 	return rc;
 }
 #endif
@@ -470,14 +948,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(g_1list_1prepend)
 }
 #endif
 
-#ifndef NO_g_1list_1previous__I
-JNIEXPORT jint JNICALL OS_NATIVE(g_1list_1previous__I)
+#ifndef NO_g_1list_1previous
+JNIEXPORT jint JNICALL OS_NATIVE(g_1list_1previous)
 	(JNIEnv *env, jclass that, jint arg0)
 {
 	jint rc;
-	NATIVE_ENTER(env, that, "g_1list_1previous__I\n")
+	NATIVE_ENTER(env, that, "g_1list_1previous\n")
 	rc = (jint)g_list_previous(arg0);
-	NATIVE_EXIT(env, that, "g_1list_1previous__I\n")
+	NATIVE_EXIT(env, that, "g_1list_1previous\n")
 	return rc;
 }
 #endif
@@ -506,6 +984,26 @@ JNIEXPORT jint JNICALL OS_NATIVE(g_1list_1reverse)
 }
 #endif
 
+#ifndef NO_g_1list_1set_1next
+JNIEXPORT void JNICALL OS_NATIVE(g_1list_1set_1next)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "g_1list_1set_1next\n")
+	g_list_set_next((GList *)arg0, (GList *)arg1);
+	NATIVE_EXIT(env, that, "g_1list_1set_1next\n")
+}
+#endif
+
+#ifndef NO_g_1list_1set_1previous
+JNIEXPORT void JNICALL OS_NATIVE(g_1list_1set_1previous)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "g_1list_1set_1previous\n")
+	g_list_set_previous((GList *)arg0, (GList *)arg1);
+	NATIVE_EXIT(env, that, "g_1list_1set_1previous\n")
+}
+#endif
+
 #ifndef NO_g_1locale_1from_1utf8
 JNIEXPORT jint JNICALL OS_NATIVE(g_1locale_1from_1utf8)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
@@ -900,7 +1398,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(g_1utf16_1to_1utf8)
 
 #ifndef NO_g_1utf8_1offset_1to_1pointer
 JNIEXPORT jint JNICALL OS_NATIVE(g_1utf8_1offset_1to_1pointer)
-	(JNIEnv *env, jclass that, jint arg0, jlong arg1)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
 	jint rc;
 	NATIVE_ENTER(env, that, "g_1utf8_1offset_1to_1pointer\n")
@@ -911,12 +1409,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(g_1utf8_1offset_1to_1pointer)
 #endif
 
 #ifndef NO_g_1utf8_1pointer_1to_1offset
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf8_1pointer_1to_1offset)
+JNIEXPORT jint JNICALL OS_NATIVE(g_1utf8_1pointer_1to_1offset)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
 {
-	jlong rc;
+	jint rc;
 	NATIVE_ENTER(env, that, "g_1utf8_1pointer_1to_1offset\n")
-	rc = (jlong)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
+	rc = (jint)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
 	NATIVE_EXIT(env, that, "g_1utf8_1pointer_1to_1offset\n")
 	return rc;
 }
@@ -2101,6 +2599,94 @@ JNIEXPORT void JNICALL OS_NATIVE(gdk_1rgb_1init)
 }
 #endif
 
+#ifndef NO_gdk_1screen_1get_1default
+JNIEXPORT jint JNICALL OS_NATIVE(gdk_1screen_1get_1default)
+	(JNIEnv *env, jclass that)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gdk_1screen_1get_1default\n")
+/*
+	rc = (jint)gdk_screen_get_default();
+*/
+	{
+	void *handle = NULL;
+	int (*fptr)();
+	rc = 0;
+	if ((handle = dlopen(gdk_screen_get_default_LIB, RTLD_LAZY)) != NULL && (fptr = dlsym(handle, "gdk_screen_get_default")) != NULL) {
+		rc = (jint)(*fptr)();
+	}
+	}
+	NATIVE_EXIT(env, that, "gdk_1screen_1get_1default\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_gdk_1screen_1get_1monitor_1at_1window
+JNIEXPORT jint JNICALL OS_NATIVE(gdk_1screen_1get_1monitor_1at_1window)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gdk_1screen_1get_1monitor_1at_1window\n")
+/*
+	rc = (jint)gdk_screen_get_monitor_at_window((GdkScreen *)arg0, (GdkWindow *)arg1);
+*/
+	{
+	void *handle = NULL;
+	int (*fptr)();
+	rc = 0;
+	if ((handle = dlopen(gdk_screen_get_monitor_at_window_LIB, RTLD_LAZY)) != NULL && (fptr = dlsym(handle, "gdk_screen_get_monitor_at_window")) != NULL) {
+		rc = (jint)(*fptr)((GdkScreen *)arg0, (GdkWindow *)arg1);
+	}
+	}
+	NATIVE_EXIT(env, that, "gdk_1screen_1get_1monitor_1at_1window\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_gdk_1screen_1get_1monitor_1geometry
+JNIEXPORT void JNICALL OS_NATIVE(gdk_1screen_1get_1monitor_1geometry)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	GdkRectangle _arg2, *lparg2=NULL;
+	NATIVE_ENTER(env, that, "gdk_1screen_1get_1monitor_1geometry\n")
+	if (arg2) lparg2 = getGdkRectangleFields(env, arg2, &_arg2);
+/*
+	gdk_screen_get_monitor_geometry((GdkScreen *)arg0, arg1, lparg2);
+*/
+	{
+	void *handle = NULL;
+	int (*fptr)();
+	if ((handle = dlopen(gdk_screen_get_monitor_geometry_LIB, RTLD_LAZY)) != NULL && (fptr = dlsym(handle, "gdk_screen_get_monitor_geometry")) != NULL) {
+		(*fptr)((GdkScreen *)arg0, arg1, lparg2);
+	}
+	}
+	if (arg2) setGdkRectangleFields(env, arg2, lparg2);
+	NATIVE_EXIT(env, that, "gdk_1screen_1get_1monitor_1geometry\n")
+}
+#endif
+
+#ifndef NO_gdk_1screen_1get_1n_1monitors
+JNIEXPORT jint JNICALL OS_NATIVE(gdk_1screen_1get_1n_1monitors)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gdk_1screen_1get_1n_1monitors\n")
+/*
+	rc = (jint)gdk_screen_get_n_monitors((GdkScreen *)arg0);
+*/
+	{
+	void *handle = NULL;
+	int (*fptr)();
+	rc = 0;
+	if ((handle = dlopen(gdk_screen_get_n_monitors_LIB, RTLD_LAZY)) != NULL && (fptr = dlsym(handle, "gdk_screen_get_n_monitors")) != NULL) {
+		rc = (jint)(*fptr)((GdkScreen *)arg0);
+	}
+	}
+	NATIVE_EXIT(env, that, "gdk_1screen_1get_1n_1monitors\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_gdk_1screen_1height
 JNIEXPORT jint JNICALL OS_NATIVE(gdk_1screen_1height)
 	(JNIEnv *env, jclass that)
@@ -4059,6 +4645,16 @@ JNIEXPORT void JNICALL OS_NATIVE(gtk_1list_1store_1set__IIIII)
 }
 #endif
 
+#ifndef NO_gtk_1list_1store_1set__IIIJI
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1list_1store_1set__IIIJI)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4)
+{
+	NATIVE_ENTER(env, that, "gtk_1list_1store_1set__IIIJI\n")
+	gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+	NATIVE_EXIT(env, that, "gtk_1list_1store_1set__IIIJI\n")
+}
+#endif
+
 #ifndef NO_gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I
 JNIEXPORT void JNICALL OS_NATIVE(gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
@@ -4533,6 +5129,82 @@ JNIEXPORT void JNICALL OS_NATIVE(gtk_1range_1set_1value)
 }
 #endif
 
+#ifndef NO_gtk_1rc_1style_1get_1bg_1pixmap_1name
+JNIEXPORT jint JNICALL OS_NATIVE(gtk_1rc_1style_1get_1bg_1pixmap_1name)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gtk_1rc_1style_1get_1bg_1pixmap_1name\n")
+	rc = (jint)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
+	NATIVE_EXIT(env, that, "gtk_1rc_1style_1get_1bg_1pixmap_1name\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_gtk_1rc_1style_1get_1color_1flags
+JNIEXPORT jint JNICALL OS_NATIVE(gtk_1rc_1style_1get_1color_1flags)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gtk_1rc_1style_1get_1color_1flags\n")
+	rc = (jint)gtk_rc_style_get_color_flags((GtkRcStyle *)arg0, arg1);
+	NATIVE_EXIT(env, that, "gtk_1rc_1style_1get_1color_1flags\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_gtk_1rc_1style_1set_1bg
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1bg)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	GdkColor _arg2, *lparg2=NULL;
+	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1bg\n")
+	if (arg2) lparg2 = getGdkColorFields(env, arg2, &_arg2);
+	gtk_rc_style_set_bg((GtkRcStyle *)arg0, arg1, lparg2);
+	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1bg\n")
+}
+#endif
+
+#ifndef NO_gtk_1rc_1style_1set_1bg_1pixmap_1name
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1bg_1pixmap_1name)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1bg_1pixmap_1name\n")
+	gtk_rc_style_set_bg_pixmap_name((GtkRcStyle *)arg0, arg1, (char *)arg2);
+	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1bg_1pixmap_1name\n")
+}
+#endif
+
+#ifndef NO_gtk_1rc_1style_1set_1color_1flags
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1color_1flags)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+{
+	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1color_1flags\n")
+	gtk_rc_style_set_color_flags((GtkRcStyle *)arg0, arg1, arg2);
+	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1color_1flags\n")
+}
+#endif
+
+#ifndef NO_gtk_1rc_1style_1set_1xthickness
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1xthickness)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1xthickness\n")
+	gtk_rc_style_set_xthickness((GtkRcStyle *)arg0, arg1);
+	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1xthickness\n")
+}
+#endif
+
+#ifndef NO_gtk_1rc_1style_1set_1ythickness
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1ythickness)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1ythickness\n")
+	gtk_rc_style_set_ythickness((GtkRcStyle *)arg0, arg1);
+	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1ythickness\n")
+}
+#endif
+
 #ifndef NO_gtk_1scale_1set_1digits
 JNIEXPORT void JNICALL OS_NATIVE(gtk_1scale_1set_1digits)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
@@ -4715,6 +5387,133 @@ JNIEXPORT jint JNICALL OS_NATIVE(gtk_1socket_1new)
 }
 #endif
 
+#ifndef NO_gtk_1style_1get_1base
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1base)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	GdkColor _arg2, *lparg2=NULL;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1base\n")
+	if (arg2) lparg2 = &_arg2;
+	gtk_style_get_base((GtkStyle *)arg0, arg1, lparg2);
+	if (arg2) setGdkColorFields(env, arg2, lparg2);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1base\n")
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1bg
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1bg)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	GdkColor _arg2, *lparg2=NULL;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1bg\n")
+	if (arg2) lparg2 = &_arg2;
+	gtk_style_get_bg((GtkStyle *)arg0, arg1, lparg2);
+	if (arg2) setGdkColorFields(env, arg2, lparg2);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1bg\n")
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1black
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1black)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+{
+	GdkColor _arg1, *lparg1=NULL;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1black\n")
+	if (arg1) lparg1 = &_arg1;
+	gtk_style_get_black((GtkStyle *)arg0, lparg1);
+	if (arg1) setGdkColorFields(env, arg1, lparg1);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1black\n")
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1dark
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1dark)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	GdkColor _arg2, *lparg2=NULL;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1dark\n")
+	if (arg2) lparg2 = &_arg2;
+	gtk_style_get_dark((GtkStyle *)arg0, arg1, lparg2);
+	if (arg2) setGdkColorFields(env, arg2, lparg2);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1dark\n")
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1fg
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1fg)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	GdkColor _arg2, *lparg2=NULL;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1fg\n")
+	if (arg2) lparg2 = &_arg2;
+	gtk_style_get_fg((GtkStyle *)arg0, arg1, lparg2);
+	if (arg2) setGdkColorFields(env, arg2, lparg2);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1fg\n")
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1font_1desc
+JNIEXPORT jint JNICALL OS_NATIVE(gtk_1style_1get_1font_1desc)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1font_1desc\n")
+	rc = (jint)gtk_style_get_font_desc((GtkStyle *)arg0);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1font_1desc\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1light
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1light)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	GdkColor _arg2, *lparg2=NULL;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1light\n")
+	if (arg2) lparg2 = &_arg2;
+	gtk_style_get_light((GtkStyle *)arg0, arg1, lparg2);
+	if (arg2) setGdkColorFields(env, arg2, lparg2);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1light\n")
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1text
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1text)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+{
+	GdkColor _arg2, *lparg2=NULL;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1text\n")
+	if (arg2) lparg2 = &_arg2;
+	gtk_style_get_text((GtkStyle *)arg0, arg1, lparg2);
+	if (arg2) setGdkColorFields(env, arg2, lparg2);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1text\n")
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1xthickness
+JNIEXPORT jint JNICALL OS_NATIVE(gtk_1style_1get_1xthickness)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1xthickness\n")
+	rc = (jint)gtk_style_get_xthickness((GtkStyle *)arg0);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1xthickness\n")
+	return rc;
+}
+#endif
+
+#ifndef NO_gtk_1style_1get_1ythickness
+JNIEXPORT jint JNICALL OS_NATIVE(gtk_1style_1get_1ythickness)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	NATIVE_ENTER(env, that, "gtk_1style_1get_1ythickness\n")
+	rc = (jint)gtk_style_get_ythickness((GtkStyle *)arg0);
+	NATIVE_EXIT(env, that, "gtk_1style_1get_1ythickness\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_gtk_1target_1list_1new
 JNIEXPORT jint JNICALL OS_NATIVE(gtk_1target_1list_1new)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1)
@@ -5718,6 +6517,16 @@ JNIEXPORT void JNICALL OS_NATIVE(gtk_1tree_1store_1set__IIIII)
 }
 #endif
 
+#ifndef NO_gtk_1tree_1store_1set__IIIJI
+JNIEXPORT void JNICALL OS_NATIVE(gtk_1tree_1store_1set__IIIJI)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4)
+{
+	NATIVE_ENTER(env, that, "gtk_1tree_1store_1set__IIIJI\n")
+	gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+	NATIVE_EXIT(env, that, "gtk_1tree_1store_1set__IIIJI\n")
+}
+#endif
+
 #ifndef NO_gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I
 JNIEXPORT void JNICALL OS_NATIVE(gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
@@ -5779,6 +6588,34 @@ JNIEXPORT void JNICALL OS_NATIVE(gtk_1tree_1view_1column_1add_1attribute)
 }
 #endif
 
+#ifndef NO_gtk_1tree_1view_1column_1cell_1get_1position
+JNIEXPORT jboolean JNICALL OS_NATIVE(gtk_1tree_1view_1column_1cell_1get_1position)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+{
+	jint *lparg2=NULL;
+	jint *lparg3=NULL;
+	jboolean rc;
+	NATIVE_ENTER(env, that, "gtk_1tree_1view_1column_1cell_1get_1position\n")
+	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
+	if (arg3) lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL);
+/*
+	rc = (jboolean)gtk_tree_view_column_cell_get_position((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
+*/
+	{
+	void *handle = NULL;
+	int (*fptr)();
+	rc = 0;
+	if ((handle = dlopen(gtk_tree_view_column_cell_get_position_LIB, RTLD_LAZY)) != NULL && (fptr = dlsym(handle, "gtk_tree_view_column_cell_get_position")) != NULL) {
+		rc = (jboolean)(*fptr)((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
+	}
+	}
+	if (arg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	NATIVE_EXIT(env, that, "gtk_1tree_1view_1column_1cell_1get_1position\n")
+	return rc;
+}
+#endif
+
 #ifndef NO_gtk_1tree_1view_1column_1cell_1set_1cell_1data
 JNIEXPORT void JNICALL OS_NATIVE(gtk_1tree_1view_1column_1cell_1set_1cell_1data)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4)
@@ -7040,6 +7877,26 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEven
 }
 #endif
 
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2\n")
+	if (arg1) getGtkAdjustmentFields(env, arg1, (GtkAdjustment *)arg0);
+	NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2\n")
+}
+#endif
+
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2)
+	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2\n")
+	if (arg1) getGtkFixedFields(env, arg1, (GtkFixed *)arg0);
+	NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2\n")
+}
+#endif
+
 #ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I
 JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
@@ -7207,6 +8064,16 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent
 }
 #endif
 
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I\n")
+	if (arg0) setGdkImageFields(env, arg0, (GdkImage *)arg1);
+	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I\n")
+}
+#endif
+
 #ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II
 JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
@@ -7220,6 +8087,66 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRecta
 }
 #endif
 
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I\n")
+	if (arg0) setGdkVisualFields(env, arg0, (GdkVisual *)arg1);
+	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I\n")
+}
+#endif
+
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I\n")
+	if (arg0) setGtkAdjustmentFields(env, arg0, (GtkAdjustment *)arg1);
+	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I\n")
+}
+#endif
+
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I\n")
+	if (arg0) setGtkColorSelectionDialogFields(env, arg0, (GtkColorSelectionDialog *)arg1);
+	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I\n")
+}
+#endif
+
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I\n")
+	if (arg0) setGtkComboFields(env, arg0, (GtkCombo *)arg1);
+	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I\n")
+}
+#endif
+
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I\n")
+	if (arg0) setGtkFileSelectionFields(env, arg0, (GtkFileSelection *)arg1);
+	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I\n")
+}
+#endif
+
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
+{
+	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I\n")
+	if (arg0) setGtkFixedFields(env, arg0, (GtkFixed *)arg1);
+	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I\n")
+}
+#endif
+
 #ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II
 JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II)
 	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
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 81528395d5..e20e9e0e90 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
@@ -48,4 +48,6 @@ void gtk_progress_bar_set_bar_style(void*, int);
 #define NATIVE_ENTER(env,clazz,func)
 #define NATIVE_EXIT(env,clazz,func)
 
+#include "os_custom.h"
+
 #endif /* INC_os_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
index 9d100cbc55..a5d3f49fdb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
@@ -33,903 +33,3 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GDK_1WINDOWING_1X11)
 	return rc;
 }
 #endif
-
-#ifndef NO_GTK_1ACCEL_1LABEL_1ACCEL_1STRING__II
-JNIEXPORT void JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1ACCEL_1STRING__II)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "GTK_1ACCEL_1LABEL_1ACCEL_1STRING__II\n")
-	((GtkAccelLabel *)arg0)->accel_string = (gchar *)arg1;
-	NATIVE_EXIT(env, that, "GTK_1ACCEL_1LABEL_1ACCEL_1STRING__II\n")
-}
-#endif
-
-#ifndef NO_GTK_1ACCEL_1LABEL_1ACCEL_1STRING__I
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1ACCEL_1STRING__I)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1ACCEL_1LABEL_1ACCEL_1STRING__I\n")
-	rc = (jint)((GtkAccelLabel *)arg0)->accel_string;
-	NATIVE_EXIT(env, that, "GTK_1ACCEL_1LABEL_1ACCEL_1STRING__I\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1SCROLLED_1WINDOW_1HSCROLLBAR
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1SCROLLED_1WINDOW_1HSCROLLBAR\n")
-	rc = (jint)((GtkScrolledWindow *)arg0)->hscrollbar;
-	NATIVE_EXIT(env, that, "GTK_1SCROLLED_1WINDOW_1HSCROLLBAR\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING\n")
-	#define DEFAULT_SCROLLBAR_SPACING  3
-	rc = (jint)(GTK_SCROLLED_WINDOW_GET_CLASS (arg0)->scrollbar_spacing >= 0 ?
-		GTK_SCROLLED_WINDOW_GET_CLASS (arg0)->scrollbar_spacing : DEFAULT_SCROLLBAR_SPACING);
-	NATIVE_EXIT(env, that, "GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1SCROLLED_1WINDOW_1VSCROLLBAR
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1SCROLLED_1WINDOW_1VSCROLLBAR\n")
-	rc = (jint)((GtkScrolledWindow *)arg0)->vscrollbar;
-	NATIVE_EXIT(env, that, "GTK_1SCROLLED_1WINDOW_1VSCROLLBAR\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1WIDGET_1HEIGHT
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1HEIGHT)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1WIDGET_1HEIGHT\n")
-	rc = (jint)((GtkWidget *)arg0)->allocation.height;
-	NATIVE_EXIT(env, that, "GTK_1WIDGET_1HEIGHT\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1WIDGET_1WIDTH
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WIDTH)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1WIDGET_1WIDTH\n")
-	rc = (jint)((GtkWidget *)arg0)->allocation.width;
-	NATIVE_EXIT(env, that, "GTK_1WIDGET_1WIDTH\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1WIDGET_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1WIDGET_1WINDOW\n")
-	rc = (jint)((GtkWidget *)arg0)->window;
-	NATIVE_EXIT(env, that, "GTK_1WIDGET_1WINDOW\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1WIDGET_1X
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1X)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1WIDGET_1X\n")
-	rc = (jint)((GtkWidget *)arg0)->allocation.x;
-	NATIVE_EXIT(env, that, "GTK_1WIDGET_1X\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1ENTRY_1IM_1CONTEXT
-JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1ENTRY_1IM_1CONTEXT
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "OS_GTK_1ENTRY_1IM_1CONTEXT\n")
-	rc = (jint)((GtkEntry *)arg0)->im_context;
-	NATIVE_EXIT(env, that, "OS_GTK_1ENTRY_1IM_1CONTEXT\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1TEXTVIEW_1IM_1CONTEXT
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1TEXTVIEW_1IM_1CONTEXT\n")
-	rc = (jint)((GtkTextView *)arg0)->im_context;
-	NATIVE_EXIT(env, that, "GTK_1TEXTVIEW_1IM_1CONTEXT\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GTK_1WIDGET_1Y
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1Y)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GTK_1WIDGET_1Y\n")
-	rc = (jint)((GtkWidget *)arg0)->allocation.y;
-	NATIVE_EXIT(env, that, "GTK_1WIDGET_1Y\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkColor_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkColor_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkColor_1sizeof\n")
-	rc = (jint)sizeof(GdkColor);
-	NATIVE_EXIT(env, that, "GdkColor_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkDragContext_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkDragContext_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkDragContext_1sizeof\n")
-	rc = (jint)sizeof(GdkDragContext);
-	NATIVE_EXIT(env, that, "GdkDragContext_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventButton_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventButton_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkEventButton_1sizeof\n")
-	rc = (jint)sizeof(GdkEventButton);
-	NATIVE_EXIT(env, that, "GdkEventButton_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventCrossing_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventCrossing_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkEventCrossing_1sizeof\n")
-	rc = (jint)sizeof(GdkEventCrossing);
-	NATIVE_EXIT(env, that, "GdkEventCrossing_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventExpose_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventExpose_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkEventExpose_1sizeof\n")
-	rc = (jint)sizeof(GdkEventExpose);
-	NATIVE_EXIT(env, that, "GdkEventExpose_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventFocus_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventFocus_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkEventFocus_1sizeof\n")
-	rc = (jint)sizeof(GdkEventFocus);
-	NATIVE_EXIT(env, that, "GdkEventFocus_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventKey_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventKey_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkEventKey_1sizeof\n")
-	rc = (jint)sizeof(GdkEventKey);
-	NATIVE_EXIT(env, that, "GdkEventKey_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEventWindowState_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEventWindowState_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkEventWindowState_1sizeof\n")
-	rc = (jint)sizeof(GdkEventWindowState);
-	NATIVE_EXIT(env, that, "GdkEventWindowState_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkEvent_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkEvent_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkEvent_1sizeof\n")
-	rc = (jint)sizeof(GdkEvent);
-	NATIVE_EXIT(env, that, "GdkEvent_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkGCValues_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkGCValues_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkGCValues_1sizeof\n")
-	rc = (jint)sizeof(GdkGCValues);
-	NATIVE_EXIT(env, that, "GdkGCValues_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkImage_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkImage_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkImage_1sizeof\n")
-	rc = (jint)sizeof(GdkImage);
-	NATIVE_EXIT(env, that, "GdkImage_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkRectangle_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkRectangle_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkRectangle_1sizeof\n")
-	rc = (jint)sizeof(GdkRectangle);
-	NATIVE_EXIT(env, that, "GdkRectangle_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GdkVisual_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GdkVisual_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GdkVisual_1sizeof\n")
-	rc = (jint)sizeof(GdkVisual);
-	NATIVE_EXIT(env, that, "GdkVisual_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkAdjustment_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkAdjustment_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkAdjustment_1sizeof\n")
-	rc = (jint)sizeof(GtkAdjustment);
-	NATIVE_EXIT(env, that, "GtkAdjustment_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkAllocation_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkAllocation_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkAllocation_1sizeof\n")
-	rc = (jint)sizeof(GtkAllocation);
-	NATIVE_EXIT(env, that, "GtkAllocation_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkColorSelectionDialog_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkColorSelectionDialog_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkColorSelectionDialog_1sizeof\n")
-	rc = (jint)sizeof(GtkColorSelectionDialog);
-	NATIVE_EXIT(env, that, "GtkColorSelectionDialog_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkCombo_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkCombo_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkCombo_1sizeof\n")
-	rc = (jint)sizeof(GtkCombo);
-	NATIVE_EXIT(env, that, "GtkCombo_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkFileSelection_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkFileSelection_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkFileSelection_1sizeof\n")
-	rc = (jint)sizeof(GtkFileSelection);
-	NATIVE_EXIT(env, that, "GtkFileSelection_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkFixed_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkFixed_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkFixed_1sizeof\n")
-	rc = (jint)sizeof(GtkFixed);
-	NATIVE_EXIT(env, that, "GtkFixed_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkRequisition_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkRequisition_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkRequisition_1sizeof\n")
-	rc = (jint)sizeof(GtkRequisition);
-	NATIVE_EXIT(env, that, "GtkRequisition_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkSelectionData_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkSelectionData_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkSelectionData_1sizeof\n")
-	rc = (jint)sizeof(GtkSelectionData);
-	NATIVE_EXIT(env, that, "GtkSelectionData_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkTargetEntry_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkTargetEntry_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkTargetEntry_1sizeof\n")
-	rc = (jint)sizeof(GtkTargetEntry);
-	NATIVE_EXIT(env, that, "GtkTargetEntry_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkTargetPair_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GtkTargetPair_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkTargetPair_1sizeof\n")
-	rc = (jint)sizeof(GtkTargetPair);
-	NATIVE_EXIT(env, that, "GtkTargetPair_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoAttribute_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoAttribute_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "PangoAttribute_1sizeof\n")
-	rc = (jint)sizeof(PangoAttribute);
-	NATIVE_EXIT(env, that, "PangoAttribute_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_PangoRectangle_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(PangoRectangle_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "PangoRectangle_1sizeof\n")
-	rc = (jint)sizeof(PangoRectangle);
-	NATIVE_EXIT(env, that, "PangoRectangle_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_PTR_1sizeof
-JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_PTR_1sizeof
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "PTR_1sizeof\n")
-	rc = (jint)sizeof(SWT_PTR);
-	NATIVE_EXIT(env, that, "PTR_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_GtkTreeIter_1sizeof
-JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_GtkTreeIter_1sizeof
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "GtkTreeIter_1sizeof\n")
-	rc = (jint)sizeof(GtkTreeIter);
-	NATIVE_EXIT(env, that, "GtkTreeIter_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_XWindowChanges_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(XWindowChanges_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "XWindowChanges_1sizeof\n")
-	rc = (jint)sizeof(XWindowChanges);
-	NATIVE_EXIT(env, that, "XWindowChanges_1sizeof\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_g_1list_1next__II
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_g_1list_1next__II
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "g_1list_1next__II\n")
-	((GList *)arg0)->next = (GList *)arg1;
-	NATIVE_EXIT(env, that, "g_1list_1next__II\n")
-}
-#endif
-
-#ifndef NO_g_1list_1previous__II
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_g_1list_1previous__II
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "g_1list_1previous__II\n")
-	((GList *)arg0)->prev = (GList *)arg1;
-	NATIVE_EXIT(env, that, "g_1list_1previous__II\n")
-}
-#endif
-
-#ifndef NO_gdk_1screen_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(gdk_1screen_1get_1default)
-	(JNIEnv *env, jclass that)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "gdk_1screen_1get_1default\n")
-	//rc = (jint)gdk_screen_get_default();
-	{
-	void *handle = NULL;
-	GdkScreen* (*fptr)();
-	rc = 0;
-	handle = dlopen("libgdk-x11-2.0.so", RTLD_LAZY);
-	if (handle != NULL) {
-		fptr = (GdkScreen* (*)())dlsym(handle, "gdk_screen_get_default");
-		if (fptr != NULL) {
-			rc = (jint)(*fptr)();
-		}
-	}
-	}
-	NATIVE_EXIT(env, that, "gdk_1screen_1get_1default\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_gdk_1screen_1get_1monitor_1at_1window
-JNIEXPORT jint JNICALL OS_NATIVE(gdk_1screen_1get_1monitor_1at_1window)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "gdk_1screen_1get_1monitor_1at_1window\n")
-	//rc = (jint)gdk_1screen_1get_1monitor_1at_1window((GdkScreen *)arg0, (GkdWindow *)arg1);
-	{
-	void *handle = NULL;
-	gint (*fptr)(GdkScreen *, GdkWindow *);
-	rc = 0;
-	handle = dlopen("libgdk-x11-2.0.so", RTLD_LAZY);
-	if (handle != NULL) {
-		fptr = (gint (*)(GdkScreen *, GdkWindow *))dlsym(handle, "gdk_screen_get_monitor_at_window");
-		if (fptr != NULL) {
-			rc = (jint)(*fptr)((GdkScreen *)arg0, (GdkWindow *)arg1);
-		}
-	}
-	}
-	NATIVE_EXIT(env, that, "gdk_1screen_1get_1monitor_1at_1window\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_gdk_1screen_1get_1monitor_1geometry
-JNIEXPORT void JNICALL OS_NATIVE(gdk_1screen_1get_1monitor_1geometry)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-{
-	GdkRectangle _arg2, *lparg2=NULL;
-	NATIVE_ENTER(env, that, "gdk_1screen_1get_1monitor_1geometry\n")
-	if (arg2) lparg2 = getGdkRectangleFields(env, arg2, &_arg2);
-	//gdk_screen_get_monitor_geometry((GdkScreen *)arg0, arg1, lparg2);
-	{
-	void *handle = NULL;
-	void (*fptr)(GdkScreen *, gint, GdkRectangle *);
-	handle = dlopen("libgdk-x11-2.0.so", RTLD_LAZY);
-	if (handle != NULL) {
-		fptr = (void (*)(GdkScreen *,  gint, GdkRectangle *))dlsym(handle, "gdk_screen_get_monitor_geometry");
-		if (fptr != NULL) {
-			(*fptr)((GdkScreen *)arg0, arg1, lparg2);
-		}
-	}
-	}
-	if (arg2) setGdkRectangleFields(env, arg2, lparg2);
-	NATIVE_EXIT(env, that, "gdk_1screen_1get_1monitor_1geometry\n")
-}
-#endif
-
-#ifndef NO_gdk_1screen_1get_1n_1monitors
-JNIEXPORT jint JNICALL OS_NATIVE(gdk_1screen_1get_1n_1monitors)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "gdk_1screen_1get_1n_1monitors\n")
-	//rc = (jint)gdk_screen_get_n_monitors((GdkScreen *)arg0);
-	{
-	void *handle = NULL;
-	gint (*fptr)(GdkScreen *);
-	rc = 0;
-	handle = dlopen("libgdk-x11-2.0.so", RTLD_LAZY);
-	if (handle != NULL) {
-		fptr = (gint (*)(GdkScreen *))dlsym(handle, "gdk_screen_get_n_monitors");
-		if (fptr != NULL) {
-			rc = (jint)(*fptr)((GdkScreen *)arg0);
-		}
-	}
-	}
-	NATIVE_EXIT(env, that, "gdk_1screen_1get_1n_1monitors\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1rc_1style_1get_1bg_1pixmap_1name
-JNIEXPORT jint JNICALL OS_NATIVE(gtk_1rc_1style_1get_1bg_1pixmap_1name)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	jint rc;
-	
-	NATIVE_ENTER(env, that, "gtk_1rc_1style_1get_1bg_1pixmap_1name\n")
-	rc =  (jint) ((GtkRcStyle *)arg0)->bg_pixmap_name[arg1] ;
-	NATIVE_EXIT(env, that, "gtk_1rc_1style_1get_1bg_1pixmap_1name\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1rc_1style_1get_1color_1flags
-JNIEXPORT jint JNICALL OS_NATIVE(gtk_1rc_1style_1get_1color_1flags)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	jint rc;
-	
-	NATIVE_ENTER(env, that, "gtk_1rc_1style_1get_1color_1flags\n")
-	rc =  (jint) ((GtkRcStyle *)arg0)->color_flags[arg1] ;
-	NATIVE_EXIT(env, that, "gtk_1rc_1style_1get_1color_1flags\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1rc_1style_1set_1bg
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1bg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-{
-	GdkColor _arg2, *lparg2=NULL;
-	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1bg\n")
-	if (arg2) lparg2 = getGdkColorFields(env, arg2, &_arg2);
-	((GtkRcStyle *)arg0)->bg[arg1] = (GdkColor)_arg2;
-	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1bg\n")
-}
-#endif
-	
-#ifndef NO_gtk_1rc_1style_1set_1bg_1pixmap_1name
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1bg_1pixmap_1name)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-{
-	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1bg_1pixmap_1name\n")
-	((GtkRcStyle *)arg0)->bg_pixmap_name[arg1] = (char *)arg2;
-	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1bg_1pixmap_1name\n")
-}
-#endif
-
-#ifndef NO_gtk_1rc_1style_1set_1color_1flags
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1color_1flags)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-{
-	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1color_1flags\n")
-	((GtkRcStyle *)arg0)->color_flags[arg1] = arg2;
-	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1color_1flags\n")
-}
-#endif
-
-#ifndef NO_gtk_1rc_1style_1set_1xthickness
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1xthickness)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1xthickness\n")
-	((GtkRcStyle *)arg0)->xthickness = arg1;
-	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1xthickness\n")
-}
-#endif
-
-#ifndef NO_gtk_1rc_1style_1set_1ythickness
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1ythickness)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "gtk_1rc_1style_1set_1ythickness\n")
-	((GtkRcStyle *)arg0)->ythickness = arg1;
-	NATIVE_EXIT(env, that, "gtk_1rc_1style_1set_1ythickness\n")
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1base
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1base)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-{
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1base\n")
-	if (arg2) setGdkColorFields(env, arg2, &((GtkStyle *)arg0)->base[arg1]);
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1base\n")
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1bg
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1bg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-{
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1bg\n")
-	if (arg2) setGdkColorFields(env, arg2, &((GtkStyle *)arg0)->bg[arg1]);
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1bg\n")
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1black
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1black)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
-{
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1black\n")
-	if (arg1) setGdkColorFields(env, arg1, &((GtkStyle *)arg0)->black);
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1black\n")
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1dark
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1dark)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-{
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1dark\n")
-	if (arg2) setGdkColorFields(env, arg2, &((GtkStyle *)arg0)->dark[arg1]);
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1dark\n")
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1fg
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1fg)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-{
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1fg\n")
-	if (arg2) setGdkColorFields(env, arg2, &((GtkStyle *)arg0)->fg[arg1]);
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1fg\n")
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1font_1desc
-JNIEXPORT jint JNICALL OS_NATIVE(gtk_1style_1get_1font_1desc)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1font_1desc\n")
-	rc = (jint)((GtkStyle *)arg0)->font_desc;
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1font_1desc\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1light
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1light)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-{
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1light\n")
-	if (arg2) setGdkColorFields(env, arg2, &((GtkStyle *)arg0)->light[arg1]);
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1light\n")
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1text
-JNIEXPORT void JNICALL OS_NATIVE(gtk_1style_1get_1text)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-{
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1text\n")
-	if (arg2) setGdkColorFields(env, arg2, &((GtkStyle *)arg0)->text[arg1]);
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1text\n")
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1xthickness
-JNIEXPORT jint JNICALL OS_NATIVE(gtk_1style_1get_1xthickness)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1xthickness\n")
-	rc = (jint)((GtkStyle *)arg0)->xthickness;
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1xthickness\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1style_1get_1ythickness
-JNIEXPORT jint JNICALL OS_NATIVE(gtk_1style_1get_1ythickness)
-	(JNIEnv *env, jclass that, jint arg0)
-{
-	jint rc;
-	NATIVE_ENTER(env, that, "gtk_1style_1get_1ythickness\n")
-	rc = (jint)((GtkStyle *)arg0)->ythickness;
-	NATIVE_EXIT(env, that, "gtk_1style_1get_1ythickness\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1tree_1view_1column_1cell_1get_1position
-JNIEXPORT jboolean JNICALL OS_NATIVE(gtk_1tree_1view_1column_1cell_1get_1position)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
-{
-	jint *lparg2=NULL;
-	jint *lparg3=NULL;
-	jboolean rc;
-	NATIVE_ENTER(env, that, "gtk_1tree_1view_1column_1cell_1get_1position\n")
-	if (arg2) lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL);
-	if (arg3) lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL);
-	//rc = (jboolean)gtk_tree_view_column_cell_get_position((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
-	{
-	void *handle = NULL;
-	gboolean (*fptr)(GtkTreeViewColumn *, GtkCellRenderer *, gint *, gint*);
-	rc = 0;
-	handle = dlopen("libgtk-x11-2.0.so", RTLD_LAZY);
-	if (handle != NULL) {
-		fptr = (gboolean (*)(GtkTreeViewColumn *, GtkCellRenderer *, gint *, gint*))dlsym(handle, "gtk_tree_view_column_cell_get_position");
-		if (fptr != NULL) {
-			rc = (jboolean)(*fptr)((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
-		}
-	}
-	}
-	if (arg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	NATIVE_EXIT(env, that, "gtk_1tree_1view_1column_1cell_1get_1position\n")
-	return rc;
-}
-#endif
-
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2\n")
-	if (arg1) getGtkAdjustmentFields(env, arg1, (GtkAdjustment *)arg0);
-	NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2\n")
-}
-#endif
-
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I\n")
-	if (arg0) setGtkFileSelectionFields(env, arg0, (GtkFileSelection *)arg1);
-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I\n")
-}
-#endif
-
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I\n")
-	if (arg0) setGtkColorSelectionDialogFields(env, arg0, (GtkColorSelectionDialog *)arg1);
-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I\n")
-}
-#endif
-
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I\n")
-	if (arg0) setGtkComboFields(env, arg0, (GtkCombo *)arg1);
-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I\n")
-}
-#endif
-
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I\n")
-	if (arg0) setGtkAdjustmentFields(env, arg0, (GtkAdjustment *)arg1);
-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I\n")
-}
-#endif
-
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I\n")
-	if (arg0) setGtkFixedFields(env, arg0, (GtkFixed *)arg1);
-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I\n")
-}
-#endif
-
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2\n")
-	if (arg1) getGtkFixedFields(env, arg1, (GtkFixed *)arg0);
-	NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2\n")
-}
-#endif
-
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I\n")
-	if (arg0) setGdkVisualFields(env, arg0, (GdkVisual *)arg1);
-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I\n")
-}
-#endif
-
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I\n")
-	if (arg0) setGdkImageFields(env, arg0, (GdkImage *)arg1);
-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I\n")
-}
-#endif
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
new file mode 100644
index 0000000000..9cb18451a7
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
@@ -0,0 +1,59 @@
+/*******************************************************************************
+* Copyright (c) 2000, 2003 IBM Corporation and others. All rights reserved.
+* The contents of this file are made available under the terms
+* of the GNU Lesser General Public License (LGPL) Version 2.1 that
+* accompanies this distribution (lgpl-v21.txt).  The LGPL is also
+* available at http://www.gnu.org/licenses/lgpl.html.  If the version
+* of the LGPL at http://www.gnu.org is different to the version of
+* the LGPL accompanying this distribution and there is any conflict
+* between the two license versions, the terms of the LGPL accompanying
+* this distribution shall govern.
+* 
+* Contributors:
+*     IBM Corporation - initial API and implementation
+*******************************************************************************/
+
+/* Special sizeof's */
+#define GtkTreeIter_sizeof() sizeof(GtkTreeIter)
+#define PTR_sizeof() sizeof(void *)
+
+/* Libraries for dynamic loaded functions */
+#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so"
+#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so"
+#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so"
+#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so"
+#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so"
+
+/* Field accessors */
+#define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1
+#define GTK_ACCEL_LABEL_GET_ACCEL_STRING(arg0) (arg0)->accel_string
+#define GTK_SCROLLED_WINDOW_HSCROLLBAR(arg0) (arg0)->hscrollbar
+#define GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(arg0) (GTK_SCROLLED_WINDOW_GET_CLASS (arg0)->scrollbar_spacing >= 0 ? GTK_SCROLLED_WINDOW_GET_CLASS (arg0)->scrollbar_spacing : 3)		
+#define GTK_SCROLLED_WINDOW_VSCROLLBAR(arg0) (arg0)->vscrollbar
+#define GTK_WIDGET_HEIGHT(arg0) (arg0)->allocation.height
+#define GTK_WIDGET_WIDTH(arg0) (arg0)->allocation.width
+#define GTK_WIDGET_WINDOW(arg0) (arg0)->window
+#define GTK_WIDGET_X(arg0) (arg0)->allocation.x
+#define GTK_ENTRY_IM_CONTEXT(arg0) (arg0)->im_context
+#define GTK_TEXTVIEW_IM_CONTEXT(arg0) (arg0)->im_context
+#define GTK_WIDGET_Y(arg0) ((GtkWidget *)arg0)->allocation.y
+#define g_list_set_next(arg0, arg1) (arg0)->next = arg1
+#define g_list_set_previous(arg0, arg1) (arg0)->prev = arg1
+#define gtk_rc_style_get_bg_pixmap_name(arg0, arg1) (arg0)->bg_pixmap_name[arg1]
+#define gtk_rc_style_get_color_flags(arg0, arg1) (arg0)->color_flags[arg1]
+#define gtk_rc_style_set_bg(arg0, arg1, arg2) if (arg2) (arg0)->bg[arg1] = *arg2
+#define gtk_rc_style_set_bg_pixmap_name(arg0, arg1, arg2) (arg0)->bg_pixmap_name[arg1] = (char *)arg2
+#define gtk_rc_style_set_color_flags(arg0, arg1, arg2) (arg0)->color_flags[arg1] = arg2
+#define gtk_rc_style_set_xthickness(arg0, arg1) (arg0)->xthickness = arg1
+#define gtk_rc_style_set_ythickness(arg0, arg1) (arg0)->ythickness = arg1
+#define gtk_style_get_font_desc(arg0) (arg0)->font_desc
+#define gtk_style_get_base(arg0, arg1, arg2) *arg2 = (arg0)->base[arg1]
+#define gtk_style_get_bg(arg0, arg1, arg2) *arg2 = (arg0)->bg[arg1]
+#define gtk_style_get_black(arg0, arg1) *arg1 = (arg0)->black
+#define gtk_style_get_dark(arg0, arg1, arg2) *arg2 = (arg0)->dark[arg1]
+#define gtk_style_get_fg(arg0, arg1, arg2) *arg2 = (arg0)->fg[arg1]
+#define gtk_style_get_light(arg0, arg1, arg2) *arg2 = (arg0)->light[arg1]
+#define gtk_style_get_text(arg0, arg1, arg2) *arg2 = (arg0)->text[arg1]
+#define gtk_style_get_xthickness(arg0) (arg0)->xthickness
+#define gtk_style_get_ythickness(arg0) (arg0)->ythickness
+
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
index 9549e9351c..f1eb9a8024 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
@@ -18,208 +18,260 @@
 #ifndef NO_GdkColor
 GdkColor *getGdkColorFields(JNIEnv *env, jobject lpObject, GdkColor *lpStruct);
 void setGdkColorFields(JNIEnv *env, jobject lpObject, GdkColor *lpStruct);
+#define GdkColor_sizeof() sizeof(GdkColor)
 #else
 #define getGdkColorFields(a,b,c) NULL
 #define setGdkColorFields(a,b,c)
+#define GdkColor_sizeof() 0
 #endif
 
 #ifndef NO_GdkDragContext
 GdkDragContext *getGdkDragContextFields(JNIEnv *env, jobject lpObject, GdkDragContext *lpStruct);
 void setGdkDragContextFields(JNIEnv *env, jobject lpObject, GdkDragContext *lpStruct);
+#define GdkDragContext_sizeof() sizeof(GdkDragContext)
 #else
 #define getGdkDragContextFields(a,b,c) NULL
 #define setGdkDragContextFields(a,b,c)
+#define GdkDragContext_sizeof() 0
 #endif
 
 #ifndef NO_GdkEvent
 GdkEvent *getGdkEventFields(JNIEnv *env, jobject lpObject, GdkEvent *lpStruct);
 void setGdkEventFields(JNIEnv *env, jobject lpObject, GdkEvent *lpStruct);
+#define GdkEvent_sizeof() sizeof(GdkEvent)
 #else
 #define getGdkEventFields(a,b,c) NULL
 #define setGdkEventFields(a,b,c)
+#define GdkEvent_sizeof() 0
 #endif
 
 #ifndef NO_GdkEventButton
 GdkEventButton *getGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventButton *lpStruct);
 void setGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventButton *lpStruct);
+#define GdkEventButton_sizeof() sizeof(GdkEventButton)
 #else
 #define getGdkEventButtonFields(a,b,c) NULL
 #define setGdkEventButtonFields(a,b,c)
+#define GdkEventButton_sizeof() 0
 #endif
 
 #ifndef NO_GdkEventCrossing
 GdkEventCrossing *getGdkEventCrossingFields(JNIEnv *env, jobject lpObject, GdkEventCrossing *lpStruct);
 void setGdkEventCrossingFields(JNIEnv *env, jobject lpObject, GdkEventCrossing *lpStruct);
+#define GdkEventCrossing_sizeof() sizeof(GdkEventCrossing)
 #else
 #define getGdkEventCrossingFields(a,b,c) NULL
 #define setGdkEventCrossingFields(a,b,c)
+#define GdkEventCrossing_sizeof() 0
 #endif
 
 #ifndef NO_GdkEventExpose
 GdkEventExpose *getGdkEventExposeFields(JNIEnv *env, jobject lpObject, GdkEventExpose *lpStruct);
 void setGdkEventExposeFields(JNIEnv *env, jobject lpObject, GdkEventExpose *lpStruct);
+#define GdkEventExpose_sizeof() sizeof(GdkEventExpose)
 #else
 #define getGdkEventExposeFields(a,b,c) NULL
 #define setGdkEventExposeFields(a,b,c)
+#define GdkEventExpose_sizeof() 0
 #endif
 
 #ifndef NO_GdkEventFocus
 GdkEventFocus *getGdkEventFocusFields(JNIEnv *env, jobject lpObject, GdkEventFocus *lpStruct);
 void setGdkEventFocusFields(JNIEnv *env, jobject lpObject, GdkEventFocus *lpStruct);
+#define GdkEventFocus_sizeof() sizeof(GdkEventFocus)
 #else
 #define getGdkEventFocusFields(a,b,c) NULL
 #define setGdkEventFocusFields(a,b,c)
+#define GdkEventFocus_sizeof() 0
 #endif
 
 #ifndef NO_GdkEventKey
 GdkEventKey *getGdkEventKeyFields(JNIEnv *env, jobject lpObject, GdkEventKey *lpStruct);
 void setGdkEventKeyFields(JNIEnv *env, jobject lpObject, GdkEventKey *lpStruct);
+#define GdkEventKey_sizeof() sizeof(GdkEventKey)
 #else
 #define getGdkEventKeyFields(a,b,c) NULL
 #define setGdkEventKeyFields(a,b,c)
+#define GdkEventKey_sizeof() 0
 #endif
 
 #ifndef NO_GdkEventWindowState
 GdkEventWindowState *getGdkEventWindowStateFields(JNIEnv *env, jobject lpObject, GdkEventWindowState *lpStruct);
 void setGdkEventWindowStateFields(JNIEnv *env, jobject lpObject, GdkEventWindowState *lpStruct);
+#define GdkEventWindowState_sizeof() sizeof(GdkEventWindowState)
 #else
 #define getGdkEventWindowStateFields(a,b,c) NULL
 #define setGdkEventWindowStateFields(a,b,c)
+#define GdkEventWindowState_sizeof() 0
 #endif
 
 #ifndef NO_GdkGCValues
 GdkGCValues *getGdkGCValuesFields(JNIEnv *env, jobject lpObject, GdkGCValues *lpStruct);
 void setGdkGCValuesFields(JNIEnv *env, jobject lpObject, GdkGCValues *lpStruct);
+#define GdkGCValues_sizeof() sizeof(GdkGCValues)
 #else
 #define getGdkGCValuesFields(a,b,c) NULL
 #define setGdkGCValuesFields(a,b,c)
+#define GdkGCValues_sizeof() 0
 #endif
 
 #ifndef NO_GdkImage
 GdkImage *getGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct);
 void setGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct);
+#define GdkImage_sizeof() sizeof(GdkImage)
 #else
 #define getGdkImageFields(a,b,c) NULL
 #define setGdkImageFields(a,b,c)
+#define GdkImage_sizeof() 0
 #endif
 
 #ifndef NO_GdkRectangle
 GdkRectangle *getGdkRectangleFields(JNIEnv *env, jobject lpObject, GdkRectangle *lpStruct);
 void setGdkRectangleFields(JNIEnv *env, jobject lpObject, GdkRectangle *lpStruct);
+#define GdkRectangle_sizeof() sizeof(GdkRectangle)
 #else
 #define getGdkRectangleFields(a,b,c) NULL
 #define setGdkRectangleFields(a,b,c)
+#define GdkRectangle_sizeof() 0
 #endif
 
 #ifndef NO_GdkVisual
 GdkVisual *getGdkVisualFields(JNIEnv *env, jobject lpObject, GdkVisual *lpStruct);
 void setGdkVisualFields(JNIEnv *env, jobject lpObject, GdkVisual *lpStruct);
+#define GdkVisual_sizeof() sizeof(GdkVisual)
 #else
 #define getGdkVisualFields(a,b,c) NULL
 #define setGdkVisualFields(a,b,c)
+#define GdkVisual_sizeof() 0
 #endif
 
 #ifndef NO_GtkAdjustment
 GtkAdjustment *getGtkAdjustmentFields(JNIEnv *env, jobject lpObject, GtkAdjustment *lpStruct);
 void setGtkAdjustmentFields(JNIEnv *env, jobject lpObject, GtkAdjustment *lpStruct);
+#define GtkAdjustment_sizeof() sizeof(GtkAdjustment)
 #else
 #define getGtkAdjustmentFields(a,b,c) NULL
 #define setGtkAdjustmentFields(a,b,c)
+#define GtkAdjustment_sizeof() 0
 #endif
 
 #ifndef NO_GtkAllocation
 GtkAllocation *getGtkAllocationFields(JNIEnv *env, jobject lpObject, GtkAllocation *lpStruct);
 void setGtkAllocationFields(JNIEnv *env, jobject lpObject, GtkAllocation *lpStruct);
+#define GtkAllocation_sizeof() sizeof(GtkAllocation)
 #else
 #define getGtkAllocationFields(a,b,c) NULL
 #define setGtkAllocationFields(a,b,c)
+#define GtkAllocation_sizeof() 0
 #endif
 
 #ifndef NO_GtkColorSelectionDialog
 GtkColorSelectionDialog *getGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject, GtkColorSelectionDialog *lpStruct);
 void setGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject, GtkColorSelectionDialog *lpStruct);
+#define GtkColorSelectionDialog_sizeof() sizeof(GtkColorSelectionDialog)
 #else
 #define getGtkColorSelectionDialogFields(a,b,c) NULL
 #define setGtkColorSelectionDialogFields(a,b,c)
+#define GtkColorSelectionDialog_sizeof() 0
 #endif
 
 #ifndef NO_GtkCombo
 GtkCombo *getGtkComboFields(JNIEnv *env, jobject lpObject, GtkCombo *lpStruct);
 void setGtkComboFields(JNIEnv *env, jobject lpObject, GtkCombo *lpStruct);
+#define GtkCombo_sizeof() sizeof(GtkCombo)
 #else
 #define getGtkComboFields(a,b,c) NULL
 #define setGtkComboFields(a,b,c)
+#define GtkCombo_sizeof() 0
 #endif
 
 #ifndef NO_GtkFileSelection
 GtkFileSelection *getGtkFileSelectionFields(JNIEnv *env, jobject lpObject, GtkFileSelection *lpStruct);
 void setGtkFileSelectionFields(JNIEnv *env, jobject lpObject, GtkFileSelection *lpStruct);
+#define GtkFileSelection_sizeof() sizeof(GtkFileSelection)
 #else
 #define getGtkFileSelectionFields(a,b,c) NULL
 #define setGtkFileSelectionFields(a,b,c)
+#define GtkFileSelection_sizeof() 0
 #endif
 
 #ifndef NO_GtkFixed
 GtkFixed *getGtkFixedFields(JNIEnv *env, jobject lpObject, GtkFixed *lpStruct);
 void setGtkFixedFields(JNIEnv *env, jobject lpObject, GtkFixed *lpStruct);
+#define GtkFixed_sizeof() sizeof(GtkFixed)
 #else
 #define getGtkFixedFields(a,b,c) NULL
 #define setGtkFixedFields(a,b,c)
+#define GtkFixed_sizeof() 0
 #endif
 
 #ifndef NO_GtkRequisition
 GtkRequisition *getGtkRequisitionFields(JNIEnv *env, jobject lpObject, GtkRequisition *lpStruct);
 void setGtkRequisitionFields(JNIEnv *env, jobject lpObject, GtkRequisition *lpStruct);
+#define GtkRequisition_sizeof() sizeof(GtkRequisition)
 #else
 #define getGtkRequisitionFields(a,b,c) NULL
 #define setGtkRequisitionFields(a,b,c)
+#define GtkRequisition_sizeof() 0
 #endif
 
 #ifndef NO_GtkSelectionData
 GtkSelectionData *getGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *lpStruct);
 void setGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *lpStruct);
+#define GtkSelectionData_sizeof() sizeof(GtkSelectionData)
 #else
 #define getGtkSelectionDataFields(a,b,c) NULL
 #define setGtkSelectionDataFields(a,b,c)
+#define GtkSelectionData_sizeof() 0
 #endif
 
 #ifndef NO_GtkTargetEntry
 GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct);
 void setGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct);
+#define GtkTargetEntry_sizeof() sizeof(GtkTargetEntry)
 #else
 #define getGtkTargetEntryFields(a,b,c) NULL
 #define setGtkTargetEntryFields(a,b,c)
+#define GtkTargetEntry_sizeof() 0
 #endif
 
 #ifndef NO_GtkTargetPair
 GtkTargetPair *getGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPair *lpStruct);
 void setGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPair *lpStruct);
+#define GtkTargetPair_sizeof() sizeof(GtkTargetPair)
 #else
 #define getGtkTargetPairFields(a,b,c) NULL
 #define setGtkTargetPairFields(a,b,c)
+#define GtkTargetPair_sizeof() 0
 #endif
 
 #ifndef NO_PangoAttribute
 PangoAttribute *getPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct);
 void setPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct);
+#define PangoAttribute_sizeof() sizeof(PangoAttribute)
 #else
 #define getPangoAttributeFields(a,b,c) NULL
 #define setPangoAttributeFields(a,b,c)
+#define PangoAttribute_sizeof() 0
 #endif
 
 #ifndef NO_PangoRectangle
 PangoRectangle *getPangoRectangleFields(JNIEnv *env, jobject lpObject, PangoRectangle *lpStruct);
 void setPangoRectangleFields(JNIEnv *env, jobject lpObject, PangoRectangle *lpStruct);
+#define PangoRectangle_sizeof() sizeof(PangoRectangle)
 #else
 #define getPangoRectangleFields(a,b,c) NULL
 #define setPangoRectangleFields(a,b,c)
+#define PangoRectangle_sizeof() 0
 #endif
 
 #ifndef NO_XWindowChanges
 XWindowChanges *getXWindowChangesFields(JNIEnv *env, jobject lpObject, XWindowChanges *lpStruct);
 void setXWindowChangesFields(JNIEnv *env, jobject lpObject, XWindowChanges *lpStruct);
+#define XWindowChanges_sizeof() sizeof(XWindowChanges)
 #else
 #define getXWindowChangesFields(a,b,c) NULL
 #define setXWindowChangesFields(a,b,c)
+#define XWindowChanges_sizeof() 0
 #endif
 
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 a5f58adde0..f519b711ab 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
@@ -372,8 +372,8 @@ public static final synchronized native int GTK_WIDGET_Y(int /*long*/ widget);
 public static final synchronized native int GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget);
 public static final synchronized native int GTK_SCROLLED_WINDOW_VSCROLLBAR(int /*long*/ widget);
 public static final synchronized native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(int /*long*/ widget);
-public static final synchronized native void GTK_ACCEL_LABEL_ACCEL_STRING(int /*long*/ acce_label, int /*long*/ string);
-public static final synchronized native int GTK_ACCEL_LABEL_ACCEL_STRING(int /*long*/ acce_label);
+public static final synchronized native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(int /*long*/ acce_label, int /*long*/ string);
+public static final synchronized native int /*long*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(int /*long*/ acce_label);
 public static final synchronized native int /*long*/ GTK_ENTRY_IM_CONTEXT(int /*long*/ widget);
 public static final synchronized native int /*long*/ GTK_TEXTVIEW_IM_CONTEXT(int /*long*/ widget);
 
@@ -421,12 +421,12 @@ public static final synchronized native int /*long*/ g_list_append(int /*long*/
 public static final synchronized native void g_list_free(int /*long*/ list);
 public static final synchronized native void g_list_free_1(int /*long*/ list);
 public static final synchronized native int g_list_length(int /*long*/ list);
-public static final synchronized native void g_list_next(int /*long*/ list, int /*long*/ llist);
+public static final synchronized native void g_list_set_next(int /*long*/ list, int /*long*/ llist);
 public static final synchronized native int /*long*/ g_list_next(int /*long*/ list);
 public static final synchronized native int /*long*/ g_list_nth(int /*long*/ list, int n);
 public static final synchronized native int /*long*/ g_list_nth_data(int /*long*/ list, int n);
 public static final synchronized native int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/ data);
-public static final synchronized native void g_list_previous(int /*long*/ list, int /*long*/ llist);
+public static final synchronized native void g_list_set_previous(int /*long*/ list, int /*long*/ llist);
 public static final synchronized native int /*long*/ g_list_previous(int /*long*/ list);
 public static final synchronized native int /*long*/ g_list_remove_link(int /*long*/ list, int /*long*/ link);
 public static final synchronized native int /*long*/ g_list_reverse(int /*long*/ list);
@@ -459,8 +459,8 @@ public static final synchronized native void g_strfreev(int /*long*/ string_arra
 public static final synchronized native void g_thread_init(int /*long*/ vtable);
 public static final synchronized native boolean g_thread_supported();
 public static final synchronized native int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, int[] items_read, int[] items_written, int /*long*/[] error);
-public static final synchronized native int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, long offset);
-public static final synchronized native long g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos);
+public static final synchronized native int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset);
+public static final synchronized native int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos);
 public static final synchronized native int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ max);
 public static final synchronized native int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, int[] items_read, int[] items_written, int /*long*/[] error);
 public static final synchronized native int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/ len, int[] items_read, int[] items_written, int /*long*/[] error);
@@ -1024,7 +1024,6 @@ public static final native void memmove(GdkImage dest, int /*long*/ src);
 public static final native void memmove(GdkRectangle dest, int /*long*/ src, int /*long*/ size);
 public static final native void memmove(PangoAttribute dest, int /*long*/ src, int /*long*/ size);
 public static final native void memmove(int /*long*/ dest, int /*long*/[] src, int /*long*/ size);
-public static final native void memmove(long dest, int[] src, int /*long*/ size);
 public static final native void memmove(int /*long*/ dest, byte[] src, int /*long*/ size);
 public static final native void memmove(int[] dest, byte[] src, int /*long*/ size);
 public static final native void memmove(byte[] dest, int /*long*/ src, int /*long*/ size);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index 124f543c9a..98f6e6a65d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -568,10 +568,10 @@ void moveAbove (int /*long*/ child, int /*long*/ sibling) {
 		children = OS.g_list_append (children, childData);
 	} else {
 		temp = OS.g_list_next (siblingLink);
-		OS.g_list_next (childLink, temp);
-		OS.g_list_previous (temp, childLink);
-		OS.g_list_previous (childLink, siblingLink);
-		OS.g_list_next (siblingLink, childLink);
+		OS.g_list_set_next (childLink, temp);
+		OS.g_list_set_previous (temp, childLink);
+		OS.g_list_set_previous (childLink, siblingLink);
+		OS.g_list_set_next (siblingLink, childLink);
 	}
 	fixed.children = children;
 	OS.memmove (parentHandle, fixed);
@@ -605,10 +605,10 @@ void moveBelow (int /*long*/ child, int /*long*/ sibling) {
 		children = OS.g_list_prepend (children, childData);
 	} else {
 		temp = OS.g_list_previous (siblingLink);
-		OS.g_list_previous (childLink, temp);
-		OS.g_list_next (temp, childLink);
-		OS.g_list_next (childLink, siblingLink);
-		OS.g_list_previous (siblingLink, childLink);
+		OS.g_list_set_previous (childLink, temp);
+		OS.g_list_set_next (temp, childLink);
+		OS.g_list_set_next (childLink, siblingLink);
+		OS.g_list_set_previous (siblingLink, childLink);
 	}
 	fixed.children = children;
 	OS.memmove (parentHandle, fixed);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
index 0cdd748fba..251d309cd2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
@@ -769,8 +769,8 @@ public void setText (String string) {
 	buffer = Converter.wcsToMbcs (null, accelString, true);
 	int /*long*/ ptr = OS.g_malloc (buffer.length);
 	OS.memmove (ptr, buffer, buffer.length);
-	int oldPtr = OS.GTK_ACCEL_LABEL_ACCEL_STRING (label);
-	OS.GTK_ACCEL_LABEL_ACCEL_STRING (label, ptr);
+	int oldPtr = OS.GTK_ACCEL_LABEL_GET_ACCEL_STRING (label);
+	OS.GTK_ACCEL_LABEL_SET_ACCEL_STRING (label, ptr);
 	if (oldPtr != 0) OS.g_free (oldPtr);
 }