summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--javax/swing/plaf/basic/BasicLabelUI.java2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 34a82acac..9273a1d01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-06-29 Roman Kennke <roman@kennke.org>
+ * javax/swing/plaf/basic/BasicLabelUI.java
+ (installDefaults): Do not set the border here.
+ (uninstallDefaults): Do not unset the border here.
+
+2005-06-29 Roman Kennke <roman@kennke.org>
+
* javax/swing/JComponent.java
(getComponentGraphics): Do not replicate the Graphics at this
point. This is moved into paintComponent.
diff --git a/javax/swing/plaf/basic/BasicLabelUI.java b/javax/swing/plaf/basic/BasicLabelUI.java
index 32525f2a1..363ac2a6e 100644
--- a/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/javax/swing/plaf/basic/BasicLabelUI.java
@@ -350,7 +350,6 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
c.setForeground(defaults.getColor("Label.foreground"));
c.setBackground(defaults.getColor("Label.background"));
c.setFont(defaults.getFont("Label.font"));
- c.setBorder(defaults.getBorder("Label.border"));
//XXX: There are properties we don't use called disabledForeground
//and disabledShadow.
}
@@ -366,7 +365,6 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
c.setForeground(null);
c.setBackground(null);
c.setFont(null);
- c.setBorder(null);
}
/**