diff options
| author | Grant Gayed <ggayed> | 2002-05-06 15:21:55 +0000 |
|---|---|---|
| committer | Grant Gayed <ggayed> | 2002-05-06 15:21:55 +0000 |
| commit | 2578f70056f13b2af4b2e0bea79aa5fbe81d9417 (patch) | |
| tree | bdbf3db06097e2ac99bb3ceaa3062d862679e280 | |
| parent | 9b5ecf1b8f6d7e07dc0e5dc881d3bcd40e6af9ff (diff) | |
| download | eclipse.platform.swt-2578f70056f13b2af4b2e0bea79aa5fbe81d9417.tar.gz eclipse.platform.swt-2578f70056f13b2af4b2e0bea79aa5fbe81d9417.tar.xz eclipse.platform.swt-2578f70056f13b2af4b2e0bea79aa5fbe81d9417.zip | |
Answer correct foreground colour
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java index 34d13ecdb2..bc56354890 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java @@ -109,7 +109,7 @@ public class Display extends Device { /* System Colors */
XColor COLOR_WIDGET_DARK_SHADOW, COLOR_WIDGET_NORMAL_SHADOW, COLOR_WIDGET_LIGHT_SHADOW;
- XColor COLOR_WIDGET_HIGHLIGHT_SHADOW, COLOR_WIDGET_BACKGROUND, COLOR_WIDGET_BORDER;
+ XColor COLOR_WIDGET_HIGHLIGHT_SHADOW, COLOR_WIDGET_FOREGROUND, COLOR_WIDGET_BACKGROUND, COLOR_WIDGET_BORDER;
XColor COLOR_LIST_FOREGROUND, COLOR_LIST_BACKGROUND, COLOR_LIST_SELECTION, COLOR_LIST_SELECTION_TEXT;
Color COLOR_INFO_BACKGROUND;
@@ -892,7 +892,7 @@ public Color getSystemColor (int id) { case SWT.COLOR_WIDGET_LIGHT_SHADOW: xColor = COLOR_WIDGET_LIGHT_SHADOW; break;
case SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW: xColor = COLOR_WIDGET_HIGHLIGHT_SHADOW; break;
case SWT.COLOR_WIDGET_BACKGROUND: xColor = COLOR_WIDGET_BACKGROUND; break;
- case SWT.COLOR_WIDGET_FOREGROUND:
+ case SWT.COLOR_WIDGET_FOREGROUND: xColor = COLOR_WIDGET_FOREGROUND; break;
case SWT.COLOR_WIDGET_BORDER: xColor = COLOR_WIDGET_BORDER; break;
case SWT.COLOR_LIST_FOREGROUND: xColor = COLOR_LIST_FOREGROUND; break;
case SWT.COLOR_LIST_BACKGROUND: xColor = COLOR_LIST_BACKGROUND; break;
@@ -1220,6 +1220,10 @@ void initializeSystemColors () { COLOR_WIDGET_HIGHLIGHT_SHADOW = new XColor();
COLOR_WIDGET_HIGHLIGHT_SHADOW.pixel = compositeTopShadow;
OS.XQueryColor (xDisplay, colormap, COLOR_WIDGET_HIGHLIGHT_SHADOW);
+
+ COLOR_WIDGET_FOREGROUND = new XColor();
+ COLOR_WIDGET_FOREGROUND.pixel = textForeground;
+ OS.XQueryColor (xDisplay, colormap, COLOR_WIDGET_FOREGROUND);
COLOR_WIDGET_BACKGROUND = new XColor();
COLOR_WIDGET_BACKGROUND.pixel = compositeBackground;
@@ -1515,7 +1519,7 @@ void releaseDisplay () { buttonBackground = buttonForeground = 0;
defaultBackground = defaultForeground = 0;
COLOR_WIDGET_DARK_SHADOW = COLOR_WIDGET_NORMAL_SHADOW = COLOR_WIDGET_LIGHT_SHADOW =
- COLOR_WIDGET_HIGHLIGHT_SHADOW = COLOR_WIDGET_BACKGROUND = COLOR_WIDGET_BORDER =
+ COLOR_WIDGET_HIGHLIGHT_SHADOW = COLOR_WIDGET_FOREGROUND = COLOR_WIDGET_BACKGROUND = COLOR_WIDGET_BORDER =
COLOR_LIST_FOREGROUND = COLOR_LIST_BACKGROUND = COLOR_LIST_SELECTION = COLOR_LIST_SELECTION_TEXT = null;
COLOR_INFO_BACKGROUND = null;
}
|