Fixed because swingDemo was not working properly for checkboxes. It was
using the checkIcon for both the icon and selectedIcon before. Now
works well!
2005-08-04 Lillian Angel <[EMAIL PROTECTED]>
* javax/swing/JCheckBox.java
(init): Initialized icons. Was not working otherwise.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added in checkIcon for the CheckBox.
* javax/swing/plaf/metal/MetalLookAndFeel.java:
Added in checkIcon for CheckBox and defaults for
CheckBoxMenuItem.
Index: javax/swing/JCheckBox.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBox.java,v
retrieving revision 1.14
diff -u -r1.14 JCheckBox.java
--- javax/swing/JCheckBox.java 27 Jul 2005 12:41:33 -0000 1.14
+++ javax/swing/JCheckBox.java 4 Aug 2005 14:24:13 -0000
@@ -67,6 +67,9 @@
{
borderPainted = false;
contentAreaFilled = false;
+ UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+ setIcon(defaults.getIcon("CheckBox.icon"));
+ setSelectedIcon(defaults.getIcon("CheckBox.checkIcon"));
}
public JCheckBox()
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.42
diff -u -r1.42 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java 3 Aug 2005 19:21:20 -0000 1.42
+++ javax/swing/plaf/basic/BasicLookAndFeel.java 4 Aug 2005 14:24:13 -0000
@@ -291,6 +291,14 @@
{
public Object createValue(UIDefaults def)
{
+ return BasicIconFactory.getCheckBoxIcon();
+ }
+ },
+ "CheckBox.checkIcon",
+ new UIDefaults.LazyValue()
+ {
+ public Object createValue(UIDefaults def)
+ {
return BasicIconFactory.getMenuItemCheckIcon();
}
},
Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.35
diff -u -r1.35 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java 27 Jul 2005 14:43:40 -0000 1.35
+++ javax/swing/plaf/metal/MetalLookAndFeel.java 4 Aug 2005 14:24:14 -0000
@@ -774,6 +774,15 @@
"CheckBox.background", new ColorUIResource(getControl()),
"CheckBox.icon",
new UIDefaults.ProxyLazyValue
+ ("javax.swing.plaf.metal.MetalCheckBoxIcon"),
+ "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()),
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
