fix: symbol already declared - remove GtkLabelPeer.c

diff --git a/nat/GtkLabelPeer.c b/nat/GtkLabelPeer.c
deleted file mode 100644 (file)
index 49edcf4..0000000
--- a/nat/GtkLabelPeer.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Class:     gnu/java/awt/peer/gtk/GtkLabelPeer
- * Method:    nativeSetAlignment
- * Signature: (F)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment (JNIEnv *env ,  struct 
-gnu_java_awt_peer_gtk_GtkLabelPeer* this , float par1) {
-}

diff --git a/nat/gnu_java_awt_peer_gtk_GdkFontMetrics.h b/nat/gnu_java_awt_peer_gtk_GdkFontMetrics.h
index 5b59a712d4b0cb3ce54db519d17541eb3e6b3b24..15fe3cae37ec5252c6da4686c00a6e3b9a2b5f0a 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GdkFontMetrics.h
+++ b/nat/gnu_java_awt_peer_gtk_GdkFontMetrics.h
@@ -16,17 +16,17 @@ typedef struct gnu_java_awt_peer_gtk_GdkFontMetrics {
 /*
  * Class:     gnu/java/awt/peer/gtk/GdkFontMetrics
  * Method:    initState
- * Signature: (Ljava/lang/String;I)[I
+ * Signature: (Ljava/lang/String;II)[I
  */
-JNIEXPORT java_intarray* JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkFontMetrics* this, struct java_lang_String* par1, s4 par2);
+JNIEXPORT java_intarray* JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkFontMetrics* this, struct java_lang_String* par1, s4 par2, s4 par3);
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GdkFontMetrics
  * Method:    stringWidth
- * Signature: (Ljava/lang/String;)I
+ * Signature: (Ljava/lang/String;IILjava/lang/String;)I
  */
-JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkFontMetrics* this, struct java_lang_String* par1);
+JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkFontMetrics* this, struct java_lang_String* par1, s4 par2, s4 par3, struct java_lang_String* par4);
 
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GdkGraphics.h b/nat/gnu_java_awt_peer_gtk_GdkGraphics.h
index 3cf09dd4c691548aa0c8a03157ff74777e2a3ff7..fa86543e330b5bdc6932a2dc282d60086bb7a9f5 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GdkGraphics.h
+++ b/nat/gnu_java_awt_peer_gtk_GdkGraphics.h
@@ -23,7 +23,7 @@ typedef struct gnu_java_awt_peer_gtk_GdkGraphics {
  * Method:    initState
  * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;)[I
  */
-JNIEXPORT java_intarray* JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkGraphics* this, struct gnu_java_awt_peer_gtk_GtkComponentPeer* par1);
+JNIEXPORT java_intarray* JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkGraphics* this, struct gnu_java_awt_peer_gtk_GtkComponentPeer* par1);
 
 
 /*
@@ -31,7 +31,7 @@ JNIEXPORT java_intarray* JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initStat
  * Method:    initState
  * Signature: (II)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics0_initState(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkGraphics* this, s4 par1, s4 par2);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_initState__II(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkGraphics* this, s4 par1, s4 par2);
 
 
 /*
@@ -157,9 +157,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillRect(JNIEnv *e
 /*
  * Class:     gnu/java/awt/peer/gtk/GdkGraphics
  * Method:    drawString
- * Signature: (Ljava/lang/String;IILjava/lang/String;I)V
+ * Signature: (Ljava/lang/String;IILjava/lang/String;II)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkGraphics* this, struct java_lang_String* par1, s4 par2, s4 par3, struct java_lang_String* par4, s4 par5);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString(JNIEnv *env, struct gnu_java_awt_peer_gtk_GdkGraphics* this, struct java_lang_String* par1, s4 par2, s4 par3, struct java_lang_String* par4, s4 par5, s4 par6);
 
 
 /*

diff --git a/nat/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h b/nat/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
index fb54ab8d2af73ea15da4e9ae40b3260835eb28a2..449313f1c026bbd3a7d96cc8049b246b0a9f8546 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
+++ b/nat/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
@@ -10,6 +10,10 @@ typedef struct gnu_java_awt_peer_gtk_GdkPixbufDecoder {
    struct java_util_Vector* consumers;
    struct java_lang_String* filename;
    struct java_net_URL* url;
+   java_bytearray* data;
+   s4 offset;
+   s4 length;
+   struct java_io_InputStream* input;
    s4 native_state;
    struct java_util_Vector* curr;
 } gnu_java_awt_peer_gtk_GdkPixbufDecoder;

diff --git a/nat/gnu_java_awt_peer_gtk_GtkButtonPeer.h b/nat/gnu_java_awt_peer_gtk_GtkButtonPeer.h
index 1fe90d58de9402976f9a37a5ebe3fe0c492116c6..0155e0278ed508e09f7b8b8a0c467f8c0df1cc47 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkButtonPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkButtonPeer.h
@@ -22,6 +22,22 @@ typedef struct gnu_java_awt_peer_gtk_GtkButtonPeer {
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkButtonPeer* this);
 
 
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkButtonPeer
+ * Method:    connectJObject
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkButtonPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkButtonPeer
+ * Method:    connectSignals
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkButtonPeer* this);
+
+
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkButtonPeer
  * Method:    gtkSetFont
@@ -30,6 +46,14 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create(JNIEnv *e
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkButtonPeer* this, struct java_lang_String* par1, s4 par2, s4 par3);
 
 
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkButtonPeer
+ * Method:    gtkSetLabel
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkButtonPeer* this, struct java_lang_String* par1);
+
+
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkButtonPeer
  * Method:    gtkWidgetSetForeground
@@ -37,5 +61,13 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont(JNIEn
  */
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetSetForeground(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkButtonPeer* this, s4 par1, s4 par2, s4 par3);
 
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkButtonPeer
+ * Method:    gtkActivate
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkActivate(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkButtonPeer* this);
+
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h b/nat/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
index f2948f139f9e899abe35c1c0ceabf8bd3012a908..9eb654aaf2ded5ee0ae0fffda5729eb224229bdc 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
@@ -12,15 +12,16 @@ typedef struct gnu_java_awt_peer_gtk_GtkCheckboxPeer {
    struct java_awt_Component* awtComponent;
    struct java_awt_Insets* insets;
    struct gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer* old_group;
+   s4 currentState;
 } gnu_java_awt_peer_gtk_GtkCheckboxPeer;
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkCheckboxPeer
  * Method:    nativeCreate
- * Signature: (Lgnu/java/awt/peer/gtk/GtkCheckboxGroupPeer;)V
+ * Signature: (Lgnu/java/awt/peer/gtk/GtkCheckboxGroupPeer;Z)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkCheckboxPeer* this, struct gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer* par1);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkCheckboxPeer* this, struct gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer* par1, s4 par2);
 
 
 /*
@@ -33,10 +34,26 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeSetCheck
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkCheckboxPeer
- * Method:    connectHooks
+ * Method:    connectSignals
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectHooks(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkCheckboxPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkCheckboxPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkCheckboxPeer
+ * Method:    gtkSetFont
+ * Signature: (Ljava/lang/String;II)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkCheckboxPeer* this, struct java_lang_String* par1, s4 par2, s4 par3);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkCheckboxPeer
+ * Method:    gtkSetLabel
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkCheckboxPeer* this, struct java_lang_String* par1);
 
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkChoicePeer.h b/nat/gnu_java_awt_peer_gtk_GtkChoicePeer.h
index 33cfb0e17e742403e682b5c3c5eb869e42624016..478a48959aa4441a946edc62c251078cb197e0ce 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkChoicePeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkChoicePeer.h
@@ -32,18 +32,26 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_append(JNIEnv *e
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkChoicePeer
- * Method:    add
+ * Method:    getHistory
+ * Signature: ()I
+ */
+JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_getHistory(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkChoicePeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkChoicePeer
+ * Method:    nativeAdd
  * Signature: (Ljava/lang/String;I)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_add(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkChoicePeer* this, struct java_lang_String* par1, s4 par2);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeAdd(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkChoicePeer* this, struct java_lang_String* par1, s4 par2);
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkChoicePeer
- * Method:    remove
+ * Method:    nativeRemove
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_remove(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkChoicePeer* this, s4 par1);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkChoicePeer_nativeRemove(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkChoicePeer* this, s4 par1);
 
 
 /*

diff --git a/nat/gnu_java_awt_peer_gtk_GtkComponentPeer.h b/nat/gnu_java_awt_peer_gtk_GtkComponentPeer.h
index b0cae787fe562de369147a14b816d63cd1c9a79a..bb0d7d53fad62f7fa3dbc45dfa87c071cec59bb9 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkComponentPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkComponentPeer.h
@@ -62,6 +62,14 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetV
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, java_intarray* par1);
 
 
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
+ * Method:    gtkWidgetGetPreferredDimensions
+ * Signature: ([I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, java_intarray* par1);
+
+
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
  * Method:    gtkWidgetGetLocationOnScreen
@@ -96,18 +104,66 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetF
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
- * Method:    connectHooks
+ * Method:    gtkWidgetRequestFocus
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetRequestFocus(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
+ * Method:    gtkWidgetDispatchKeyEvent
+ * Signature: (IJIII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetDispatchKeyEvent(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, s4 par1, s8 par2, s4 par3, s4 par4, s4 par5);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
+ * Method:    gtkSetFont
+ * Signature: (Ljava/lang/String;II)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, s4 par2, s4 par3);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
+ * Method:    gtkWidgetQueueDrawArea
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, s4 par1, s4 par2, s4 par3, s4 par4);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
+ * Method:    addExposeFilter
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
+ * Method:    removeExposeFilter
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
+ * Method:    connectJObject
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this);
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkComponentPeer
- * Method:    requestFocus
+ * Method:    connectSignals
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this);
 
 
 /*
@@ -123,7 +179,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBoun
  * Method:    set
  * Signature: (Ljava/lang/String;Ljava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, struct java_lang_String* par2);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, struct java_lang_String* par2);
 
 
 /*
@@ -131,7 +187,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set(JNIEnv *e
  * Method:    set
  * Signature: (Ljava/lang/String;Z)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer0_set(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, s4 par2);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Z(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, s4 par2);
 
 
 /*
@@ -139,7 +195,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer0_set(JNIEnv *
  * Method:    set
  * Signature: (Ljava/lang/String;I)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer1_set(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, s4 par2);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2I(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, s4 par2);
 
 
 /*
@@ -147,7 +203,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer1_set(JNIEnv *
  * Method:    set
  * Signature: (Ljava/lang/String;F)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer2_set(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, float par2);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2F(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, float par2);
 
 
 /*
@@ -155,7 +211,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer2_set(JNIEnv *
  * Method:    set
  * Signature: (Ljava/lang/String;Ljava/lang/Object;)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer3_set(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, struct java_lang_Object* par2);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkComponentPeer* this, struct java_lang_String* par1, struct java_lang_Object* par2);
 
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h b/nat/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
index 91aeca945e799234d13d4c624ac002c2f50a5849..e8f895156243751fcb2c6cedc89ea2737db759de 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
@@ -14,6 +14,8 @@ typedef struct gnu_java_awt_peer_gtk_GtkFileDialogPeer {
    struct java_awt_Container* c;
    s4 hasBeenShown;
    s4 oldState;
+   struct java_lang_String* currentFile;
+   struct java_lang_String* currentDirectory;
 } gnu_java_awt_peer_gtk_GtkFileDialogPeer;
 
 
@@ -27,18 +29,26 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_create(JNIEn
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkFileDialogPeer
- * Method:    setFile
- * Signature: (Ljava/lang/String;)V
+ * Method:    connectJObject
+ * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_setFile(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFileDialogPeer* this, struct java_lang_String* par1);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectJObject(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFileDialogPeer* this);
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkFileDialogPeer
- * Method:    connectHooks
+ * Method:    connectSignals
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectHooks(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFileDialogPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFileDialogPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkFileDialogPeer
+ * Method:    nativeSetFile
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFile(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFileDialogPeer* this, struct java_lang_String* par1);
 
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkFramePeer.h b/nat/gnu_java_awt_peer_gtk_GtkFramePeer.h
index 5feff9a25fff90756b57ffe89e0bf2dddc025da5..1db8f5f3f06663d9fe8d0b4ca145fcdcf7c42a56 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkFramePeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkFramePeer.h
@@ -15,15 +15,16 @@ typedef struct gnu_java_awt_peer_gtk_GtkFramePeer {
    s4 hasBeenShown;
    s4 oldState;
    s4 menuBarHeight;
+   struct java_awt_peer_MenuBarPeer* menuBar;
 } gnu_java_awt_peer_gtk_GtkFramePeer;
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkFramePeer
  * Method:    getMenuBarHeight
- * Signature: ()I
+ * Signature: (Ljava/awt/peer/MenuBarPeer;)I
  */
-JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFramePeer* this);
+JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFramePeer* this, struct java_awt_peer_MenuBarPeer* par1);
 
 
 /*
@@ -33,5 +34,29 @@ JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight(JN
  */
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFramePeer* this, struct java_awt_peer_MenuBarPeer* par1);
 
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkFramePeer
+ * Method:    removeMenuBarPeer
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFramePeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkFramePeer
+ * Method:    moveLayout
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_moveLayout(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFramePeer* this, s4 par1);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkFramePeer
+ * Method:    gtkLayoutSetVisible
+ * Signature: (Z)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkLayoutSetVisible(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkFramePeer* this, s4 par1);
+
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkLabelPeer.h b/nat/gnu_java_awt_peer_gtk_GtkLabelPeer.h
index 6020b50316cd1f3f87fff02fb7fd0a4e11185e4a..a9d2e299bdc8b0940c22098383fbb402c76e1c28 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkLabelPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkLabelPeer.h
@@ -24,10 +24,10 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create(JNIEnv *en
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkLabelPeer
- * Method:    setText
- * Signature: (Ljava/lang/String;)V
+ * Method:    gtkSetFont
+ * Signature: (Ljava/lang/String;II)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkLabelPeer* this, struct java_lang_String* par1);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkLabelPeer* this, struct java_lang_String* par1, s4 par2, s4 par3);
 
 
 /*
@@ -37,5 +37,13 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText(JNIEnv *e
  */
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkLabelPeer* this, float par1);
 
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkLabelPeer
+ * Method:    setText
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkLabelPeer* this, struct java_lang_String* par1);
+
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkListPeer.h b/nat/gnu_java_awt_peer_gtk_GtkListPeer.h
index d07f2eb54dd90bba20a613ce4c0910f883c34e02..c5d065639cc8b1632d71e34b9d597fdc2ecf3362 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkListPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkListPeer.h
@@ -17,25 +17,49 @@ typedef struct gnu_java_awt_peer_gtk_GtkListPeer {
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkListPeer
  * Method:    create
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this, s4 par1);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkListPeer
+ * Method:    connectJObject
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectJObject(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkListPeer
+ * Method:    connectSignals
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkListPeer
+ * Method:    gtkSetFont
+ * Signature: (Ljava/lang/String;II)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_gtkSetFont(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this, struct java_lang_String* par1, s4 par2, s4 par3);
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkListPeer
- * Method:    connectHooks
+ * Method:    gtkWidgetRequestFocus
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectHooks(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_gtkWidgetRequestFocus(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this);
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkListPeer
  * Method:    getSize
- * Signature: (I[I)V
+ * Signature: (II[I)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this, s4 par1, java_intarray* par2);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkListPeer* this, s4 par1, s4 par2, java_intarray* par3);
 
 
 /*

diff --git a/nat/gnu_java_awt_peer_gtk_GtkMainThread.h b/nat/gnu_java_awt_peer_gtk_GtkMainThread.h
index 12f92a0b73213ecf112d83d5807ad9da3e246de7..53a9f2b48b5d91aea10daf6dd766d777317822f1 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkMainThread.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkMainThread.h
@@ -9,15 +9,16 @@ typedef struct gnu_java_awt_peer_gtk_GtkMainThread {
    java_objectheader header;
    s4 native_state;
    struct java_lang_Object* awtWidget;
+   s4 gtkInitCalled;
 } gnu_java_awt_peer_gtk_GtkMainThread;
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkMainThread
  * Method:    gtkInit
- * Signature: ()V
+ * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit(JNIEnv *env, jclass clazz);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit(JNIEnv *env, jclass clazz, s4 par1);
 
 
 /*

diff --git a/nat/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h b/nat/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
index a9c906e141388ee17edf12c3c69a7b4e6be5e7aa..47465f16b4db10448d49738213bf86cb1911dabc 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
@@ -20,6 +20,14 @@ typedef struct gnu_java_awt_peer_gtk_GtkMenuItemPeer {
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkMenuItemPeer* this, struct java_lang_String* par1);
 
 
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkMenuItemPeer
+ * Method:    connectSignals
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkMenuItemPeer* this);
+
+
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkMenuItemPeer
  * Method:    setLabel

diff --git a/nat/gnu_java_awt_peer_gtk_GtkPanelPeer.h b/nat/gnu_java_awt_peer_gtk_GtkPanelPeer.h
index f0141aae8b92989e76cc982ee4de344aecbaebf4..7aaec4e87afdc6a7f9e7095ba46e1e55d711b138 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkPanelPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkPanelPeer.h
@@ -25,10 +25,10 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_create(JNIEnv *en
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkPanelPeer
- * Method:    connectHooks
+ * Method:    connectJObject
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectHooks(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkPanelPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectJObject(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkPanelPeer* this);
 
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h b/nat/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
index 044327ab74b5a7abacb37c45fae26967bda4c8eb..65f545d9995e93710718b4d2ae793a839e11e7c0 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
@@ -18,17 +18,9 @@ typedef struct gnu_java_awt_peer_gtk_GtkScrollPanePeer {
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkScrollPanePeer
  * Method:    create
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollPanePeer* this);
-
-
-/*
- * Class:     gnu/java/awt/peer/gtk/GtkScrollPanePeer
- * Method:    gtkScrolledWindowNew
- * Signature: (Ljava/awt/peer/ComponentPeer;III[I)V
+ * Signature: (II)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowNew(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollPanePeer* this, struct java_awt_peer_ComponentPeer* par1, s4 par2, s4 par3, s4 par4, java_intarray* par5);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollPanePeer* this, s4 par1, s4 par2);
 
 
 /*
@@ -55,14 +47,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledW
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncrement(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollPanePeer* this, s4 par1);
 
 
-/*
- * Class:     gnu/java/awt/peer/gtk/GtkScrollPanePeer
- * Method:    gtkScrolledWindowSetSize
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetSize(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollPanePeer* this, s4 par1, s4 par2);
-
-
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkScrollPanePeer
  * Method:    setPolicy
@@ -71,14 +55,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledW
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_setPolicy(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollPanePeer* this, s4 par1);
 
 
-/*
- * Class:     gnu/java/awt/peer/gtk/GtkScrollPanePeer
- * Method:    childResized
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_childResized(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollPanePeer* this, s4 par1, s4 par2);
-
-
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkScrollPanePeer
  * Method:    getHScrollbarHeight

diff --git a/nat/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h b/nat/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
index d4c816b93b9bfacb8395456a559c57a8b5481400..de90e1d496fce217ec6d52c1db918e595de6cfaa 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
@@ -24,10 +24,18 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create(JNIEnv
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkScrollbarPeer
- * Method:    connectHooks
+ * Method:    connectJObject
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectHooks(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollbarPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollbarPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkScrollbarPeer
+ * Method:    connectSignals
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkScrollbarPeer* this);
 
 
 /*

diff --git a/nat/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h b/nat/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
index 0205ef920813e20c3e72b22738fe9f1b12094b56..fa5c8c3226b507a59575f884bcf3894b488f7878 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
@@ -17,9 +17,9 @@ typedef struct gnu_java_awt_peer_gtk_GtkTextAreaPeer {
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkTextAreaPeer
  * Method:    create
- * Signature: (I)V
+ * Signature: (III)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextAreaPeer* this, s4 par1);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextAreaPeer* this, s4 par1, s4 par2, s4 par3);
 
 
 /*
@@ -32,10 +32,10 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont(JNI
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkTextAreaPeer
- * Method:    gtkTextGetSize
- * Signature: ([I)V
+ * Method:    gtkWidgetRequestFocus
+ * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkTextGetSize(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextAreaPeer* this, java_intarray* par1);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkWidgetRequestFocus(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextAreaPeer* this);
 
 
 /*
@@ -53,5 +53,21 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert(JNIEnv
  */
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextAreaPeer* this, struct java_lang_String* par1, s4 par2, s4 par3);
 
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkTextAreaPeer
+ * Method:    getHScrollbarHeight
+ * Signature: ()I
+ */
+JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextAreaPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkTextAreaPeer
+ * Method:    getVScrollbarWidth
+ * Signature: ()I
+ */
+JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextAreaPeer* this);
+
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h b/nat/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
index 1ed1b7d325c33aa00cb007f712a66d3ac789621d..53609e70b516e266425268d429153d2ed1ab38cb 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
@@ -16,10 +16,10 @@ typedef struct gnu_java_awt_peer_gtk_GtkTextComponentPeer {
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkTextComponentPeer
- * Method:    connectHooks
+ * Method:    connectSignals
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectHooks(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextComponentPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextComponentPeer* this);
 
 
 /*

diff --git a/nat/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h b/nat/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
index 7f391cef226751d5b92b8d694759c99b68ae492c..8e020ec8ed8a2238c9b5b6fd8c55c4f17a0839f9 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
@@ -17,17 +17,17 @@ typedef struct gnu_java_awt_peer_gtk_GtkTextFieldPeer {
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkTextFieldPeer
  * Method:    create
- * Signature: ()V
+ * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextFieldPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextFieldPeer* this, s4 par1);
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkTextFieldPeer
- * Method:    gtkEntryGetSize
- * Signature: ([I)V
+ * Method:    gtkEntryGetBorderWidth
+ * Signature: ()I
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetSize(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextFieldPeer* this, java_intarray* par1);
+JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkTextFieldPeer* this);
 
 
 /*

diff --git a/nat/gnu_java_awt_peer_gtk_GtkToolkit.h b/nat/gnu_java_awt_peer_gtk_GtkToolkit.h
index a9f9ea896be33154b37a846164474793c7973d5c..dd86ef3a6e20a7a1adb2b034630844be3874bb2b 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkToolkit.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkToolkit.h
@@ -9,6 +9,7 @@ typedef struct gnu_java_awt_peer_gtk_GtkToolkit {
    java_objectheader header;
    struct java_util_Map* desktopProperties;
    struct java_beans_PropertyChangeSupport* desktopPropsSupport;
+   struct java_util_Map* imageCache;
    struct gnu_java_awt_peer_gtk_GtkMainThread* main;
    struct java_util_Hashtable* containers;
 } gnu_java_awt_peer_gtk_GtkToolkit;
@@ -45,5 +46,13 @@ JNIEXPORT s4 JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution(J
  */
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_sync(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkToolkit* this);
 
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkToolkit
+ * Method:    loadSystemColors
+ * Signature: ([I)V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_loadSystemColors(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkToolkit* this, java_intarray* par1);
+
 #endif
 

diff --git a/nat/gnu_java_awt_peer_gtk_GtkWindowPeer.h b/nat/gnu_java_awt_peer_gtk_GtkWindowPeer.h
index 7007180f8aefd7a5e4b66d5f4b6141635c30686c..22c6b2d66e8d91a4b5b44ccb73865cbcd1576d73 100644 (file)
--- a/nat/gnu_java_awt_peer_gtk_GtkWindowPeer.h
+++ b/nat/gnu_java_awt_peer_gtk_GtkWindowPeer.h
@@ -20,17 +20,25 @@ typedef struct gnu_java_awt_peer_gtk_GtkWindowPeer {
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkWindowPeer
  * Method:    create
- * Signature: (IZIILgnu/java/awt/peer/gtk/GtkWindowPeer;)V
+ * Signature: (IZIILgnu/java/awt/peer/gtk/GtkWindowPeer;[I)V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkWindowPeer* this, s4 par1, s4 par2, s4 par3, s4 par4, struct gnu_java_awt_peer_gtk_GtkWindowPeer* par5);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkWindowPeer* this, s4 par1, s4 par2, s4 par3, s4 par4, struct gnu_java_awt_peer_gtk_GtkWindowPeer* par5, java_intarray* par6);
 
 
 /*
  * Class:     gnu/java/awt/peer/gtk/GtkWindowPeer
- * Method:    connectHooks
+ * Method:    connectJObject
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectHooks(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkWindowPeer* this);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkWindowPeer* this);
+
+
+/*
+ * Class:     gnu/java/awt/peer/gtk/GtkWindowPeer
+ * Method:    connectSignals
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals(JNIEnv *env, struct gnu_java_awt_peer_gtk_GtkWindowPeer* this);
 
 
 /*