Remove unused gdk_pango_context_set_colormap.

Used for pre Gtk 2.6 which is no longer supported.

7 files changed, 0 insertions, 46 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 5421a2f88d..d6a3273909 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -6156,24 +6156,6 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
 }
 #endif
 
-#ifndef NO__1gdk_1pango_1context_1set_1colormap
-JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pango_1context_1set_1colormap)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1set_1colormap_FUNC);
-/*
-	gdk_pango_context_set_colormap((PangoContext *)arg0, arg1);
-*/
-	{
-		OS_LOAD_FUNCTION(fp, gdk_pango_context_set_colormap)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(PangoContext *, jintLong))fp)((PangoContext *)arg0, arg1);
-		}
-	}
-	OS_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1set_1colormap_FUNC);
-}
-#endif
-
 #ifndef NO__1gdk_1pango_1layout_1get_1clip_1region
 JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
index f2e6fa01ea..512f53663f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
@@ -330,7 +330,6 @@
 #define gtk_widget_set_visible_LIB LIB_GTK
 #define gtk_widget_shape_combine_region_LIB LIB_GTK
 #define gtk_range_get_slider_range_LIB LIB_GTK
-#define gdk_pango_context_set_colormap_LIB LIB_GDK
 #define gdk_x11_screen_get_window_manager_name_LIB LIB_GDK
 #define gdk_x11_screen_lookup_visual_LIB LIB_GDK
 #define gdk_x11_window_lookup_for_display_LIB LIB_GDK
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index e0c4938e24..612c21ea0e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -491,7 +491,6 @@ char * OS_nativeFunctionNames[] = {
 	"_1gdk_1keyval_1to_1lower",
 	"_1gdk_1keyval_1to_1unicode",
 	"_1gdk_1pango_1context_1get",
-	"_1gdk_1pango_1context_1set_1colormap",
 	"_1gdk_1pango_1layout_1get_1clip_1region",
 	"_1gdk_1pixbuf_1copy_1area",
 	"_1gdk_1pixbuf_1get_1from_1drawable",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index 7073bb1a4e..680384cd27 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -501,7 +501,6 @@ typedef enum {
 	_1gdk_1keyval_1to_1lower_FUNC,
 	_1gdk_1keyval_1to_1unicode_FUNC,
 	_1gdk_1pango_1context_1get_FUNC,
-	_1gdk_1pango_1context_1set_1colormap_FUNC,
 	_1gdk_1pango_1layout_1get_1clip_1region_FUNC,
 	_1gdk_1pixbuf_1copy_1area_FUNC,
 	_1gdk_1pixbuf_1get_1from_1drawable_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 0a46b67f81..b266fb5832 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -4531,19 +4531,6 @@ public static final long /*int*/ gdk_pango_context_get() {
 		lock.unlock();
 	}
 }
-/**
- * @method flags=dynamic 
- * @param context cast=(PangoContext *)
- */
-public static final native void _gdk_pango_context_set_colormap(long /*int*/ context, long /*int*/ colormap);
-public static final void gdk_pango_context_set_colormap(long /*int*/ context, long /*int*/ colormap) {
-	lock.lock();
-	try {
-		_gdk_pango_context_set_colormap(context, colormap);
-	} finally {
-		lock.unlock();
-	}
-}
 /** @param layout cast=(PangoLayout *) */
 public static final native long /*int*/ _gdk_pango_layout_get_clip_region(long /*int*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges);
 public static final long /*int*/ gdk_pango_layout_get_clip_region(long /*int*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index f715234c03..1f7c385b8d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -651,12 +651,6 @@ void createLayout() {
 	data.layout = layout;
 	OS.pango_context_set_language(context, OS.gtk_get_default_language());
 	OS.pango_context_set_base_dir(context, (data.style & SWT.MIRRORED) != 0 ? OS.PANGO_DIRECTION_RTL : OS.PANGO_DIRECTION_LTR);
-	/*
-	 * Colormap is automatically set for GTK 2.6.0 and newer.
-	 */
-	if (OS.GTK_VERSION < OS.VERSION(2, 6, 0)) {
-	    OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());	
-	}
 	OS.pango_layout_set_auto_dir(layout, false);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
index 8a92ad71f6..7e3d2b8993 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
@@ -79,12 +79,6 @@ public TextLayout (Device device) {
 	if (context == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 	OS.pango_context_set_language(context, OS.gtk_get_default_language());
 	OS.pango_context_set_base_dir(context, OS.PANGO_DIRECTION_LTR);
-	/*
-	 * Colormap is automatically set for GTK 2.6.0 and newer.
-	 */
-	if (OS.GTK_VERSION < OS.VERSION(2, 6, 0)) {
-	    OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());	
-	}
 	layout = OS.pango_layout_new(context);
 	if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 	OS.pango_layout_set_font_description(layout, device.systemFont.handle);