From 96ee392a6f4e91718ac028b33cd36d132939a396 Mon Sep 17 00:00:00 2001 From: djee Date: Tue, 13 Jan 2004 17:55:20 +0000 Subject: [PATCH] =?utf8?q?2004-01-13=EF=BF=BD=EF=BF=BD=20David=20Jee?= =?utf8?q?=EF=BF=BD=EF=BF=BD=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * gnu/java/awt/peer/gtk/GtkContainerPeer.java (setBackground): New method. Children with no explicitly-set background will be repainted with the parent container's new background color. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75809 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 15 +++++++++++++++ libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index eb423b3..1e32bc4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2004-01-13  David Jee  + + * gnu/java/awt/peer/gtk/GtkContainerPeer.java + (setBackground): New method. Children with no explicitly-set + background will be repainted with the parent container's new + background color. + +2004-01-13  David Jee  + + * Makefile.am: Add BitwiseXORComposite.java. + * Makefile.in: Regenerated. + * gcj/Makefile.in: Regenerated. + * include/Makefile.in: Regenerated. + * testsuite/Makefile.in: Regenerated. + 2004-01-12 Fernando Nasser * gnu/java/awt/peer/gtk/TestAWT.java: Fix test program so that it does diff --git a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java index e51b7f0..e888172 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java @@ -39,6 +39,8 @@ exception statement from your version. */ package gnu.java.awt.peer.gtk; import java.awt.AWTEvent; +import java.awt.Color; +import java.awt.Component; import java.awt.Container; import java.awt.Graphics; import java.awt.Insets; @@ -136,4 +138,23 @@ public class GtkContainerPeer extends GtkComponentPeer public void beginLayout () { } public void endLayout () { } public boolean isPaintPending () { return false; } + + public void setBackground (Color c) + { + super.setBackground(c); + + Object components[] = ((Container) awtComponent).getComponents(); + for (int i = 0; i < components.length; i++) + { + Component comp = (Component) components[i]; + + // If the child's background has not been explicitly set yet, + // it should inherit this container's background. This makes the + // child component appear as if it has a transparent background. + // Note that we do not alter the background property of the child, + // but only repaint the child with the parent's background color. + if (!comp.isBackgroundSet() && comp.getPeer() != null) + comp.getPeer().setBackground(c); + } + } } -- 2.7.4