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
This commit is contained in:
David Jee 2004-02-10 17:12:09 +00:00 committed by David Jee
parent 31cc608177
commit 49d77e2275
3 changed files with 29 additions and 1 deletions

View File

@ -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.

View File

@ -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)

View File

@ -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)