diff options
| author | Lillian Angel <langel@redhat.com> | 2005-08-04 15:47:30 +0000 |
|---|---|---|
| committer | Lillian Angel <langel@redhat.com> | 2005-08-04 15:47:30 +0000 |
| commit | d9d6af132377df6da27860d86540f9b0ad334a61 (patch) | |
| tree | 3e5050378037afc6e8033282baf84bf1a580be68 | |
| parent | e52ab2ccedeaa4420b231e62e97b1183d76ef6f8 (diff) | |
| download | classpath-d9d6af132377df6da27860d86540f9b0ad334a61.tar.gz | |
2005-08-04 Lillian Angel <langel@redhat.com>
* javax/swing/JCheckBox.java
(init): Moved these to ui
* javax/swing/plaf/basic/BasicCheckBoxUI.java
(installUI): initalized icons
* javax/swing/plaf/metal/MetalLookAndFeel.java:
Took out CheckBoxMenuItem defaults because did not
work as expected. For now it uses the BasicL&F's defaults.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | javax/swing/JCheckBox.java | 3 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicCheckBoxUI.java | 4 | ||||
| -rw-r--r-- | javax/swing/plaf/metal/MetalLookAndFeel.java | 6 |
4 files changed, 14 insertions, 9 deletions
@@ -1,3 +1,13 @@ +2005-08-04 Lillian Angel <langel@redhat.com> + + * javax/swing/JCheckBox.java + (init): Moved these to ui + * javax/swing/plaf/basic/BasicCheckBoxUI.java + (installUI): initalized icons + * javax/swing/plaf/metal/MetalLookAndFeel.java: + Took out CheckBoxMenuItem defaults because did not + work as expected. For now it uses the BasicL&F's defaults. + 2005-08-04 Anthony Balkissoon <abalkiss@redhat.com> * javax/swing/JList.java: diff --git a/javax/swing/JCheckBox.java b/javax/swing/JCheckBox.java index b6f5cd7d6..a743308dc 100644 --- a/javax/swing/JCheckBox.java +++ b/javax/swing/JCheckBox.java @@ -67,9 +67,6 @@ public class JCheckBox extends JToggleButton { borderPainted = false; contentAreaFilled = false; - UIDefaults defaults = UIManager.getLookAndFeelDefaults(); - setIcon(defaults.getIcon("CheckBox.icon")); - setSelectedIcon(defaults.getIcon("CheckBox.checkIcon")); } public JCheckBox() diff --git a/javax/swing/plaf/basic/BasicCheckBoxUI.java b/javax/swing/plaf/basic/BasicCheckBoxUI.java index e3167327c..a2085ecba 100644 --- a/javax/swing/plaf/basic/BasicCheckBoxUI.java +++ b/javax/swing/plaf/basic/BasicCheckBoxUI.java @@ -38,6 +38,7 @@ exception statement from your version. */ package javax.swing.plaf.basic; +import javax.swing.AbstractButton; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.UIDefaults; @@ -59,6 +60,9 @@ public class BasicCheckBoxUI extends BasicRadioButtonUI public void installUI(final JComponent c) { super.installUI(c); + UIDefaults defaults = UIManager.getLookAndFeelDefaults(); + ((AbstractButton) c).setIcon(defaults.getIcon("CheckBox.icon")); + ((AbstractButton) c).setSelectedIcon(defaults.getIcon("CheckBox.checkIcon")); } // Overridden to change method access. diff --git a/javax/swing/plaf/metal/MetalLookAndFeel.java b/javax/swing/plaf/metal/MetalLookAndFeel.java index 39cd189fd..72403e54b 100644 --- a/javax/swing/plaf/metal/MetalLookAndFeel.java +++ b/javax/swing/plaf/metal/MetalLookAndFeel.java @@ -778,12 +778,6 @@ public class MetalLookAndFeel extends BasicLookAndFeel "CheckBox.checkIcon", new UIDefaults.ProxyLazyValue ("javax.swing.plaf.metal.MetalCheckBoxIcon"), - "CheckBoxMenuItem.icon", - new UIDefaults.ProxyLazyValue - ("javax.swing.plaf.metal.MetalCheckBoxIcon"), - "CheckBoxMenuItem.checkIcon", - new UIDefaults.ProxyLazyValue - ("javax.swing.plaf.metal.MetalCheckBoxIcon"), "CheckBoxMenuItem.background", new ColorUIResource(getControl()), "ToolBar.background", new ColorUIResource(getControl()), "Panel.background", new ColorUIResource(getControl()), |