Index: javax/swing/JCheckBox.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBox.java,v
retrieving revision 1.15
diff -u -r1.15 JCheckBox.java
--- javax/swing/JCheckBox.java	4 Aug 2005 14:29:46 -0000	1.15
+++ javax/swing/JCheckBox.java	4 Aug 2005 15:42:43 -0000
@@ -67,9 +67,6 @@
   {
     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/BasicCheckBoxUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java,v
retrieving revision 1.8
diff -u -r1.8 BasicCheckBoxUI.java
--- javax/swing/plaf/basic/BasicCheckBoxUI.java	2 Jul 2005 20:32:50 -0000	1.8
+++ javax/swing/plaf/basic/BasicCheckBoxUI.java	4 Aug 2005 15:42:43 -0000
@@ -38,6 +38,7 @@
 
 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 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.
Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.36
diff -u -r1.36 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java	4 Aug 2005 14:29:46 -0000	1.36
+++ javax/swing/plaf/metal/MetalLookAndFeel.java	4 Aug 2005 15:42:43 -0000
@@ -778,12 +778,6 @@
       "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()),