185204 - [CTabFolder] CTabItem.drawClose could preserve color

1 files changed, 11 insertions, 0 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
index b26a139106..d4d4e31424 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
@@ -157,6 +157,7 @@ public class CTabFolder extends Composite {
 	static Color borderColor;
 	
 	// close, min/max and chevron buttons
+	static Color fillColor;
 	boolean showClose = false;
 	boolean showUnselectedClose = true;
 	
@@ -1194,6 +1195,12 @@ public Rectangle getClientArea() {
 	height -= tabHeight;
 	return new Rectangle(xClient, yClient, width, height);
 }
+Color getFillColor() {
+	if (fillColor == null) {
+		fillColor = new Color(getDisplay(), CTabFolder.CLOSE_FILL);
+	}
+	return fillColor;
+}
 /**
  * Return the tab that is located at the specified index.
  * 
@@ -1892,6 +1899,10 @@ void onDispose(Event event) {
 			items[i].dispose();
 		}
 	}
+	if (fillColor != null) {
+	    fillColor.dispose();
+	    fillColor = null;
+	}
 	
 	selectionGradientColors = null;
 	selectionGradientPercents = null;