37683

12 files changed, 162 insertions, 899 deletions

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 6f41712645..b951d1bc53 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
@@ -310,6 +310,112 @@ JNIEXPORT void JNICALL OS_NATIVE(gtk_1rc_1style_1set_1ythickness)
 }
 #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)
@@ -360,16 +466,6 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileS
 }
 #endif
 
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkStyle_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkStyle_2)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkStyle_2\n")
-	if (arg1) getGtkStyleFields(env, arg1, (GtkStyle *)arg0);
-	NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_gtk_GtkStyle_2\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)
@@ -380,16 +476,6 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColor
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkStyle_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkStyle_2I)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1)
-{
-	NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkStyle_2I\n")
-	if (arg0) setGtkStyleFields(env, arg0, (GtkStyle *)arg1);
-	NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_gtk_GtkStyle_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)
@@ -410,7 +496,6 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjus
 }
 #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)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
index 62453469b9..9a3b569e2f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
@@ -1102,613 +1102,6 @@ void setGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *
 }
 #endif
 
-#ifndef NO_GtkStyle
-typedef struct GtkStyle_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID fg0_pixel, fg0_red, fg0_green, fg0_blue, fg1_pixel, fg1_red, fg1_green, fg1_blue, fg2_pixel, fg2_red, fg2_green, fg2_blue, fg3_pixel, fg3_red, fg3_green, fg3_blue, fg4_pixel, fg4_red, fg4_green, fg4_blue, bg0_pixel, bg0_red, bg0_green, bg0_blue, bg1_pixel, bg1_red, bg1_green, bg1_blue, bg2_pixel, bg2_red, bg2_green, bg2_blue, bg3_pixel, bg3_red, bg3_green, bg3_blue, bg4_pixel, bg4_red, bg4_green, bg4_blue, light0_pixel, light0_red, light0_green, light0_blue, light1_pixel, light1_red, light1_green, light1_blue, light2_pixel, light2_red, light2_green, light2_blue, light3_pixel, light3_red, light3_green, light3_blue, light4_pixel, light4_red, light4_green, light4_blue, dark0_pixel, dark0_red, dark0_green, dark0_blue, dark1_pixel, dark1_red, dark1_green, dark1_blue, dark2_pixel, dark2_red, dark2_green, dark2_blue, dark3_pixel, dark3_red, dark3_green, dark3_blue, dark4_pixel, dark4_red, dark4_green, dark4_blue, mid0_pixel, mid0_red, mid0_green, mid0_blue, mid1_pixel, mid1_red, mid1_green, mid1_blue, mid2_pixel, mid2_red, mid2_green, mid2_blue, mid3_pixel, mid3_red, mid3_green, mid3_blue, mid4_pixel, mid4_red, mid4_green, mid4_blue, text0_pixel, text0_red, text0_green, text0_blue, text1_pixel, text1_red, text1_green, text1_blue, text2_pixel, text2_red, text2_green, text2_blue, text3_pixel, text3_red, text3_green, text3_blue, text4_pixel, text4_red, text4_green, text4_blue, base0_pixel, base0_red, base0_green, base0_blue, base1_pixel, base1_red, base1_green, base1_blue, base2_pixel, base2_red, base2_green, base2_blue, base3_pixel, base3_red, base3_green, base3_blue, base4_pixel, base4_red, base4_green, base4_blue, black_pixel, black_red, black_green, black_blue, white_pixel, white_red, white_green, white_blue, font_desc, xthickness, ythickness, fg_gc0, fg_gc1, fg_gc2, fg_gc3, fg_gc4, bg_gc0, bg_gc1, bg_gc2, bg_gc3, bg_gc4, light_gc0, light_gc1, light_gc2, light_gc3, light_gc4, dark_gc0, dark_gc1, dark_gc2, dark_gc3, dark_gc4, mid_gc0, mid_gc1, mid_gc2, mid_gc3, mid_gc4, text_gc0, text_gc1, text_gc2, text_gc3, text_gc4, base_gc0, base_gc1, base_gc2, base_gc3, base_gc4, black_gc, white_gc, bg_pixmap0, bg_pixmap1, bg_pixmap2, bg_pixmap3, bg_pixmap4;
-} GtkStyle_FID_CACHE;
-
-GtkStyle_FID_CACHE GtkStyleFc;
-
-void cacheGtkStyleFields(JNIEnv *env, jobject lpObject)
-{
-	if (GtkStyleFc.cached) return;
-	GtkStyleFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GtkStyleFc.fg0_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg0_pixel", "I");
-	GtkStyleFc.fg0_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg0_red", "S");
-	GtkStyleFc.fg0_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg0_green", "S");
-	GtkStyleFc.fg0_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg0_blue", "S");
-	GtkStyleFc.fg1_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg1_pixel", "I");
-	GtkStyleFc.fg1_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg1_red", "S");
-	GtkStyleFc.fg1_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg1_green", "S");
-	GtkStyleFc.fg1_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg1_blue", "S");
-	GtkStyleFc.fg2_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg2_pixel", "I");
-	GtkStyleFc.fg2_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg2_red", "S");
-	GtkStyleFc.fg2_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg2_green", "S");
-	GtkStyleFc.fg2_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg2_blue", "S");
-	GtkStyleFc.fg3_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg3_pixel", "I");
-	GtkStyleFc.fg3_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg3_red", "S");
-	GtkStyleFc.fg3_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg3_green", "S");
-	GtkStyleFc.fg3_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg3_blue", "S");
-	GtkStyleFc.fg4_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg4_pixel", "I");
-	GtkStyleFc.fg4_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg4_red", "S");
-	GtkStyleFc.fg4_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg4_green", "S");
-	GtkStyleFc.fg4_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg4_blue", "S");
-	GtkStyleFc.bg0_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg0_pixel", "I");
-	GtkStyleFc.bg0_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg0_red", "S");
-	GtkStyleFc.bg0_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg0_green", "S");
-	GtkStyleFc.bg0_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg0_blue", "S");
-	GtkStyleFc.bg1_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg1_pixel", "I");
-	GtkStyleFc.bg1_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg1_red", "S");
-	GtkStyleFc.bg1_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg1_green", "S");
-	GtkStyleFc.bg1_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg1_blue", "S");
-	GtkStyleFc.bg2_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg2_pixel", "I");
-	GtkStyleFc.bg2_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg2_red", "S");
-	GtkStyleFc.bg2_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg2_green", "S");
-	GtkStyleFc.bg2_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg2_blue", "S");
-	GtkStyleFc.bg3_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg3_pixel", "I");
-	GtkStyleFc.bg3_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg3_red", "S");
-	GtkStyleFc.bg3_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg3_green", "S");
-	GtkStyleFc.bg3_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg3_blue", "S");
-	GtkStyleFc.bg4_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg4_pixel", "I");
-	GtkStyleFc.bg4_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg4_red", "S");
-	GtkStyleFc.bg4_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg4_green", "S");
-	GtkStyleFc.bg4_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg4_blue", "S");
-	GtkStyleFc.light0_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light0_pixel", "I");
-	GtkStyleFc.light0_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light0_red", "S");
-	GtkStyleFc.light0_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light0_green", "S");
-	GtkStyleFc.light0_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light0_blue", "S");
-	GtkStyleFc.light1_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light1_pixel", "I");
-	GtkStyleFc.light1_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light1_red", "S");
-	GtkStyleFc.light1_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light1_green", "S");
-	GtkStyleFc.light1_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light1_blue", "S");
-	GtkStyleFc.light2_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light2_pixel", "I");
-	GtkStyleFc.light2_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light2_red", "S");
-	GtkStyleFc.light2_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light2_green", "S");
-	GtkStyleFc.light2_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light2_blue", "S");
-	GtkStyleFc.light3_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light3_pixel", "I");
-	GtkStyleFc.light3_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light3_red", "S");
-	GtkStyleFc.light3_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light3_green", "S");
-	GtkStyleFc.light3_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light3_blue", "S");
-	GtkStyleFc.light4_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light4_pixel", "I");
-	GtkStyleFc.light4_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light4_red", "S");
-	GtkStyleFc.light4_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light4_green", "S");
-	GtkStyleFc.light4_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light4_blue", "S");
-	GtkStyleFc.dark0_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark0_pixel", "I");
-	GtkStyleFc.dark0_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark0_red", "S");
-	GtkStyleFc.dark0_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark0_green", "S");
-	GtkStyleFc.dark0_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark0_blue", "S");
-	GtkStyleFc.dark1_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark1_pixel", "I");
-	GtkStyleFc.dark1_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark1_red", "S");
-	GtkStyleFc.dark1_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark1_green", "S");
-	GtkStyleFc.dark1_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark1_blue", "S");
-	GtkStyleFc.dark2_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark2_pixel", "I");
-	GtkStyleFc.dark2_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark2_red", "S");
-	GtkStyleFc.dark2_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark2_green", "S");
-	GtkStyleFc.dark2_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark2_blue", "S");
-	GtkStyleFc.dark3_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark3_pixel", "I");
-	GtkStyleFc.dark3_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark3_red", "S");
-	GtkStyleFc.dark3_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark3_green", "S");
-	GtkStyleFc.dark3_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark3_blue", "S");
-	GtkStyleFc.dark4_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark4_pixel", "I");
-	GtkStyleFc.dark4_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark4_red", "S");
-	GtkStyleFc.dark4_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark4_green", "S");
-	GtkStyleFc.dark4_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark4_blue", "S");
-	GtkStyleFc.mid0_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid0_pixel", "I");
-	GtkStyleFc.mid0_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid0_red", "S");
-	GtkStyleFc.mid0_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid0_green", "S");
-	GtkStyleFc.mid0_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid0_blue", "S");
-	GtkStyleFc.mid1_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid1_pixel", "I");
-	GtkStyleFc.mid1_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid1_red", "S");
-	GtkStyleFc.mid1_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid1_green", "S");
-	GtkStyleFc.mid1_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid1_blue", "S");
-	GtkStyleFc.mid2_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid2_pixel", "I");
-	GtkStyleFc.mid2_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid2_red", "S");
-	GtkStyleFc.mid2_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid2_green", "S");
-	GtkStyleFc.mid2_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid2_blue", "S");
-	GtkStyleFc.mid3_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid3_pixel", "I");
-	GtkStyleFc.mid3_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid3_red", "S");
-	GtkStyleFc.mid3_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid3_green", "S");
-	GtkStyleFc.mid3_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid3_blue", "S");
-	GtkStyleFc.mid4_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid4_pixel", "I");
-	GtkStyleFc.mid4_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid4_red", "S");
-	GtkStyleFc.mid4_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid4_green", "S");
-	GtkStyleFc.mid4_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid4_blue", "S");
-	GtkStyleFc.text0_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text0_pixel", "I");
-	GtkStyleFc.text0_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text0_red", "S");
-	GtkStyleFc.text0_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text0_green", "S");
-	GtkStyleFc.text0_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text0_blue", "S");
-	GtkStyleFc.text1_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text1_pixel", "I");
-	GtkStyleFc.text1_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text1_red", "S");
-	GtkStyleFc.text1_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text1_green", "S");
-	GtkStyleFc.text1_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text1_blue", "S");
-	GtkStyleFc.text2_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text2_pixel", "I");
-	GtkStyleFc.text2_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text2_red", "S");
-	GtkStyleFc.text2_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text2_green", "S");
-	GtkStyleFc.text2_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text2_blue", "S");
-	GtkStyleFc.text3_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text3_pixel", "I");
-	GtkStyleFc.text3_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text3_red", "S");
-	GtkStyleFc.text3_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text3_green", "S");
-	GtkStyleFc.text3_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text3_blue", "S");
-	GtkStyleFc.text4_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text4_pixel", "I");
-	GtkStyleFc.text4_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text4_red", "S");
-	GtkStyleFc.text4_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text4_green", "S");
-	GtkStyleFc.text4_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text4_blue", "S");
-	GtkStyleFc.base0_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base0_pixel", "I");
-	GtkStyleFc.base0_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base0_red", "S");
-	GtkStyleFc.base0_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base0_green", "S");
-	GtkStyleFc.base0_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base0_blue", "S");
-	GtkStyleFc.base1_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base1_pixel", "I");
-	GtkStyleFc.base1_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base1_red", "S");
-	GtkStyleFc.base1_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base1_green", "S");
-	GtkStyleFc.base1_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base1_blue", "S");
-	GtkStyleFc.base2_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base2_pixel", "I");
-	GtkStyleFc.base2_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base2_red", "S");
-	GtkStyleFc.base2_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base2_green", "S");
-	GtkStyleFc.base2_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base2_blue", "S");
-	GtkStyleFc.base3_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base3_pixel", "I");
-	GtkStyleFc.base3_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base3_red", "S");
-	GtkStyleFc.base3_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base3_green", "S");
-	GtkStyleFc.base3_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base3_blue", "S");
-	GtkStyleFc.base4_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base4_pixel", "I");
-	GtkStyleFc.base4_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base4_red", "S");
-	GtkStyleFc.base4_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base4_green", "S");
-	GtkStyleFc.base4_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base4_blue", "S");
-	GtkStyleFc.black_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "black_pixel", "I");
-	GtkStyleFc.black_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "black_red", "S");
-	GtkStyleFc.black_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "black_green", "S");
-	GtkStyleFc.black_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "black_blue", "S");
-	GtkStyleFc.white_pixel = (*env)->GetFieldID(env, GtkStyleFc.clazz, "white_pixel", "I");
-	GtkStyleFc.white_red = (*env)->GetFieldID(env, GtkStyleFc.clazz, "white_red", "S");
-	GtkStyleFc.white_green = (*env)->GetFieldID(env, GtkStyleFc.clazz, "white_green", "S");
-	GtkStyleFc.white_blue = (*env)->GetFieldID(env, GtkStyleFc.clazz, "white_blue", "S");
-	GtkStyleFc.font_desc = (*env)->GetFieldID(env, GtkStyleFc.clazz, "font_desc", "I");
-	GtkStyleFc.xthickness = (*env)->GetFieldID(env, GtkStyleFc.clazz, "xthickness", "I");
-	GtkStyleFc.ythickness = (*env)->GetFieldID(env, GtkStyleFc.clazz, "ythickness", "I");
-	GtkStyleFc.fg_gc0 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg_gc0", "I");
-	GtkStyleFc.fg_gc1 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg_gc1", "I");
-	GtkStyleFc.fg_gc2 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg_gc2", "I");
-	GtkStyleFc.fg_gc3 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg_gc3", "I");
-	GtkStyleFc.fg_gc4 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "fg_gc4", "I");
-	GtkStyleFc.bg_gc0 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_gc0", "I");
-	GtkStyleFc.bg_gc1 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_gc1", "I");
-	GtkStyleFc.bg_gc2 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_gc2", "I");
-	GtkStyleFc.bg_gc3 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_gc3", "I");
-	GtkStyleFc.bg_gc4 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_gc4", "I");
-	GtkStyleFc.light_gc0 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light_gc0", "I");
-	GtkStyleFc.light_gc1 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light_gc1", "I");
-	GtkStyleFc.light_gc2 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light_gc2", "I");
-	GtkStyleFc.light_gc3 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light_gc3", "I");
-	GtkStyleFc.light_gc4 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "light_gc4", "I");
-	GtkStyleFc.dark_gc0 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark_gc0", "I");
-	GtkStyleFc.dark_gc1 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark_gc1", "I");
-	GtkStyleFc.dark_gc2 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark_gc2", "I");
-	GtkStyleFc.dark_gc3 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark_gc3", "I");
-	GtkStyleFc.dark_gc4 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "dark_gc4", "I");
-	GtkStyleFc.mid_gc0 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid_gc0", "I");
-	GtkStyleFc.mid_gc1 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid_gc1", "I");
-	GtkStyleFc.mid_gc2 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid_gc2", "I");
-	GtkStyleFc.mid_gc3 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid_gc3", "I");
-	GtkStyleFc.mid_gc4 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "mid_gc4", "I");
-	GtkStyleFc.text_gc0 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text_gc0", "I");
-	GtkStyleFc.text_gc1 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text_gc1", "I");
-	GtkStyleFc.text_gc2 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text_gc2", "I");
-	GtkStyleFc.text_gc3 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text_gc3", "I");
-	GtkStyleFc.text_gc4 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "text_gc4", "I");
-	GtkStyleFc.base_gc0 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base_gc0", "I");
-	GtkStyleFc.base_gc1 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base_gc1", "I");
-	GtkStyleFc.base_gc2 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base_gc2", "I");
-	GtkStyleFc.base_gc3 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base_gc3", "I");
-	GtkStyleFc.base_gc4 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "base_gc4", "I");
-	GtkStyleFc.black_gc = (*env)->GetFieldID(env, GtkStyleFc.clazz, "black_gc", "I");
-	GtkStyleFc.white_gc = (*env)->GetFieldID(env, GtkStyleFc.clazz, "white_gc", "I");
-	GtkStyleFc.bg_pixmap0 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_pixmap0", "I");
-	GtkStyleFc.bg_pixmap1 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_pixmap1", "I");
-	GtkStyleFc.bg_pixmap2 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_pixmap2", "I");
-	GtkStyleFc.bg_pixmap3 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_pixmap3", "I");
-	GtkStyleFc.bg_pixmap4 = (*env)->GetFieldID(env, GtkStyleFc.clazz, "bg_pixmap4", "I");
-	GtkStyleFc.cached = 1;
-}
-
-GtkStyle *getGtkStyleFields(JNIEnv *env, jobject lpObject, GtkStyle *lpStruct)
-{
-	if (!GtkStyleFc.cached) cacheGtkStyleFields(env, lpObject);
-	lpStruct->fg[0].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.fg0_pixel);
-	lpStruct->fg[0].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg0_red);
-	lpStruct->fg[0].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg0_green);
-	lpStruct->fg[0].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg0_blue);
-	lpStruct->fg[1].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.fg1_pixel);
-	lpStruct->fg[1].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg1_red);
-	lpStruct->fg[1].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg1_green);
-	lpStruct->fg[1].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg1_blue);
-	lpStruct->fg[2].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.fg2_pixel);
-	lpStruct->fg[2].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg2_red);
-	lpStruct->fg[2].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg2_green);
-	lpStruct->fg[2].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg2_blue);
-	lpStruct->fg[3].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.fg3_pixel);
-	lpStruct->fg[3].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg3_red);
-	lpStruct->fg[3].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg3_green);
-	lpStruct->fg[3].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg3_blue);
-	lpStruct->fg[4].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.fg4_pixel);
-	lpStruct->fg[4].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg4_red);
-	lpStruct->fg[4].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg4_green);
-	lpStruct->fg[4].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.fg4_blue);
-	lpStruct->bg[0].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.bg0_pixel);
-	lpStruct->bg[0].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg0_red);
-	lpStruct->bg[0].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg0_green);
-	lpStruct->bg[0].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg0_blue);
-	lpStruct->bg[1].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.bg1_pixel);
-	lpStruct->bg[1].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg1_red);
-	lpStruct->bg[1].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg1_green);
-	lpStruct->bg[1].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg1_blue);
-	lpStruct->bg[2].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.bg2_pixel);
-	lpStruct->bg[2].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg2_red);
-	lpStruct->bg[2].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg2_green);
-	lpStruct->bg[2].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg2_blue);
-	lpStruct->bg[3].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.bg3_pixel);
-	lpStruct->bg[3].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg3_red);
-	lpStruct->bg[3].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg3_green);
-	lpStruct->bg[3].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg3_blue);
-	lpStruct->bg[4].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.bg4_pixel);
-	lpStruct->bg[4].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg4_red);
-	lpStruct->bg[4].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg4_green);
-	lpStruct->bg[4].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.bg4_blue);
-	lpStruct->light[0].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.light0_pixel);
-	lpStruct->light[0].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.light0_red);
-	lpStruct->light[0].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.light0_green);
-	lpStruct->light[0].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.light0_blue);
-	lpStruct->light[1].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.light1_pixel);
-	lpStruct->light[1].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.light1_red);
-	lpStruct->light[1].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.light1_green);
-	lpStruct->light[1].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.light1_blue);
-	lpStruct->light[2].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.light2_pixel);
-	lpStruct->light[2].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.light2_red);
-	lpStruct->light[2].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.light2_green);
-	lpStruct->light[2].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.light2_blue);
-	lpStruct->light[3].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.light3_pixel);
-	lpStruct->light[3].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.light3_red);
-	lpStruct->light[3].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.light3_green);
-	lpStruct->light[3].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.light3_blue);
-	lpStruct->light[4].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.light4_pixel);
-	lpStruct->light[4].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.light4_red);
-	lpStruct->light[4].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.light4_green);
-	lpStruct->light[4].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.light4_blue);
-	lpStruct->dark[0].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.dark0_pixel);
-	lpStruct->dark[0].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark0_red);
-	lpStruct->dark[0].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark0_green);
-	lpStruct->dark[0].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark0_blue);
-	lpStruct->dark[1].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.dark1_pixel);
-	lpStruct->dark[1].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark1_red);
-	lpStruct->dark[1].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark1_green);
-	lpStruct->dark[1].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark1_blue);
-	lpStruct->dark[2].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.dark2_pixel);
-	lpStruct->dark[2].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark2_red);
-	lpStruct->dark[2].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark2_green);
-	lpStruct->dark[2].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark2_blue);
-	lpStruct->dark[3].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.dark3_pixel);
-	lpStruct->dark[3].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark3_red);
-	lpStruct->dark[3].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark3_green);
-	lpStruct->dark[3].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark3_blue);
-	lpStruct->dark[4].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.dark4_pixel);
-	lpStruct->dark[4].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark4_red);
-	lpStruct->dark[4].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark4_green);
-	lpStruct->dark[4].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.dark4_blue);
-	lpStruct->mid[0].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.mid0_pixel);
-	lpStruct->mid[0].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid0_red);
-	lpStruct->mid[0].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid0_green);
-	lpStruct->mid[0].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid0_blue);
-	lpStruct->mid[1].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.mid1_pixel);
-	lpStruct->mid[1].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid1_red);
-	lpStruct->mid[1].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid1_green);
-	lpStruct->mid[1].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid1_blue);
-	lpStruct->mid[2].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.mid2_pixel);
-	lpStruct->mid[2].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid2_red);
-	lpStruct->mid[2].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid2_green);
-	lpStruct->mid[2].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid2_blue);
-	lpStruct->mid[3].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.mid3_pixel);
-	lpStruct->mid[3].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid3_red);
-	lpStruct->mid[3].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid3_green);
-	lpStruct->mid[3].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid3_blue);
-	lpStruct->mid[4].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.mid4_pixel);
-	lpStruct->mid[4].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid4_red);
-	lpStruct->mid[4].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid4_green);
-	lpStruct->mid[4].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.mid4_blue);
-	lpStruct->text[0].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.text0_pixel);
-	lpStruct->text[0].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.text0_red);
-	lpStruct->text[0].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.text0_green);
-	lpStruct->text[0].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.text0_blue);
-	lpStruct->text[1].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.text1_pixel);
-	lpStruct->text[1].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.text1_red);
-	lpStruct->text[1].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.text1_green);
-	lpStruct->text[1].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.text1_blue);
-	lpStruct->text[2].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.text2_pixel);
-	lpStruct->text[2].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.text2_red);
-	lpStruct->text[2].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.text2_green);
-	lpStruct->text[2].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.text2_blue);
-	lpStruct->text[3].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.text3_pixel);
-	lpStruct->text[3].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.text3_red);
-	lpStruct->text[3].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.text3_green);
-	lpStruct->text[3].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.text3_blue);
-	lpStruct->text[4].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.text4_pixel);
-	lpStruct->text[4].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.text4_red);
-	lpStruct->text[4].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.text4_green);
-	lpStruct->text[4].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.text4_blue);
-	lpStruct->base[0].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.base0_pixel);
-	lpStruct->base[0].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.base0_red);
-	lpStruct->base[0].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.base0_green);
-	lpStruct->base[0].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.base0_blue);
-	lpStruct->base[1].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.base1_pixel);
-	lpStruct->base[1].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.base1_red);
-	lpStruct->base[1].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.base1_green);
-	lpStruct->base[1].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.base1_blue);
-	lpStruct->base[2].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.base2_pixel);
-	lpStruct->base[2].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.base2_red);
-	lpStruct->base[2].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.base2_green);
-	lpStruct->base[2].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.base2_blue);
-	lpStruct->base[3].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.base3_pixel);
-	lpStruct->base[3].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.base3_red);
-	lpStruct->base[3].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.base3_green);
-	lpStruct->base[3].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.base3_blue);
-	lpStruct->base[4].pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.base4_pixel);
-	lpStruct->base[4].red = (*env)->GetShortField(env, lpObject, GtkStyleFc.base4_red);
-	lpStruct->base[4].green = (*env)->GetShortField(env, lpObject, GtkStyleFc.base4_green);
-	lpStruct->base[4].blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.base4_blue);
-	lpStruct->black.pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.black_pixel);
-	lpStruct->black.red = (*env)->GetShortField(env, lpObject, GtkStyleFc.black_red);
-	lpStruct->black.green = (*env)->GetShortField(env, lpObject, GtkStyleFc.black_green);
-	lpStruct->black.blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.black_blue);
-	lpStruct->white.pixel = (*env)->GetIntField(env, lpObject, GtkStyleFc.white_pixel);
-	lpStruct->white.red = (*env)->GetShortField(env, lpObject, GtkStyleFc.white_red);
-	lpStruct->white.green = (*env)->GetShortField(env, lpObject, GtkStyleFc.white_green);
-	lpStruct->white.blue = (*env)->GetShortField(env, lpObject, GtkStyleFc.white_blue);
-	lpStruct->font_desc = (PangoFontDescription *)(*env)->GetIntField(env, lpObject, GtkStyleFc.font_desc);
-	lpStruct->xthickness = (*env)->GetIntField(env, lpObject, GtkStyleFc.xthickness);
-	lpStruct->ythickness = (*env)->GetIntField(env, lpObject, GtkStyleFc.ythickness);
-	lpStruct->fg_gc[0] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.fg_gc0);
-	lpStruct->fg_gc[1] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.fg_gc1);
-	lpStruct->fg_gc[2] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.fg_gc2);
-	lpStruct->fg_gc[3] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.fg_gc3);
-	lpStruct->fg_gc[4] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.fg_gc4);
-	lpStruct->bg_gc[0] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_gc0);
-	lpStruct->bg_gc[1] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_gc1);
-	lpStruct->bg_gc[2] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_gc2);
-	lpStruct->bg_gc[3] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_gc3);
-	lpStruct->bg_gc[4] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_gc4);
-	lpStruct->light_gc[0] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.light_gc0);
-	lpStruct->light_gc[1] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.light_gc1);
-	lpStruct->light_gc[2] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.light_gc2);
-	lpStruct->light_gc[3] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.light_gc3);
-	lpStruct->light_gc[4] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.light_gc4);
-	lpStruct->dark_gc[0] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.dark_gc0);
-	lpStruct->dark_gc[1] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.dark_gc1);
-	lpStruct->dark_gc[2] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.dark_gc2);
-	lpStruct->dark_gc[3] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.dark_gc3);
-	lpStruct->dark_gc[4] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.dark_gc4);
-	lpStruct->mid_gc[0] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.mid_gc0);
-	lpStruct->mid_gc[1] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.mid_gc1);
-	lpStruct->mid_gc[2] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.mid_gc2);
-	lpStruct->mid_gc[3] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.mid_gc3);
-	lpStruct->mid_gc[4] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.mid_gc4);
-	lpStruct->text_gc[0] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.text_gc0);
-	lpStruct->text_gc[1] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.text_gc1);
-	lpStruct->text_gc[2] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.text_gc2);
-	lpStruct->text_gc[3] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.text_gc3);
-	lpStruct->text_gc[4] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.text_gc4);
-	lpStruct->base_gc[0] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.base_gc0);
-	lpStruct->base_gc[1] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.base_gc1);
-	lpStruct->base_gc[2] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.base_gc2);
-	lpStruct->base_gc[3] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.base_gc3);
-	lpStruct->base_gc[4] = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.base_gc4);
-	lpStruct->black_gc = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.black_gc);
-	lpStruct->white_gc = (GdkGC *)(*env)->GetIntField(env, lpObject, GtkStyleFc.white_gc);
-	lpStruct->bg_pixmap[0] = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_pixmap0);
-	lpStruct->bg_pixmap[1] = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_pixmap1);
-	lpStruct->bg_pixmap[2] = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_pixmap2);
-	lpStruct->bg_pixmap[3] = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_pixmap3);
-	lpStruct->bg_pixmap[4] = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GtkStyleFc.bg_pixmap4);
-	return lpStruct;
-}
-
-void setGtkStyleFields(JNIEnv *env, jobject lpObject, GtkStyle *lpStruct)
-{
-	if (!GtkStyleFc.cached) cacheGtkStyleFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg0_pixel, (jint)lpStruct->fg[0].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg0_red, (jshort)lpStruct->fg[0].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg0_green, (jshort)lpStruct->fg[0].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg0_blue, (jshort)lpStruct->fg[0].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg1_pixel, (jint)lpStruct->fg[1].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg1_red, (jshort)lpStruct->fg[1].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg1_green, (jshort)lpStruct->fg[1].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg1_blue, (jshort)lpStruct->fg[1].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg2_pixel, (jint)lpStruct->fg[2].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg2_red, (jshort)lpStruct->fg[2].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg2_green, (jshort)lpStruct->fg[2].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg2_blue, (jshort)lpStruct->fg[2].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg3_pixel, (jint)lpStruct->fg[3].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg3_red, (jshort)lpStruct->fg[3].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg3_green, (jshort)lpStruct->fg[3].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg3_blue, (jshort)lpStruct->fg[3].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg4_pixel, (jint)lpStruct->fg[4].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg4_red, (jshort)lpStruct->fg[4].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg4_green, (jshort)lpStruct->fg[4].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.fg4_blue, (jshort)lpStruct->fg[4].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg0_pixel, (jint)lpStruct->bg[0].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg0_red, (jshort)lpStruct->bg[0].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg0_green, (jshort)lpStruct->bg[0].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg0_blue, (jshort)lpStruct->bg[0].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg1_pixel, (jint)lpStruct->bg[1].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg1_red, (jshort)lpStruct->bg[1].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg1_green, (jshort)lpStruct->bg[1].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg1_blue, (jshort)lpStruct->bg[1].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg2_pixel, (jint)lpStruct->bg[2].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg2_red, (jshort)lpStruct->bg[2].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg2_green, (jshort)lpStruct->bg[2].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg2_blue, (jshort)lpStruct->bg[2].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg3_pixel, (jint)lpStruct->bg[3].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg3_red, (jshort)lpStruct->bg[3].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg3_green, (jshort)lpStruct->bg[3].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg3_blue, (jshort)lpStruct->bg[3].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg4_pixel, (jint)lpStruct->bg[4].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg4_red, (jshort)lpStruct->bg[4].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg4_green, (jshort)lpStruct->bg[4].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.bg4_blue, (jshort)lpStruct->bg[4].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light0_pixel, (jint)lpStruct->light[0].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light0_red, (jshort)lpStruct->light[0].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light0_green, (jshort)lpStruct->light[0].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light0_blue, (jshort)lpStruct->light[0].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light1_pixel, (jint)lpStruct->light[1].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light1_red, (jshort)lpStruct->light[1].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light1_green, (jshort)lpStruct->light[1].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light1_blue, (jshort)lpStruct->light[1].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light2_pixel, (jint)lpStruct->light[2].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light2_red, (jshort)lpStruct->light[2].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light2_green, (jshort)lpStruct->light[2].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light2_blue, (jshort)lpStruct->light[2].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light3_pixel, (jint)lpStruct->light[3].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light3_red, (jshort)lpStruct->light[3].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light3_green, (jshort)lpStruct->light[3].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light3_blue, (jshort)lpStruct->light[3].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light4_pixel, (jint)lpStruct->light[4].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light4_red, (jshort)lpStruct->light[4].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light4_green, (jshort)lpStruct->light[4].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.light4_blue, (jshort)lpStruct->light[4].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark0_pixel, (jint)lpStruct->dark[0].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark0_red, (jshort)lpStruct->dark[0].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark0_green, (jshort)lpStruct->dark[0].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark0_blue, (jshort)lpStruct->dark[0].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark1_pixel, (jint)lpStruct->dark[1].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark1_red, (jshort)lpStruct->dark[1].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark1_green, (jshort)lpStruct->dark[1].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark1_blue, (jshort)lpStruct->dark[1].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark2_pixel, (jint)lpStruct->dark[2].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark2_red, (jshort)lpStruct->dark[2].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark2_green, (jshort)lpStruct->dark[2].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark2_blue, (jshort)lpStruct->dark[2].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark3_pixel, (jint)lpStruct->dark[3].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark3_red, (jshort)lpStruct->dark[3].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark3_green, (jshort)lpStruct->dark[3].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark3_blue, (jshort)lpStruct->dark[3].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark4_pixel, (jint)lpStruct->dark[4].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark4_red, (jshort)lpStruct->dark[4].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark4_green, (jshort)lpStruct->dark[4].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.dark4_blue, (jshort)lpStruct->dark[4].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid0_pixel, (jint)lpStruct->mid[0].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid0_red, (jshort)lpStruct->mid[0].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid0_green, (jshort)lpStruct->mid[0].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid0_blue, (jshort)lpStruct->mid[0].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid1_pixel, (jint)lpStruct->mid[1].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid1_red, (jshort)lpStruct->mid[1].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid1_green, (jshort)lpStruct->mid[1].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid1_blue, (jshort)lpStruct->mid[1].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid2_pixel, (jint)lpStruct->mid[2].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid2_red, (jshort)lpStruct->mid[2].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid2_green, (jshort)lpStruct->mid[2].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid2_blue, (jshort)lpStruct->mid[2].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid3_pixel, (jint)lpStruct->mid[3].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid3_red, (jshort)lpStruct->mid[3].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid3_green, (jshort)lpStruct->mid[3].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid3_blue, (jshort)lpStruct->mid[3].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid4_pixel, (jint)lpStruct->mid[4].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid4_red, (jshort)lpStruct->mid[4].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid4_green, (jshort)lpStruct->mid[4].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.mid4_blue, (jshort)lpStruct->mid[4].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text0_pixel, (jint)lpStruct->text[0].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text0_red, (jshort)lpStruct->text[0].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text0_green, (jshort)lpStruct->text[0].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text0_blue, (jshort)lpStruct->text[0].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text1_pixel, (jint)lpStruct->text[1].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text1_red, (jshort)lpStruct->text[1].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text1_green, (jshort)lpStruct->text[1].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text1_blue, (jshort)lpStruct->text[1].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text2_pixel, (jint)lpStruct->text[2].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text2_red, (jshort)lpStruct->text[2].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text2_green, (jshort)lpStruct->text[2].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text2_blue, (jshort)lpStruct->text[2].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text3_pixel, (jint)lpStruct->text[3].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text3_red, (jshort)lpStruct->text[3].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text3_green, (jshort)lpStruct->text[3].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text3_blue, (jshort)lpStruct->text[3].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text4_pixel, (jint)lpStruct->text[4].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text4_red, (jshort)lpStruct->text[4].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text4_green, (jshort)lpStruct->text[4].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.text4_blue, (jshort)lpStruct->text[4].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base0_pixel, (jint)lpStruct->base[0].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base0_red, (jshort)lpStruct->base[0].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base0_green, (jshort)lpStruct->base[0].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base0_blue, (jshort)lpStruct->base[0].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base1_pixel, (jint)lpStruct->base[1].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base1_red, (jshort)lpStruct->base[1].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base1_green, (jshort)lpStruct->base[1].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base1_blue, (jshort)lpStruct->base[1].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base2_pixel, (jint)lpStruct->base[2].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base2_red, (jshort)lpStruct->base[2].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base2_green, (jshort)lpStruct->base[2].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base2_blue, (jshort)lpStruct->base[2].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base3_pixel, (jint)lpStruct->base[3].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base3_red, (jshort)lpStruct->base[3].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base3_green, (jshort)lpStruct->base[3].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base3_blue, (jshort)lpStruct->base[3].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base4_pixel, (jint)lpStruct->base[4].pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base4_red, (jshort)lpStruct->base[4].red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base4_green, (jshort)lpStruct->base[4].green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.base4_blue, (jshort)lpStruct->base[4].blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.black_pixel, (jint)lpStruct->black.pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.black_red, (jshort)lpStruct->black.red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.black_green, (jshort)lpStruct->black.green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.black_blue, (jshort)lpStruct->black.blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.white_pixel, (jint)lpStruct->white.pixel);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.white_red, (jshort)lpStruct->white.red);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.white_green, (jshort)lpStruct->white.green);
-	(*env)->SetShortField(env, lpObject, GtkStyleFc.white_blue, (jshort)lpStruct->white.blue);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.font_desc, (jint)lpStruct->font_desc);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.xthickness, (jint)lpStruct->xthickness);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.ythickness, (jint)lpStruct->ythickness);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg_gc0, (jint)lpStruct->fg_gc[0]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg_gc1, (jint)lpStruct->fg_gc[1]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg_gc2, (jint)lpStruct->fg_gc[2]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg_gc3, (jint)lpStruct->fg_gc[3]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.fg_gc4, (jint)lpStruct->fg_gc[4]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_gc0, (jint)lpStruct->bg_gc[0]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_gc1, (jint)lpStruct->bg_gc[1]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_gc2, (jint)lpStruct->bg_gc[2]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_gc3, (jint)lpStruct->bg_gc[3]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_gc4, (jint)lpStruct->bg_gc[4]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light_gc0, (jint)lpStruct->light_gc[0]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light_gc1, (jint)lpStruct->light_gc[1]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light_gc2, (jint)lpStruct->light_gc[2]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light_gc3, (jint)lpStruct->light_gc[3]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.light_gc4, (jint)lpStruct->light_gc[4]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark_gc0, (jint)lpStruct->dark_gc[0]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark_gc1, (jint)lpStruct->dark_gc[1]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark_gc2, (jint)lpStruct->dark_gc[2]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark_gc3, (jint)lpStruct->dark_gc[3]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.dark_gc4, (jint)lpStruct->dark_gc[4]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid_gc0, (jint)lpStruct->mid_gc[0]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid_gc1, (jint)lpStruct->mid_gc[1]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid_gc2, (jint)lpStruct->mid_gc[2]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid_gc3, (jint)lpStruct->mid_gc[3]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.mid_gc4, (jint)lpStruct->mid_gc[4]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text_gc0, (jint)lpStruct->text_gc[0]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text_gc1, (jint)lpStruct->text_gc[1]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text_gc2, (jint)lpStruct->text_gc[2]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text_gc3, (jint)lpStruct->text_gc[3]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.text_gc4, (jint)lpStruct->text_gc[4]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base_gc0, (jint)lpStruct->base_gc[0]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base_gc1, (jint)lpStruct->base_gc[1]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base_gc2, (jint)lpStruct->base_gc[2]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base_gc3, (jint)lpStruct->base_gc[3]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.base_gc4, (jint)lpStruct->base_gc[4]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.black_gc, (jint)lpStruct->black_gc);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.white_gc, (jint)lpStruct->white_gc);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_pixmap0, (jint)lpStruct->bg_pixmap[0]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_pixmap1, (jint)lpStruct->bg_pixmap[1]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_pixmap2, (jint)lpStruct->bg_pixmap[2]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_pixmap3, (jint)lpStruct->bg_pixmap[3]);
-	(*env)->SetIntField(env, lpObject, GtkStyleFc.bg_pixmap4, (jint)lpStruct->bg_pixmap[4]);
-}
-#endif
-
 #ifndef NO_GtkTargetEntry
 typedef struct GtkTargetEntry_FID_CACHE {
 	int cached;
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 b590a55188..878263232f 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
@@ -183,14 +183,6 @@ void setGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *
 #define setGtkSelectionDataFields(a,b,c)
 #endif
 
-#ifndef NO_GtkStyle
-GtkStyle *getGtkStyleFields(JNIEnv *env, jobject lpObject, GtkStyle *lpStruct);
-void setGtkStyleFields(JNIEnv *env, jobject lpObject, GtkStyle *lpStruct);
-#else
-#define getGtkStyleFields(a,b,c) NULL
-#define setGtkStyleFields(a,b,c)
-#endif
-
 #ifndef NO_GtkTargetEntry
 GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct);
 void setGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkStyle.java
deleted file mode 100644
index ba478141f5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkStyle.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * 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.
- *******************************************************************************/
-package org.eclipse.swt.internal.gtk;
-
-
-public class GtkStyle {
-	public int fg0_pixel;
-	public short fg0_red, fg0_green, fg0_blue;
-	public int fg1_pixel;
-	public short fg1_red, fg1_green, fg1_blue;
-	public int fg2_pixel;
-	public short fg2_red, fg2_green, fg2_blue;
-	public int fg3_pixel;
-	public short fg3_red, fg3_green, fg3_blue;
-	public int fg4_pixel;
-	public short fg4_red, fg4_green, fg4_blue;
-	public int bg0_pixel;
-	public short bg0_red, bg0_green, bg0_blue;
-	public int bg1_pixel;
-	public short bg1_red, bg1_green, bg1_blue;
-	public int bg2_pixel;
-	public short bg2_red, bg2_green, bg2_blue;
-	public int bg3_pixel;
-	public short bg3_red, bg3_green, bg3_blue;
-	public int bg4_pixel;
-	public short bg4_red, bg4_green, bg4_blue;
-	public int light0_pixel;
-	public short light0_red, light0_green, light0_blue;
-	public int light1_pixel;
-	public short light1_red, light1_green, light1_blue;
-	public int light2_pixel;
-	public short light2_red, light2_green, light2_blue;
-	public int light3_pixel;
-	public short light3_red, light3_green, light3_blue;
-	public int light4_pixel;
-	public short light4_red, light4_green, light4_blue;
-	public int dark0_pixel;
-	public short dark0_red, dark0_green, dark0_blue;
-	public int dark1_pixel;
-	public short dark1_red, dark1_green, dark1_blue;
-	public int dark2_pixel;
-	public short dark2_red, dark2_green, dark2_blue;
-	public int dark3_pixel;
-	public short dark3_red, dark3_green, dark3_blue;
-	public int dark4_pixel;
-	public short dark4_red, dark4_green, dark4_blue;
-	public int mid0_pixel;
-	public short mid0_red, mid0_green, mid0_blue;
-	public int mid1_pixel;
-	public short mid1_red, mid1_green, mid1_blue;
-	public int mid2_pixel;
-	public short mid2_red, mid2_green, mid2_blue;
-	public int mid3_pixel;
-	public short mid3_red, mid3_green, mid3_blue;
-	public int mid4_pixel;
-	public short mid4_red, mid4_green, mid4_blue;
-	public int text0_pixel;
-	public short text0_red, text0_green, text0_blue;
-	public int text1_pixel;
-	public short text1_red, text1_green, text1_blue;
-	public int text2_pixel;
-	public short text2_red, text2_green, text2_blue;
-	public int text3_pixel;
-	public short text3_red, text3_green, text3_blue;
-	public int text4_pixel;
-	public short text4_red, text4_green, text4_blue;
-	public int base0_pixel;
-	public short base0_red, base0_green, base0_blue;
-	public int base1_pixel;
-	public short base1_red, base1_green, base1_blue;
-	public int base2_pixel;
-	public short base2_red, base2_green, base2_blue;
-	public int base3_pixel;
-	public short base3_red, base3_green, base3_blue;
-	public int base4_pixel;
-	public short base4_red, base4_green, base4_blue;
-	
-	public int black_pixel;
-	public short black_red, black_green, black_blue;
-	public int white_pixel;
-	public short white_red, white_green, white_blue;
-	
-	public int font_desc;
-	
-	public int xthickness, ythickness;
-	
-	public int fg_gc0, fg_gc1, fg_gc2, fg_gc3, fg_gc4;
-	public int bg_gc0, bg_gc1, bg_gc2, bg_gc3, bg_gc4;
-	public int light_gc0, light_gc1, light_gc2, light_gc3, light_gc4;
-	public int dark_gc0, dark_gc1, dark_gc2, dark_gc3, dark_gc4;
-	public int mid_gc0, mid_gc1, mid_gc2, mid_gc3, mid_gc4;
-	public int text_gc0, text_gc1, text_gc2, text_gc3, text_gc4;
-	public int base_gc0, base_gc1, base_gc2, base_gc3, base_gc4;
-	public int black_gc;
-	public int white_gc;
-	public int bg_pixmap0, bg_pixmap1, bg_pixmap2, bg_pixmap3, bg_pixmap4;
-}
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 6016cf878e..3b978661ce 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
@@ -694,6 +694,16 @@ public static final synchronized native int gtk_separator_menu_item_new();
 public static final synchronized native int gtk_set_locale();
 public static final synchronized native int gtk_socket_get_id(int socket);
 public static final synchronized native int gtk_socket_new();
+public static final synchronized native void gtk_style_get_base(int style, int index, GdkColor color);
+public static final synchronized native void gtk_style_get_black(int style, GdkColor color);
+public static final synchronized native void gtk_style_get_bg(int style, int index, GdkColor color);
+public static final synchronized native void gtk_style_get_dark(int style, int index, GdkColor color);
+public static final synchronized native void gtk_style_get_fg(int style, int index, GdkColor color);
+public static final synchronized native int gtk_style_get_font_desc(int style);
+public static final synchronized native void gtk_style_get_light(int style, int index, GdkColor color);
+public static final synchronized native void gtk_style_get_text(int style, int index, GdkColor color);
+public static final synchronized native int gtk_style_get_xthickness(int style);
+public static final synchronized native int gtk_style_get_ythickness(int style);
 public static final synchronized native int gtk_target_list_new(int targets, int ntargets);
 public static final synchronized native void gtk_target_list_unref(int list);
 public static final synchronized native void gtk_text_buffer_copy_clipboard(int buffer, int clipboard);
@@ -890,7 +900,6 @@ public static final synchronized native void gtk_window_set_transient_for(int wi
 public static final synchronized native void gtk_window_unmaximize(int handle);
 public static final native void memmove(int dest, GtkTargetEntry src, int size);
 public static final native void memmove(int dest, GtkAdjustment src);
-public static final native void memmove(int dest, GtkStyle src);
 public static final native void memmove(int dest, GdkEventButton src, int size);
 public static final native void memmove(int dest, PangoAttribute src, int size);
 public static final native void memmove(GtkColorSelectionDialog dest, int src);
@@ -898,7 +907,6 @@ public static final native void memmove(GtkFileSelection dest, int src);
 public static final native void memmove(GdkDragContext dest, int src, int size);
 public static final native void memmove(GtkSelectionData dest, int src, int size);
 public static final native void memmove(GtkTargetPair dest, int src, int size);
-public static final native void memmove(GtkStyle dest, int src);
 public static final native void memmove(GtkCombo dest, int src);
 public static final native void memmove(GtkAdjustment dest, int src);
 public static final native void memmove(GdkColor dest, int src, int size);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index a057bec561..d74b6fbab4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -278,14 +278,9 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc
  */
 public void drawFocus(int x, int y, int width, int height) {
 	if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	GtkStyle style = new GtkStyle();
 	//CHECK - default style might not be attached to any window
-	OS.memmove(style, OS.gtk_widget_get_default_style());
 	GdkColor color = new GdkColor();
-	color.pixel = style.fg0_pixel;
-	color.red = style.fg0_red;
-	color.green = style.fg0_green;
-	color.blue = style.fg0_blue;
+	OS.gtk_style_get_fg (OS.gtk_widget_get_default_style(), 0, color);
 	GdkGCValues values = new GdkGCValues();
 	OS.gdk_gc_get_values(handle, values);
 	OS.gdk_gc_set_foreground(handle, color);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index 5450c9c61d..52b16d159b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -293,10 +293,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 	int layout = OS.gtk_entry_get_layout (entryHandle);
 	OS.pango_layout_get_size (layout, w, h);
 	int xborder = INNER_BORDER, yborder = INNER_BORDER;
-	GtkStyle style = new GtkStyle (); 
-	OS.memmove (style, OS.gtk_widget_get_style (entryHandle));
-	xborder += style.xthickness;
-	yborder += style.ythickness;
+	int style = OS.gtk_widget_get_style (entryHandle);
+	xborder += OS.gtk_style_get_xthickness (style);
+	yborder += OS.gtk_style_get_ythickness (style);
 	int [] property = new int [1];
 	OS.gtk_widget_style_get (entryHandle, OS.interior_focus, property, 0);
 	if (property [0] != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 5a77053ea2..dd1b70b124 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -1329,25 +1329,15 @@ GdkColor getBackgroundColor () {
 
 GdkColor getBgColor () {
 	int fontHandle = fontHandle ();
-	GtkStyle style = new GtkStyle ();
-	OS.memmove (style, OS.gtk_widget_get_style (fontHandle));
 	GdkColor color = new GdkColor ();
-	color.pixel = style.bg0_pixel;
-	color.red = style.bg0_red;
-	color.green = style.bg0_green;
-	color.blue = style.bg0_blue;
+	OS.gtk_style_get_bg (OS.gtk_widget_get_style (fontHandle), 0, color);
 	return color;
 }
 
 GdkColor getBaseColor () {
 	int fontHandle = fontHandle ();
-	GtkStyle style = new GtkStyle ();
-	OS.memmove (style, OS.gtk_widget_get_style (fontHandle));
 	GdkColor color = new GdkColor ();
-	color.pixel = style.base0_pixel;
-	color.red = style.base0_red;
-	color.green = style.base0_green;
-	color.blue = style.base0_blue;
+	OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle), 0, color);
 	return color;
 }
 
@@ -1404,9 +1394,7 @@ public Font getFont () {
 	
 int getFontDescription () {
 	int fontHandle = fontHandle ();
-	GtkStyle style = new GtkStyle ();
-	OS.memmove(style, OS.gtk_widget_get_style (fontHandle));
-	return style.font_desc;
+	return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));
 }
 
 /**
@@ -1430,13 +1418,8 @@ GdkColor getForegroundColor () {
 
 GdkColor getFgColor () {
 	int fontHandle = fontHandle ();
-	GtkStyle style = new GtkStyle ();
-	OS.memmove(style, OS.gtk_widget_get_style (fontHandle));
 	GdkColor color = new GdkColor ();
-	color.pixel = style.fg0_pixel;
-	color.red = style.fg0_red;
-	color.green = style.fg0_green;
-	color.blue = style.fg0_blue;
+	OS.gtk_style_get_fg (OS.gtk_widget_get_style (fontHandle), 0, color);
 	return color;
 }
 
@@ -1446,13 +1429,8 @@ Point getIMCaretPos () {
 
 GdkColor getTextColor () {
 	int fontHandle = fontHandle ();
-	GtkStyle style = new GtkStyle ();
-	OS.memmove(style, OS.gtk_widget_get_style (fontHandle));
 	GdkColor color = new GdkColor ();
-	color.pixel = style.text0_pixel;
-	color.red = style.text0_red;
-	color.green = style.text0_green;
-	color.blue = style.text0_blue;
+	OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle), 0, color);
 	return color;
 }
 
@@ -1882,22 +1860,10 @@ public int internal_new_GC (GCData data) {
 			data.style |= style & (mask | SWT.MIRRORED);
 		}
 		int fontHandle = fontHandle ();
-		GtkStyle style = new GtkStyle ();
-		OS.memmove(style, OS.gtk_widget_get_style (fontHandle));
-		GdkColor foreground = new GdkColor ();
-		foreground.pixel = style.fg0_pixel;
-		foreground.red = style.fg0_red;
-		foreground.green = style.fg0_green;
-		foreground.blue = style.fg0_blue;
-		GdkColor background = new GdkColor ();
-		background.pixel = style.bg0_pixel;
-		background.red = style.bg0_red;
-		background.green = style.bg0_green;
-		background.blue = style.bg0_blue;
 		data.drawable = window;
 		data.device = display;
-		data.background = background;
-		data.foreground = foreground;
+		data.background = getBackgroundColor ();
+		data.foreground = getForegroundColor ();
 		data.font = font != null ? font.handle : defaultFont (); 
 	}	
 	return gdkGC;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index bbdff3cfad..666cc60a24 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -1198,151 +1198,89 @@ void initializeSystemResources () {
 	OS.gtk_widget_realize (tooltipShellHandle);
 
 	GdkColor gdkColor;
-	GtkStyle style = new GtkStyle();
-	OS.memmove (style, OS.gtk_widget_get_style (shellHandle));	
-	GtkStyle tooltipStyle = new GtkStyle();
-	OS.memmove (tooltipStyle, OS.gtk_widget_get_style (tooltipShellHandle));
+	int style = OS.gtk_widget_get_style (shellHandle);	
+	int tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle);
 	
-	defaultFont = OS.pango_font_description_copy (style.font_desc);
+	defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.black_pixel;
-	gdkColor.red   = style.black_red;
-	gdkColor.green = style.black_green;
-	gdkColor.blue  = style.black_blue;
+	OS.gtk_style_get_black (style, gdkColor);
 	COLOR_WIDGET_DARK_SHADOW = gdkColor;
 	
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.dark0_pixel;
-	gdkColor.red   = style.dark0_red;
-	gdkColor.green = style.dark0_green;
-	gdkColor.blue  = style.dark0_blue;
+	OS.gtk_style_get_dark (style, 0, gdkColor);
 	COLOR_WIDGET_NORMAL_SHADOW = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.bg0_pixel;
-	gdkColor.red   = style.bg0_red;
-	gdkColor.green = style.bg0_green;
-	gdkColor.blue  = style.bg0_blue;
+	OS.gtk_style_get_bg (style, 0, gdkColor);
 	COLOR_WIDGET_LIGHT_SHADOW = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.light0_pixel;
-	gdkColor.red   = style.light0_red;
-	gdkColor.green = style.light0_green;
-	gdkColor.blue  = style.light0_blue;
+	OS.gtk_style_get_light (style, 0, gdkColor);
 	COLOR_WIDGET_HIGHLIGHT_SHADOW = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.fg0_pixel;
-	gdkColor.red   = style.fg0_red;
-	gdkColor.green = style.fg0_green;
-	gdkColor.blue  = style.fg0_blue;
+	OS.gtk_style_get_fg (style, 0, gdkColor);
 	COLOR_WIDGET_FOREGROUND = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.bg0_pixel;
-	gdkColor.red   = style.bg0_red;
-	gdkColor.green = style.bg0_green;
-	gdkColor.blue  = style.bg0_blue;
+	OS.gtk_style_get_bg (style, 0, gdkColor);
 	COLOR_WIDGET_BACKGROUND = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.text0_pixel;
-	gdkColor.red   = style.text0_red;
-	gdkColor.green = style.text0_green;
-	gdkColor.blue  = style.text0_blue;
+	OS.gtk_style_get_text (style, 0, gdkColor);
 	COLOR_TEXT_FOREGROUND = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.base0_pixel;
-	gdkColor.red   = style.base0_red;
-	gdkColor.green = style.base0_green;
-	gdkColor.blue  = style.base0_blue;
+	OS.gtk_style_get_base (style, 0, gdkColor);
 	COLOR_TEXT_BACKGROUND = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.text0_pixel;
-	gdkColor.red   = style.text0_red;
-	gdkColor.green = style.text0_green;
-	gdkColor.blue  = style.text0_blue;
+	OS.gtk_style_get_text (style, 0, gdkColor);
 	COLOR_LIST_FOREGROUND = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.base0_pixel;
-	gdkColor.red   = style.base0_red;
-	gdkColor.green = style.base0_green;
-	gdkColor.blue  = style.base0_blue;
+	OS.gtk_style_get_base (style, 0, gdkColor);
 	COLOR_LIST_BACKGROUND = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.text3_pixel;
-	gdkColor.red   = style.text3_red;
-	gdkColor.green = style.text3_green;
-	gdkColor.blue  = style.text3_blue;
+	OS.gtk_style_get_text (style, 3, gdkColor);
 	COLOR_LIST_SELECTION_TEXT = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.base3_pixel;
-	gdkColor.red   = style.base3_red;
-	gdkColor.green = style.base3_green;
-	gdkColor.blue  = style.base3_blue;
+	OS.gtk_style_get_base (style, 3, gdkColor);
 	COLOR_LIST_SELECTION = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = tooltipStyle.fg0_pixel;
-	gdkColor.red   = tooltipStyle.fg0_red;
-	gdkColor.green = tooltipStyle.fg0_green;
-	gdkColor.blue  = tooltipStyle.fg0_blue;
+	OS.gtk_style_get_fg (tooltipStyle, 0, gdkColor);
 	COLOR_INFO_FOREGROUND = gdkColor;
 
 	gdkColor = new GdkColor();
-	gdkColor.pixel = tooltipStyle.bg0_pixel;
-	gdkColor.red   = tooltipStyle.bg0_red;
-	gdkColor.green = tooltipStyle.bg0_green;
-	gdkColor.blue  = tooltipStyle.bg0_blue;
+	OS.gtk_style_get_bg (tooltipStyle, 0, gdkColor);
 	COLOR_INFO_BACKGROUND = gdkColor;
 	
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.bg3_pixel;
-	gdkColor.red   = style.bg3_red;
-	gdkColor.green = style.bg3_green;
-	gdkColor.blue  = style.bg3_blue;
+	OS.gtk_style_get_bg (style, 3, gdkColor);
 	COLOR_TITLE_BACKGROUND = gdkColor;
 	
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.fg3_pixel;
-	gdkColor.red   = style.fg3_red;
-	gdkColor.green = style.fg3_green;
-	gdkColor.blue  = style.fg3_blue;
+	OS.gtk_style_get_fg (style, 3, gdkColor);
 	COLOR_TITLE_FOREGROUND = gdkColor;
 	
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.light3_pixel;
-	gdkColor.red   = style.light3_red;
-	gdkColor.green = style.light3_green;
-	gdkColor.blue  = style.light3_blue;
+	OS.gtk_style_get_light (style, 3, gdkColor);
 	COLOR_TITLE_BACKGROUND_GRADIENT = gdkColor;
 	
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.bg4_pixel;
-	gdkColor.red   = style.bg4_red;
-	gdkColor.green = style.bg4_green;
-	gdkColor.blue  = style.bg4_blue;
+	OS.gtk_style_get_bg (style, 4, gdkColor);
 	COLOR_TITLE_INACTIVE_BACKGROUND = gdkColor;
 	
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.fg4_pixel;
-	gdkColor.red   = style.fg4_red;
-	gdkColor.green = style.fg4_green;
-	gdkColor.blue  = style.fg4_blue;
+	OS.gtk_style_get_fg (style, 4, gdkColor);
 	COLOR_TITLE_INACTIVE_FOREGROUND = gdkColor;
 	
 	gdkColor = new GdkColor();
-	gdkColor.pixel = style.light4_pixel;
-	gdkColor.red   = style.light4_red;
-	gdkColor.green = style.light4_green;
-	gdkColor.blue  = style.light4_blue;
+	OS.gtk_style_get_light (style, 4, gdkColor);
 	COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT = gdkColor;
 
 	OS.gtk_widget_destroy (tooltipShellHandle);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
index 39f2e1b7bd..2f9a55c647 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
@@ -109,12 +109,13 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
 	trimWidth  += vScrollBarWidth ();
 	if (scrolledHandle != 0) {
 		if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {
-			GtkStyle style = new GtkStyle ();
-			OS.memmove (style, OS.gtk_widget_get_style (scrolledHandle));
-			trimX -= style.xthickness;
-			trimY -= style.ythickness;
-			trimWidth += style.xthickness * 2;
-			trimHeight += style.ythickness * 2;
+			int style = OS.gtk_widget_get_style (scrolledHandle);
+			int xthickness = OS.gtk_style_get_xthickness (style);
+			int ythickness = OS.gtk_style_get_ythickness (style);
+			trimX -= xthickness;
+			trimY -= ythickness;
+			trimWidth += xthickness * 2;
+			trimHeight += ythickness * 2;
 		}
 	}
 	return new Rectangle (trimX, trimY, trimWidth, trimHeight);
@@ -155,9 +156,7 @@ public int getBorderWidth () {
 	if (scrolledHandle != 0) {
 		border += OS.gtk_container_get_border_width (scrolledHandle);
 		if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {
-			GtkStyle style = new GtkStyle ();
-			OS.memmove (style, OS.gtk_widget_get_style (scrolledHandle));
-			border += style.xthickness;
+			border += OS.gtk_style_get_xthickness (OS.gtk_widget_get_style (scrolledHandle));
 		}
 	}
 	return border;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index 921303b761..18a3f47e7a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -486,13 +486,8 @@ void createHandle (int index) {
 	}
 	if ((style & (SWT.NO_TRIM | SWT.BORDER | SWT.RESIZE)) == 0) {
 		OS.gtk_container_set_border_width (shellHandle, 1);
-		GtkStyle style = new GtkStyle ();
-		OS.memmove (style, OS.gtk_widget_get_style (shellHandle));
 		GdkColor color = new GdkColor ();
-		color.red = style.black_red;
-		color.green = style.black_green;
-		color.blue = style.black_blue;
-		color.pixel = style.black_pixel;
+		OS.gtk_style_get_black (OS.gtk_widget_get_style (shellHandle), color);
 		OS.gtk_widget_modify_bg (shellHandle, 0, color);
 	}
 	//TEMPORARY CODE
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
index 955eb394c4..a60f90f5f9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
@@ -290,10 +290,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 		int layout = OS.gtk_entry_get_layout (handle);
 		OS.pango_layout_get_size (layout, w, h);
 		if ((style & SWT.BORDER) != 0) {
-			GtkStyle style = new GtkStyle (); 
-			OS.memmove (style, OS.gtk_widget_get_style (handle));
-			xborder += style.xthickness;
-			yborder += style.ythickness;
+			int style = OS.gtk_widget_get_style (handle);
+			xborder += OS.gtk_style_get_xthickness (style);
+			yborder += OS.gtk_style_get_ythickness (style);
 		}
 		xborder += INNER_BORDER;
 		yborder += INNER_BORDER;