summaryrefslogtreecommitdiff
path: root/java/awt
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2007-01-07 21:12:33 +0000
committerRoman Kennke <roman@kennke.org>2007-01-07 21:12:33 +0000
commitfb9160f48bbcba869acc08e210e92c3be1acea82 (patch)
tree196605e10f2acb8d9fcfa6e00e75c817bb81c810 /java/awt
parentdecd1972a517e1a88da29d2f5941e3e4d0a4a994 (diff)
downloadclasspath-fb9160f48bbcba869acc08e210e92c3be1acea82.tar.gz
2007-01-07 Roman Kennke <roman@kennke.org>
PR 30337 * java/awt/Component.java (getFontImpl): Return null when the component has no font set and also has no parent yet. * javax/swing/plaf/basic/BasicComboBoxUI.java (PropertyChangeHandler.propertyChange): Only add editor when combo box is editable. Avoid fetching the property name repeatedly. Invalidate when renderer or prototypeDisplayValue change. (uninstallComponents): Unconfigure everything and then remove all components. * javax/swing/plaf/basic/BasicComboPopup.java (uninstallingUI): Don't nullify list model. * javax/swing/plaf/metal/MetalComboBoxUI.java (createArrowButton): Pass currentValuePane to the MetalComboBoxButton constructor rather than a new (unconnected) CellRendererPane.
Diffstat (limited to 'java/awt')
-rw-r--r--java/awt/Component.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/awt/Component.java b/java/awt/Component.java
index ac045d5d3..7f2cbb423 100644
--- a/java/awt/Component.java
+++ b/java/awt/Component.java
@@ -1198,7 +1198,12 @@ public abstract class Component
if (p != null)
f = p.getFontImpl();
else
- f = new Font("Dialog", Font.PLAIN, 12);
+ {
+ // It is important to return null here and not some kind of default
+ // font, otherwise the Swing UI would not install its fonts because
+ // it keeps non-UIResource fonts.
+ f = null;
+ }
}
return f;
}