aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Wagiaalla2014-02-25 15:36:06 (EST)
committerSami Wagiaalla2014-02-25 15:43:34 (EST)
commitb57af4c30466392e26fc65ce6cd72f327456e597 (patch)
treefab89c4c19cd537e83209f04acdfe777ea45375a
parente254eb59e814bdfd8d305bac78f760c94fbf2832 (diff)
downloadeclipse.platform.swt-b57af4c30466392e26fc65ce6cd72f327456e597.zip
eclipse.platform.swt-b57af4c30466392e26fc65ce6cd72f327456e597.tar.gz
eclipse.platform.swt-b57af4c30466392e26fc65ce6cd72f327456e597.tar.bz2
Bug 429086 - Remove use of gdk_colormap_get_system in GTK3refs/changes/37/22537/1
This function is not available in GTK3. Furthermore, adding the gdkColor for link forground is not required in GTK3. Change-Id: I9dae6d793cfadb05d03b16c35f5a740b4832b5e3 Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index 33efc3a..19fb6fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -2339,8 +2339,6 @@ void initializeSystemColors () {
} else {
gdkColor.blue = (short)0xeeee;
}
- long /*int*/ colormap = OS.gdk_colormap_get_system();
- OS.gdk_colormap_alloc_color(colormap, gdkColor, true, true);
COLOR_LINK_FOREGROUND = gdkColor;
if (OS.GTK3) {
@@ -2398,6 +2396,9 @@ void initializeSystemColors () {
return;
}
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
+ OS.gdk_colormap_alloc_color(colormap, gdkColor, true, true);
+
/* Get Tooltip resources */
long /*int*/ tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle);
gdkColor = new GdkColor();