Bug 563560: Stop using Color constructors which take a device

Change-Id: I3037f38fa716a7d8486ee7998f90e8fe0a493367
Signed-off-by: Jonah Graham <jonah@kichwacoders.com>

6 files changed, 31 insertions, 31 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index c4e3a71bf7..72e5c006c2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -653,7 +653,7 @@ class AccessibleObject {
 			int r = Integer.parseInt(rgbString.substring(0, comma1));
 			int g = Integer.parseInt(rgbString.substring(comma1 + 1, comma2));
 			int b = Integer.parseInt(rgbString.substring(comma2 + 1, rgbString.length()));
-			return new Color(display, r, g, b);
+			return new Color(r, g, b);
 		} catch (NumberFormatException ex) {}
 		return null;
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java
index 64a8840079..a75942d548 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CBanner.java
@@ -351,7 +351,7 @@ void onPaint(GC gc) {
 		int red = from.red + 3*(to.red - from.red)/4;
 		int green = from.green + 3*(to.green - from.green)/4;
 		int blue = from.blue + 3*(to.blue - from.blue)/4;
-		Color color = new Color(getDisplay(), red, green, blue);
+		Color color = new Color(red, green, blue);
 		gc.setForeground(color);
 		gc.drawPolyline(line2);
 		gc.drawPolyline(line3);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderRenderer.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderRenderer.java
index 5ca3ddb445..03c5b5baad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderRenderer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderRenderer.java
@@ -478,7 +478,7 @@ public class CTabFolderRenderer {
 			int red = from.red + 2*(to.red - from.red)/3;
 			int green = from.green + 2*(to.green - from.green)/3;
 			int blue = from.blue + 2*(to.blue - from.blue)/3;
-			selectedOuterColor = new Color(parent.getDisplay(), red, green, blue);
+			selectedOuterColor = new Color(red, green, blue);
 		}
 		if (innerRGB != null) {
 			RGB from = lineRGB;
@@ -486,7 +486,7 @@ public class CTabFolderRenderer {
 			int red = from.red + 2*(to.red - from.red)/3;
 			int green = from.green + 2*(to.green - from.green)/3;
 			int blue = from.blue + 2*(to.blue - from.blue)/3;
-			selectedInnerColor = new Color(parent.getDisplay(), red, green, blue);
+			selectedInnerColor = new Color(red, green, blue);
 		}
 		/* compute the tabArea color */
 		outerRGB = parent.getParent().getBackground().getRGB();
@@ -496,7 +496,7 @@ public class CTabFolderRenderer {
 			int red = from.red + 2*(to.red - from.red)/3;
 			int green = from.green + 2*(to.green - from.green)/3;
 			int blue = from.blue + 2*(to.blue - from.blue)/3;
-			tabAreaColor = new Color(parent.getDisplay(), red, green, blue);
+			tabAreaColor = new Color(red, green, blue);
 		}
 	}
 
@@ -528,7 +528,7 @@ public class CTabFolderRenderer {
 			int red = (to.red * propTo + from.red * propFrom) / denom;
 			int green = (to.green * propTo  + from.green * propFrom) / denom;
 			int blue = (to.blue * propTo  + from.blue * propFrom) / denom;
-			selectionHighlightGradientColorsCache[i] = new Color(parent.getDisplay(), red, green, blue);
+			selectionHighlightGradientColorsCache[i] = new Color(red, green, blue);
 		}
 	}
 
@@ -609,7 +609,7 @@ public class CTabFolderRenderer {
 			// this color has to be identical to the colors used in the PNG files of
 			// the view drop down menu located in
 			// org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.png
-			minMaxBorderColor = new Color (gc.getDevice(), 105, 105, 105);
+			minMaxBorderColor = new Color (105, 105, 105);
 		}
 		switch (part) {
 			case PART_BACKGROUND:
@@ -1695,7 +1695,7 @@ public class CTabFolderRenderer {
 
 	Color getFillColor() {
 		if (fillColor == null) {
-			fillColor = new Color(parent.getDisplay(), CLOSE_FILL);
+			fillColor = new Color(CLOSE_FILL);
 		}
 		return fillColor;
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
index 284b0ef49e..d2485241f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
@@ -309,7 +309,7 @@ public class StyledText extends Canvas {
 				if (printOptions.printLineBackground) {
 					Color printerColor = (Color)resources.get(color);
 					if (printerColor == null) {
-						printerColor = new Color (printer, color.getRGB());
+						printerColor = new Color (color.getRGB());
 						resources.put(color, printerColor);
 					}
 					printerRenderer.setLineBackground(i, 1, printerColor);
@@ -339,7 +339,7 @@ public class StyledText extends Canvas {
 				Color printerColor = (Color)resources.get(color);
 				if (printOptions.printTextForeground) {
 					if (printerColor == null) {
-						printerColor = new Color (printer, color.getRGB());
+						printerColor = new Color (color.getRGB());
 						resources.put(color, printerColor);
 					}
 					style.foreground = printerColor;
@@ -352,7 +352,7 @@ public class StyledText extends Canvas {
 				Color printerColor = (Color)resources.get(color);
 				if (printOptions.printTextBackground) {
 					if (printerColor == null) {
-						printerColor = new Color (printer, color.getRGB());
+						printerColor = new Color (color.getRGB());
 						resources.put(color, printerColor);
 					}
 					style.background = printerColor;
@@ -8500,7 +8500,7 @@ public void setBackground(Color color) {
 			if (background.equals(disabledBg)) {
 				return;
 			} else {
-				color = new Color (getDisplay(), disabledBg.getRGBA());
+				color = new Color (disabledBg.getRGBA());
 				backgroundDisabled = true;
 			}
 		}
@@ -8990,7 +8990,7 @@ public void setForeground(Color color) {
 			if (foreground.equals(disabledFg)) {
 				return;
 			} else {
-				color = new Color (getDisplay(), disabledFg.getRGBA());
+				color = new Color (disabledFg.getRGBA());
 				foregroundDisabled = true;
 			}
 		}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
index 3717bc9ebb..b474f02bb0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
@@ -618,23 +618,23 @@ protected void init () {
 	}
 
 	/* Create the standard colors */
-	COLOR_TRANSPARENT = new Color (this, 0xFF,0xFF,0xFF,0);
-	COLOR_BLACK = new Color (this, 0,0,0);
-	COLOR_DARK_RED = new Color (this, 0x80,0,0);
-	COLOR_DARK_GREEN = new Color (this, 0,0x80,0);
-	COLOR_DARK_YELLOW = new Color (this, 0x80,0x80,0);
-	COLOR_DARK_BLUE = new Color (this, 0,0,0x80);
-	COLOR_DARK_MAGENTA = new Color (this, 0x80,0,0x80);
-	COLOR_DARK_CYAN = new Color (this, 0,0x80,0x80);
-	COLOR_GRAY = new Color (this, 0xC0,0xC0,0xC0);
-	COLOR_DARK_GRAY = new Color (this, 0x80,0x80,0x80);
-	COLOR_RED = new Color (this, 0xFF,0,0);
-	COLOR_GREEN = new Color (this, 0,0xFF,0);
-	COLOR_YELLOW = new Color (this, 0xFF,0xFF,0);
-	COLOR_BLUE = new Color (this, 0,0,0xFF);
-	COLOR_MAGENTA = new Color (this, 0xFF,0,0xFF);
-	COLOR_CYAN = new Color (this, 0,0xFF,0xFF);
-	COLOR_WHITE = new Color (this, 0xFF,0xFF,0xFF);
+	COLOR_TRANSPARENT = new Color (0xFF, 0xFF,0xFF,0);
+	COLOR_BLACK = new Color (0, 0,0);
+	COLOR_DARK_RED = new Color (0x80, 0,0);
+	COLOR_DARK_GREEN = new Color (0, 0x80,0);
+	COLOR_DARK_YELLOW = new Color (0x80, 0x80,0);
+	COLOR_DARK_BLUE = new Color (0, 0,0x80);
+	COLOR_DARK_MAGENTA = new Color (0x80, 0,0x80);
+	COLOR_DARK_CYAN = new Color (0, 0x80,0x80);
+	COLOR_GRAY = new Color (0xC0, 0xC0,0xC0);
+	COLOR_DARK_GRAY = new Color (0x80, 0x80,0x80);
+	COLOR_RED = new Color (0xFF, 0,0);
+	COLOR_GREEN = new Color (0, 0xFF,0);
+	COLOR_YELLOW = new Color (0xFF, 0xFF,0);
+	COLOR_BLUE = new Color (0, 0,0xFF);
+	COLOR_MAGENTA = new Color (0xFF, 0,0xFF);
+	COLOR_CYAN = new Color (0, 0xFF,0xFF);
+	COLOR_WHITE = new Color (0xFF, 0xFF,0xFF);
 
 	emptyTab = OS.pango_tab_array_new(1, false);
 	if (emptyTab == 0) SWT.error(SWT.ERROR_NO_HANDLES);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
index 1f08667135..85da7a627a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
@@ -153,7 +153,7 @@ void createHandle(int index) {
 	gtk_widget_set_has_surface_or_window (handle, true);
 	GTK.gtk_widget_set_can_focus (handle, true);
 	layout = new TextLayout (display);
-	disabledColor = new Color (display, LINK_DISABLED_FOREGROUND);
+	disabledColor = new Color (LINK_DISABLED_FOREGROUND);
 	offsets = new Point [0];
 	ids = new String [0];
 	mnemonics = new int [0];