From 81a88a6157451550a5753e436021523f93226fc9 Mon Sep 17 00:00:00 2001 From: David Jee Date: Mon, 26 Jan 2004 21:04:06 +0000 Subject: [PATCH] 2004-01-26 David Jee * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (find_bg_color_widget): For GtkButton, return its child. From-SVN: r76667 --- libjava/ChangeLog | 5 +++++ .../jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c + (find_bg_color_widget): For GtkButton, return its child. + 2004-01-26 Kim Ho * 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;