diff options
author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-18 00:59:33 +0000 |
---|---|---|
committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-18 00:59:33 +0000 |
commit | 15d27402f51cf831d82aa31271f5c01855b4f2cf (patch) | |
tree | 4c44aaa3ed1ee1b4f15732664c05cfc9214e1fa9 /libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java | |
parent | 820206ad46c6fc0131d5771ec1051267022e875d (diff) | |
download | ppe42-gcc-15d27402f51cf831d82aa31271f5c01855b4f2cf.tar.gz ppe42-gcc-15d27402f51cf831d82aa31271f5c01855b4f2cf.zip |
Imported GNU Classpath gcj-import-20051117.
* gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
* sources.am: Regenerated.
* Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107153 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java')
-rw-r--r-- | libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java index 73d3e6173d3..56022f3331e 100644 --- a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java +++ b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java @@ -66,7 +66,6 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import javax.swing.UIDefaults; import javax.swing.UIManager; /** @@ -718,13 +717,11 @@ public class BasicInternalFrameTitlePane extends JComponent */ protected void installDefaults() { - UIDefaults defaults = UIManager.getLookAndFeelDefaults(); - - title.setFont(defaults.getFont("InternalFrame.titleFont")); - selectedTextColor = defaults.getColor("InternalFrame.activeTitleForeground"); - selectedTitleColor = defaults.getColor("InternalFrame.activeTitleBackground"); - notSelectedTextColor = defaults.getColor("InternalFrame.inactiveTitleForeground"); - notSelectedTitleColor = defaults.getColor("InternalFrame.inactiveTitleBackground"); + title.setFont(UIManager.getFont("InternalFrame.titleFont")); + selectedTextColor = UIManager.getColor("InternalFrame.activeTitleForeground"); + selectedTitleColor = UIManager.getColor("InternalFrame.activeTitleBackground"); + notSelectedTextColor = UIManager.getColor("InternalFrame.inactiveTitleForeground"); + notSelectedTitleColor = UIManager.getColor("InternalFrame.inactiveTitleBackground"); closeIcon = UIManager.getIcon("InternalFrame.closeIcon"); iconIcon = UIManager.getIcon("InternalFrame.iconifyIcon"); @@ -901,6 +898,9 @@ public class BasicInternalFrameTitlePane extends JComponent */ protected void paintTitleBackground(Graphics g) { + if (!isOpaque()) + return; + Color saved = g.getColor(); Dimension dims = getSize(); |