2004-02-10 David Jee <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkButtonPeer.java
	(gtkSetLabel): New native method definition.
	(setLabel): Use gtkSetLabel.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel): New method.

From-SVN: r77604

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ec293183985ccd2995c56ba57d57af1b8532bf49..8134d7ea4ba6e91a3108d06c12720d8c76cfd966 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-10  David Jee  <djee@redhat.com>
+
+       * gnu/java/awt/peer/gtk/GtkButtonPeer.java
+       (gtkSetLabel): New native method definition.
+       (setLabel): Use gtkSetLabel.
+       * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
+       (Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel): New method.
+
 2004-02-10  Alan Modra  <amodra@bigpond.net.au>
 
        * include/powerpc-signal.h: Revert 2004-01-21 change.

diff --git a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java
index 9a832265b34bd318922b5c038147d435bab889e4..cf7260c11798f89806ac98faad22e0acaa752149 100644 (file)
--- a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java
@@ -54,6 +54,7 @@ public class GtkButtonPeer extends GtkComponentPeer
   public native void connectSignals ();
 
   native void gtkSetFont(String name, int style, int size);
+  native void gtkSetLabel(String label);
   native void gtkWidgetSetForeground (int red, int green, int blue);
 
   public GtkButtonPeer (Button b)
@@ -63,7 +64,7 @@ public class GtkButtonPeer extends GtkComponentPeer
 
   public void setLabel (String label) 
   {
-    set ("label", label);
+    gtkSetLabel(label);
   }
 
   public void handleEvent (AWTEvent e)

diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
index e16b2d457d679bab11009c8927c9dcf97275691e..7f5d44a2d7c13f81aa43c8a90c665b20a371527c 100644 (file)
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
@@ -87,6 +87,25 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals
   Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
 }
 
+JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel
+  (JNIEnv *env, jobject obj, jstring jtext)
+{
+  const char *text;
+  GtkWidget *label;
+  void *ptr;
+
+  ptr = NSA_GET_PTR (env, obj);
+  label = gtk_bin_get_child (GTK_BIN(ptr));
+  text = (*env)->GetStringUTFChars (env, jtext, NULL);
+
+  gdk_threads_enter ();
+  gtk_label_set_text (GTK_LABEL(label), text);
+  gdk_threads_leave ();
+
+  (*env)->ReleaseStringUTFChars (env, jtext, text);
+}
+
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont
   (JNIEnv *env, jobject obj, jstring name, jint style, jint size)