summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2005-11-14 12:39:47 +0000
committerRoman Kennke <roman@kennke.org>2005-11-14 12:39:47 +0000
commit7932115c0fa90ff77ad8b0b7d9f8e32fa7d5e818 (patch)
tree9f88cc528e4e7f01dbd4541ecd1ac20eda934736
parentb0c1643733fd904f8a30a690f5d1219c4ef07862 (diff)
downloadclasspath-7932115c0fa90ff77ad8b0b7d9f8e32fa7d5e818.tar.gz
2005-11-14 Roman Kennke <kennke@aicas.com>
* javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (setButtonIcons): Only set icons if buttons are != null.
-rw-r--r--ChangeLog5
-rw-r--r--javax/swing/plaf/basic/BasicInternalFrameTitlePane.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 69c2f3d01..e9ac38acc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-11-14 Roman Kennke <kennke@aicas.com>
+ * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+ (setButtonIcons): Only set icons if buttons are != null.
+
+2005-11-14 Roman Kennke <kennke@aicas.com>
+
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initComponentDefaults): Fixed some UI defaults used by ProgressBar.
diff --git a/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
index aced2769a..73d3e6173 100644
--- a/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
@@ -771,11 +771,11 @@ public class BasicInternalFrameTitlePane extends JComponent
*/
protected void setButtonIcons()
{
- if (closeIcon != null)
+ if (closeIcon != null && closeButton != null)
closeButton.setIcon(closeIcon);
- if (iconIcon != null)
+ if (iconIcon != null && iconButton != null)
iconButton.setIcon(iconIcon);
- if (maxIcon != null)
+ if (maxIcon != null && maxButton != null)
maxButton.setIcon(maxIcon);
}