diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2003-07-29 19:42:37 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2003-07-29 19:42:37 +0000 |
| commit | 5596e92fd8ffd4f3f908e12a3a958fa92cb6e076 (patch) | |
| tree | a91d03214eb9318f66b67618c18dce682d7acbf0 /libjava/jni/gtk-peer | |
| parent | 52c0c542ae190ab901e87c8216ea8199f6a17d24 (diff) | |
| download | gcc-5596e92fd8ffd4f3f908e12a3a958fa92cb6e076.zip gcc-5596e92fd8ffd4f3f908e12a3a958fa92cb6e076.tar.gz gcc-5596e92fd8ffd4f3f908e12a3a958fa92cb6e076.tar.bz2 | |
GtkButtonPeer.java: Call getName rather than getXLFD.
2003-07-29 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkButtonPeer.java: Call getName rather
than getXLFD.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
(gtkSetFont): Scale size parameter by PANGO_SCALE.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c:
Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c:
Likewise.
From-SVN: r69936
Diffstat (limited to 'libjava/jni/gtk-peer')
3 files changed, 14 insertions, 9 deletions
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 e87a9c4..110b019 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c @@ -42,11 +42,11 @@ exception statement from your version. */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create (JNIEnv *env, jobject obj) { - GtkButton *button; + GtkWidget *button; gdk_threads_enter (); button = gtk_button_new(); - gtk_widget_show (GTK_WIDGET(button)); + gtk_widget_show (button); gdk_threads_leave (); NSA_SET_PTR (env, obj, button); } @@ -74,8 +74,10 @@ Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); - pango_font_description_set_size (font_desc, size); + pango_font_description_set_size (font_desc, size * PANGO_SCALE); + gtk_widget_modify_font (GTK_WIDGET(label), font_desc); + pango_font_description_free (font_desc); gdk_threads_leave(); diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c index 103ddd2..3ebe2ab 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c @@ -170,18 +170,19 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont ptr = NSA_GET_PTR (env, obj); text = GTK_WIDGET (TEXT_FROM_SW (ptr)); - + font_name = (*env)->GetStringUTFChars (env, jname, NULL); gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); - pango_font_description_set_size (font_desc, size); + pango_font_description_set_size (font_desc, size * PANGO_SCALE); + gtk_widget_modify_font (GTK_WIDGET(text), font_desc); + pango_font_description_free (font_desc); - + gdk_threads_leave(); (*env)->ReleaseStringUTFChars (env, jname, font_name); - } diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c index 7836bb3..d089348 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c @@ -110,15 +110,17 @@ Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkSetFont PangoFontDescription *font_desc; ptr = NSA_GET_PTR (env, obj); - + entry = GTK_WIDGET (ptr); font_name = (*env)->GetStringUTFChars (env, jname, NULL); gdk_threads_enter(); font_desc = pango_font_description_from_string (font_name); - pango_font_description_set_size (font_desc, size); + pango_font_description_set_size (font_desc, size * PANGO_SCALE); + gtk_widget_modify_font (GTK_WIDGET(entry), font_desc); + pango_font_description_free (font_desc); gdk_threads_leave(); |