diff options
| author | David Jee <djee@redhat.com> | 2004-01-26 21:04:06 +0000 |
|---|---|---|
| committer | David Jee <djee@gcc.gnu.org> | 2004-01-26 21:04:06 +0000 |
| commit | 81a88a6157451550a5753e436021523f93226fc9 (patch) | |
| tree | 442f662276f6dbb3a94bbc6d44ea22894c7837d6 /libjava | |
| parent | 18874af693864a095fbf1d7ac881ac929e3a15b6 (diff) | |
| download | gcc-81a88a6157451550a5753e436021523f93226fc9.zip gcc-81a88a6157451550a5753e436021523f93226fc9.tar.gz gcc-81a88a6157451550a5753e436021523f93226fc9.tar.bz2 | |
2004-01-26 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(find_bg_color_widget): For GtkButton, return its child.
From-SVN: r76667
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f59d55f..0e2e661 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-01-26 David Jee <djee@redhat.com> + + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c + (find_bg_color_widget): For GtkButton, return its child. + 2004-01-26 Kim Ho <kho@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (menuBarHeight): Mark diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c index b244fd7..1966227 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c @@ -621,7 +621,7 @@ find_fg_color_widget (GtkWidget *widget) { GtkWidget *fg_color_widget; - if (GTK_IS_EVENT_BOX (widget)) + if (GTK_IS_EVENT_BOX (widget) || GTK_IS_BUTTON (widget)) fg_color_widget = gtk_bin_get_child (GTK_BIN(widget)); else fg_color_widget = widget; |