diff options
| author | djee <djee@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-26 21:04:06 +0000 |
|---|---|---|
| committer | djee <djee@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-26 21:04:06 +0000 |
| commit | 7deff5bef7928d09f41d33f6d4ea4efb5042407c (patch) | |
| tree | 442f662276f6dbb3a94bbc6d44ea22894c7837d6 | |
| parent | 663fb6892e9f03aa1e4a74494b85c22e55bfd13e (diff) | |
| download | gcc-7deff5bef7928d09f41d33f6d4ea4efb5042407c.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76667 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 f59d55f8235..0e2e661b70d 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 b244fd7d59d..1966227c650 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; |