2007-04-25 Roman Kennke <roman@kennke.org>

	* gnu/java/awt/peer/gtk/GdkFontPeer.java,
	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
	* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
	* gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
	* gnu/java/awt/peer/gtk/GtkGenericPeer.java,
	* gnu/java/awt/peer/gtk/GtkToolkit.java:
	Added fields to hold the native state. Added class initialization
	things to fetch the JNI field IDs.
	* include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h,
	* include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h,
	* include/gnu_java_awt_peer_gtk_GtkGenericPeer.h,
	* include/gnu_java_awt_peer_gtk_GtkToolkit.h:
	Added / changed class init methods for field ID initialization.
	* native/jni/classpath/Makefile.am: Removed native_state stuff.
	* native/jni/classpath/native_state.c,
	* native/jni/classpath/native_state.h: Removed.
	* native/jni/gconf-peer/Makefile.am: Removed native_state stuff.
	* native/jni/gtk-peer/Makefile.am: Removed native_state stuff.
	* native/jni/gtk-peer/cairographics2d.h,
	* native/jni/gtk-peer/gdkdisplay.h,
	* native/jni/gtk-peer/gdkfont.h,
	* native/jni/gtk-peer/GtkDragSourceContextPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
	* native/jni/gtk-peer/gtk_jawt.c:
	Removed native state stuff and replaced that with an approach
	to store the native state of an object directly in that object.
	* native/jni/gtk-peer/gtkpeer.c: New file. Implements the new native
	state management.
	* native/jni/gtk-peer/gtkpeer.h: Remove NSA stuff and added
	prototypes for new native state handling.

4 files changed, 4 insertions, 2 deletions

diff --git a/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h b/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h
index 6177a6fb9..aa0bd0156 100644
--- a/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h
+++ b/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h
@@ -10,7 +10,7 @@ extern "C"
 {
 #endif
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_initStaticState (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_initIDs (JNIEnv *env, jclass);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeInitState (JNIEnv *env, jobject);
 JNIEXPORT jobjectArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetScreenDevices (JNIEnv *env, jobject);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetDefaultScreenDevice (JNIEnv *env, jobject);
diff --git a/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h b/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
index 8037af082..37654e4f4 100644
--- a/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
+++ b/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
@@ -10,7 +10,7 @@ extern "C"
 {
 #endif
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_initStaticState (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_initIDs (JNIEnv *env, jclass);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetFixedDisplayMode (JNIEnv *env, jobject, jobject);
 JNIEXPORT jstring JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetIDString (JNIEnv *env, jobject);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetDisplayModeIndex (JNIEnv *env, jobject, jobject);
diff --git a/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h b/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h
index fd9b10687..1a95d70d3 100644
--- a/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h
+++ b/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h
@@ -10,6 +10,7 @@ extern "C"
 {
 #endif
 
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_initIDs (JNIEnv *env, jclass);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_gtkWidgetModifyFont (JNIEnv *env, jobject, jstring, jint, jint);
 
diff --git a/include/gnu_java_awt_peer_gtk_GtkToolkit.h b/include/gnu_java_awt_peer_gtk_GtkToolkit.h
index 5bceda7ad..ad6eb3944 100644
--- a/include/gnu_java_awt_peer_gtk_GtkToolkit.h
+++ b/include/gnu_java_awt_peer_gtk_GtkToolkit.h
@@ -13,6 +13,7 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env, jclass, jint, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkMain (JNIEnv *env, jclass);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkQuit (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_initIDs (JNIEnv *env, jclass);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_beep (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions (JNIEnv *env, jobject, jintArray);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution (JNIEnv *env, jobject);