1 files changed, 24 insertions, 12 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
index c2c372db5f..0afada598c 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
@@ -1,8 +1,8 @@
 package org.eclipse.swt.custom;
 
 /*
- * Licensed Materials - Property of IBM,
- * (c) Copyright IBM Corp. 1998, 2001  All Rights Reserved
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
  */
 
 import org.eclipse.swt.*;
@@ -245,8 +245,13 @@ private void onPaint(PaintEvent event) {
 	// draw a background image behind the text
 	if (backgroundImage != null) {
 		Rectangle imageRect = backgroundImage.getBounds();
-		gc.drawImage(backgroundImage, 0, 0, imageRect.width, imageRect.height,
-		                              0, 0, rect.width, rect.height);
+		try {
+			gc.drawImage(backgroundImage, 0, 0, imageRect.width, imageRect.height,
+			                              0, 0, rect.width, rect.height);
+		} catch(SWTException e) {
+			gc.setBackground(getBackground());
+			gc.fillRectangle(rect);
+		}
 	} else {
 		gc.setBackground(getBackground());
 		gc.fillRectangle(rect);
@@ -350,23 +355,29 @@ public void setBackground(Color[] colors, int[] percents) {
 	
 	// Draw gradient onto an image
 	if (colors != null) {
+		Color[] colorsCopy = null;
+		Display display = getDisplay();
+		if (display.getDepth() < 15) {
+			colorsCopy = new Color[]{colors[0]};
+		} else {
+			colorsCopy = colors;
+		}
+		
 		int x = 0; int y = 0;
 		int width = 100; int height = 10;
-		
-		Display display = getDisplay();
 		Image temp = new Image(display, width, height);
 		GC gc = new GC(temp);
-		if (colors.length == 1) {
-			gc.setBackground(colors[0]);
+		if (colorsCopy.length == 1) {
+			gc.setBackground(colorsCopy[0]);
 			gc.fillRectangle(temp.getBounds());
 		}
 		int start = 0;
 		int end = 0;
-		for (int j = 0; j < colors.length - 1; j++) {
-			Color startColor = colors[j];
+		for (int j = 0; j < colorsCopy.length - 1; j++) {
+			Color startColor = colorsCopy[j];
 			if (startColor == null) startColor = getBackground();
 			RGB rgb1 = startColor.getRGB();
-			Color endColor = colors[j+1];
+			Color endColor = colorsCopy[j+1];
 			if (endColor == null) endColor = getBackground();
 			RGB rgb2   = endColor.getRGB();
 			start = end;
@@ -388,7 +399,7 @@ public void setBackground(Color[] colors, int[] percents) {
 		}
 		gc.dispose();
 		gradientImage = temp;
-		gradientColors = colors;
+		gradientColors = colorsCopy;
 		gradientPercents = percents;
 		backgroundImage = temp;
 	}
@@ -440,6 +451,7 @@ public void setText(String text) {
  * Override if you need a different strategy.
  */
 protected String shortenText(GC gc, String t, int width) {
+	if (t == null) return null;
 	int w = gc.textExtent(ellipsis).x;
 	int l = t.length();
 	int pivot = l/2;