summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2005-11-02 18:23:00 +0000
committerRoman Kennke <roman@kennke.org>2005-11-02 18:23:00 +0000
commite2c5ec112ddfe5965502274e4bef72642634895f (patch)
treef96046e97890d854a253a360e6a6974346580d90
parent09bfcf2b3e2cdd04a229c1645eaede49ab9761d4 (diff)
downloadclasspath-e2c5ec112ddfe5965502274e4bef72642634895f.tar.gz
2005-11-02 Roman Kennke <kennke@aicas.com>
* javax/swing/JToolBar.java (addImpl): Don't call updateUI here. This is really not necessary. * javax/swing/plaf/basic/BasicToolBarUI.java (installDefaults): Call setRolloverBorders() here in order to initialize the button borders.
-rw-r--r--ChangeLog8
-rw-r--r--javax/swing/JToolBar.java1
-rw-r--r--javax/swing/plaf/basic/BasicToolBarUI.java1
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 552fe6ef7..bf20e7815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-11-02 Roman Kennke <kennke@aicas.com>
+ * javax/swing/JToolBar.java
+ (addImpl): Don't call updateUI here. This is really not necessary.
+ * javax/swing/plaf/basic/BasicToolBarUI.java
+ (installDefaults): Call setRolloverBorders() here in order to
+ initialize the button borders.
+
+2005-11-02 Roman Kennke <kennke@aicas.com>
+
* javax/swing/plaf/basic/BasicScrollPaneUI.java
(PropertyChangeHandler.propertyChange): Re-setup listeners on
the scrollbars if the scrollbars change.
diff --git a/javax/swing/JToolBar.java b/javax/swing/JToolBar.java
index dc85e294d..a508ee6d8 100644
--- a/javax/swing/JToolBar.java
+++ b/javax/swing/JToolBar.java
@@ -752,7 +752,6 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
{
AbstractButton b = (AbstractButton) component;
b.setRolloverEnabled(rollover);
- b.updateUI();
}
} // addImpl()
diff --git a/javax/swing/plaf/basic/BasicToolBarUI.java b/javax/swing/plaf/basic/BasicToolBarUI.java
index d02922f74..ef4ed835f 100644
--- a/javax/swing/plaf/basic/BasicToolBarUI.java
+++ b/javax/swing/plaf/basic/BasicToolBarUI.java
@@ -596,6 +596,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
floatingBorderColor = UIManager.getColor("ToolBar.floatingForeground");
floatingColor = UIManager.getColor("ToolBar.floatingBackground");
+ setRolloverBorders(toolBar.isRollover());
}
/**