Index: javax/swing/plaf/basic/BasicComboBoxUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java,v
retrieving revision 1.18
diff -u -r1.18 BasicComboBoxUI.java
--- javax/swing/plaf/basic/BasicComboBoxUI.java	19 Sep 2005 08:51:36 -0000	1.18
+++ javax/swing/plaf/basic/BasicComboBoxUI.java	28 Sep 2005 14:02:41 -0000
@@ -242,14 +242,16 @@
   protected void installDefaults()
   {
     UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-
-    if (comboBox.getFont() instanceof UIResource)
+    Font f = comboBox.getFont();
+    Color fore = comboBox.getForeground();
+    Color back = comboBox.getBackground();
+    if (f == null || f instanceof UIResource)
       comboBox.setFont(defaults.getFont("ComboBox.font"));
     
-    if (comboBox.getForeground() instanceof UIResource)
+    if (fore == null || fore instanceof UIResource)
       comboBox.setForeground(defaults.getColor("ComboBox.foreground"));
 
-    if (comboBox.getBackground() instanceof UIResource)
+    if (back == null || back instanceof UIResource)
       comboBox.setBackground(defaults.getColor("ComboBox.background"));
 
     // fetch the button color scheme