From 53ecd42649b37964cfba8517accf3849a8f99d03 Mon Sep 17 00:00:00 2001 From: fitzsim Date: Tue, 29 Jul 2003 19:42:37 +0000 Subject: 2003-07-29 Thomas Fitzsimmons * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69936 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java | 2 +- libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java | 2 +- libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/gnu') diff --git a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java index 0aa42f5307a..830b9f08f8b 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java @@ -95,6 +95,6 @@ public class GtkButtonPeer extends GtkComponentPeer public void setFont (Font f) { - gtkSetFont(((GtkFontPeer)f.getPeer()).getXLFD(), f.getSize()); + gtkSetFont(f.getName(), f.getSize()); } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java index 7fdbac0aa99..b8973fdca95 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java @@ -107,6 +107,6 @@ public class GtkTextAreaPeer extends GtkTextComponentPeer public void setFont (Font f) { - gtkSetFont(((GtkFontPeer)f.getPeer()).getXLFD(), f.getSize()); + gtkSetFont(f.getName(), f.getSize()); } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java index efc3ff7c58a..20f61aa81e0 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java @@ -104,7 +104,7 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer public void setFont (Font f) { - gtkSetFont(((GtkFontPeer)f.getPeer()).getXLFD(), f.getSize()); + gtkSetFont(f.getName(), f.getSize()); } public void handleEvent (AWTEvent e) -- cgit v1.2.3