Bug 530841: [GTK2] Remove GTK 2.x support

Remove functions deprecated in 3.0, or those that are no longer used.
Some methods that are no longer called were also removed.

Change-Id: Iec37467c14e8ea30352b31732152b5b9102ebc7d
Signed-off-by: Eric Williams <ericwill@redhat.com>

9 files changed, 0 insertions, 276 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 8e3cbd6d2e..cb27ef61ff 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
@@ -8419,50 +8419,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1range_1set_1value)
 }
 #endif
 
-#ifndef NO__1gtk_1rc_1style_1get_1bg_1pixmap_1name
-JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jintLong rc = 0;
-	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
-	rc = (jintLong)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
-	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gtk_1rc_1style_1get_1color_1flags
-JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1rc_1style_1get_1color_1flags)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	jint rc = 0;
-	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
-	rc = (jint)gtk_rc_style_get_color_flags((GtkRcStyle *)arg0, arg1);
-	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO__1gtk_1rc_1style_1set_1bg_1pixmap_1name
-JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rc_1style_1set_1bg_1pixmap_1name)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
-{
-	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
-	gtk_rc_style_set_bg_pixmap_name((GtkRcStyle *)arg0, arg1, (char *)arg2);
-	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
-}
-#endif
-
-#ifndef NO__1gtk_1rc_1style_1set_1color_1flags
-JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1rc_1style_1set_1color_1flags)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
-{
-	GTK_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
-	gtk_rc_style_set_color_flags((GtkRcStyle *)arg0, arg1, arg2);
-	GTK_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
-}
-#endif
-
 #ifndef NO__1gtk_1render_1background
 JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1render_1background)
 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
@@ -11820,26 +11776,6 @@ fail:
 }
 #endif
 
-#ifndef NO__1gtk_1widget_1get_1default_1style
-JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1default_1style)
-	(JNIEnv *env, jclass that)
-{
-	jintLong rc = 0;
-	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
-/*
-	rc = (jintLong)gtk_widget_get_default_style();
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_widget_get_default_style)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO__1gtk_1widget_1get_1events
 JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1widget_1get_1events)
 	(JNIEnv *env, jclass that, jintLong arg0)
@@ -11876,26 +11812,6 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1get_1mapped)
 }
 #endif
 
-#ifndef NO__1gtk_1widget_1get_1modifier_1style
-JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1modifier_1style)
-	(JNIEnv *env, jclass that, jintLong arg0)
-{
-	jintLong rc = 0;
-	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
-/*
-	rc = (jintLong)gtk_widget_get_modifier_style((GtkWidget *)arg0);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_widget_get_modifier_style)
-		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO__1gtk_1widget_1get_1name
 JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1widget_1get_1name)
 	(JNIEnv *env, jclass that, jintLong arg0)
@@ -12329,24 +12245,6 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1widget_1mnemonic_1activate)
 }
 #endif
 
-#ifndef NO__1gtk_1widget_1modify_1style
-JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1modify_1style)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-{
-	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1style_FUNC);
-/*
-	gtk_widget_modify_style((GtkWidget *)arg0, (GtkRcStyle *)arg1);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_widget_modify_style)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GtkWidget *, GtkRcStyle *))fp)((GtkWidget *)arg0, (GtkRcStyle *)arg1);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1modify_1style_FUNC);
-}
-#endif
-
 #ifndef NO__1gtk_1widget_1override_1background_1color
 JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1override_1background_1color)
 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
@@ -12720,24 +12618,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1size_1request)
 }
 #endif
 
-#ifndef NO__1gtk_1widget_1set_1state
-JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1state)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-{
-	GTK_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1state_FUNC);
-/*
-	gtk_widget_set_state((GtkWidget *)arg0, (GtkStateType)arg1);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_widget_set_state)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GtkWidget *, GtkStateType))fp)((GtkWidget *)arg0, (GtkStateType)arg1);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1state_FUNC);
-}
-#endif
-
 #ifndef NO__1gtk_1widget_1set_1tooltip_1text
 JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1widget_1set_1tooltip_1text)
 	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
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 04ba830d12..4d897b8a2a 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
@@ -678,10 +678,6 @@ char * GTK_nativeFunctionNames[] = {
 	"_1gtk_1range_1set_1inverted",
 	"_1gtk_1range_1set_1range",
 	"_1gtk_1range_1set_1value",
-	"_1gtk_1rc_1style_1get_1bg_1pixmap_1name",
-	"_1gtk_1rc_1style_1get_1color_1flags",
-	"_1gtk_1rc_1style_1set_1bg_1pixmap_1name",
-	"_1gtk_1rc_1style_1set_1color_1flags",
 	"_1gtk_1render_1background",
 	"_1gtk_1render_1focus",
 	"_1gtk_1render_1frame",
@@ -977,11 +973,9 @@ char * GTK_nativeFunctionNames[] = {
 	"_1gtk_1widget_1get_1can_1default",
 	"_1gtk_1widget_1get_1child_1visible",
 	"_1gtk_1widget_1get_1clip",
-	"_1gtk_1widget_1get_1default_1style",
 	"_1gtk_1widget_1get_1events",
 	"_1gtk_1widget_1get_1has_1window",
 	"_1gtk_1widget_1get_1mapped",
-	"_1gtk_1widget_1get_1modifier_1style",
 	"_1gtk_1widget_1get_1name",
 	"_1gtk_1widget_1get_1opacity",
 	"_1gtk_1widget_1get_1pango_1context",
@@ -1010,7 +1004,6 @@ char * GTK_nativeFunctionNames[] = {
 	"_1gtk_1widget_1is_1focus",
 	"_1gtk_1widget_1map",
 	"_1gtk_1widget_1mnemonic_1activate",
-	"_1gtk_1widget_1modify_1style",
 	"_1gtk_1widget_1override_1background_1color",
 	"_1gtk_1widget_1override_1color",
 	"_1gtk_1widget_1override_1font",
@@ -1039,7 +1032,6 @@ char * GTK_nativeFunctionNames[] = {
 	"_1gtk_1widget_1set_1redraw_1on_1allocate",
 	"_1gtk_1widget_1set_1sensitive",
 	"_1gtk_1widget_1set_1size_1request",
-	"_1gtk_1widget_1set_1state",
 	"_1gtk_1widget_1set_1tooltip_1text",
 	"_1gtk_1widget_1set_1valign",
 	"_1gtk_1widget_1set_1visible",
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 f6bed5f855..57b7c66fc6 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
@@ -676,10 +676,6 @@ typedef enum {
 	_1gtk_1range_1set_1inverted_FUNC,
 	_1gtk_1range_1set_1range_FUNC,
 	_1gtk_1range_1set_1value_FUNC,
-	_1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC,
-	_1gtk_1rc_1style_1get_1color_1flags_FUNC,
-	_1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC,
-	_1gtk_1rc_1style_1set_1color_1flags_FUNC,
 	_1gtk_1render_1background_FUNC,
 	_1gtk_1render_1focus_FUNC,
 	_1gtk_1render_1frame_FUNC,
@@ -975,11 +971,9 @@ typedef enum {
 	_1gtk_1widget_1get_1can_1default_FUNC,
 	_1gtk_1widget_1get_1child_1visible_FUNC,
 	_1gtk_1widget_1get_1clip_FUNC,
-	_1gtk_1widget_1get_1default_1style_FUNC,
 	_1gtk_1widget_1get_1events_FUNC,
 	_1gtk_1widget_1get_1has_1window_FUNC,
 	_1gtk_1widget_1get_1mapped_FUNC,
-	_1gtk_1widget_1get_1modifier_1style_FUNC,
 	_1gtk_1widget_1get_1name_FUNC,
 	_1gtk_1widget_1get_1opacity_FUNC,
 	_1gtk_1widget_1get_1pango_1context_FUNC,
@@ -1008,7 +1002,6 @@ typedef enum {
 	_1gtk_1widget_1is_1focus_FUNC,
 	_1gtk_1widget_1map_FUNC,
 	_1gtk_1widget_1mnemonic_1activate_FUNC,
-	_1gtk_1widget_1modify_1style_FUNC,
 	_1gtk_1widget_1override_1background_1color_FUNC,
 	_1gtk_1widget_1override_1color_FUNC,
 	_1gtk_1widget_1override_1font_FUNC,
@@ -1037,7 +1030,6 @@ typedef enum {
 	_1gtk_1widget_1set_1redraw_1on_1allocate_FUNC,
 	_1gtk_1widget_1set_1sensitive_FUNC,
 	_1gtk_1widget_1set_1size_1request_FUNC,
-	_1gtk_1widget_1set_1state_FUNC,
 	_1gtk_1widget_1set_1tooltip_1text_FUNC,
 	_1gtk_1widget_1set_1valign_FUNC,
 	_1gtk_1widget_1set_1visible_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
index 2efd058cea..49ba14e373 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
@@ -99,10 +99,6 @@ public class GTK extends OS {
 	public static final int GTK_RECEIVES_DEFAULT = 1 << 20;
 	public static final int GTK_RELIEF_NONE = 0x2;
 	public static final int GTK_RELIEF_NORMAL = 0;
-	public static final int GTK_RC_BG = 1 << 1;
-	public static final int GTK_RC_FG = 1 << 0;
-	public static final int GTK_RC_TEXT = 1 << 2;
-	public static final int GTK_RC_BASE = 1 << 3;
 	public static final int GTK_RESPONSE_APPLY = 0xfffffff6;
 	public static final int GTK_RESPONSE_CANCEL = 0xfffffffa;
 	public static final int GTK_RESPONSE_OK = 0xfffffffb;
@@ -5095,49 +5091,6 @@ public class GTK extends OS {
 	                lock.unlock();
 	        }
 	}
-	/** @param style cast=(GtkRcStyle *) */
-	public static final native long /*int*/ _gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index);
-	public static final long /*int*/ gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index) {
-		lock.lock();
-		try {
-			return _gtk_rc_style_get_bg_pixmap_name(style, index);
-		} finally {
-			lock.unlock();
-		}
-	}
-	/** @param style cast=(GtkRcStyle *) */
-	public static final native int _gtk_rc_style_get_color_flags(long /*int*/ style, int index);
-	public static final int gtk_rc_style_get_color_flags(long /*int*/ style, int index) {
-		lock.lock();
-		try {
-			return _gtk_rc_style_get_color_flags(style, index);
-		} finally {
-			lock.unlock();
-		}
-	}
-	/**
-	 * @param style cast=(GtkRcStyle *)
-	 * @param name cast=(char *)
-	 */
-	public static final native void _gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name);
-	public static final void gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name) {
-		lock.lock();
-		try {
-			_gtk_rc_style_set_bg_pixmap_name(style, index, name);
-		} finally {
-			lock.unlock();
-		}
-	}
-	/** @param style cast=(GtkRcStyle *) */
-	public static final native void _gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag);
-	public static final void gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag) {
-		lock.lock();
-		try {
-			_gtk_rc_style_set_color_flags(style, index, flag);
-		} finally {
-			lock.unlock();
-		}
-	}
 	/**
 	 * @param scale cast=(GtkScale *)
 	 * @param digits cast=(gint)
@@ -8024,17 +7977,6 @@ public class GTK extends OS {
 			lock.unlock();
 		}
 	}
-	/** @method flags=dynamic */
-	public static final native long /*int*/ _gtk_widget_get_default_style();
-	/** [GTK2/GTK3; 3.0 deprecated] */
-	public static final long /*int*/ gtk_widget_get_default_style() {
-		lock.lock();
-		try {
-			return _gtk_widget_get_default_style();
-		} finally {
-			lock.unlock();
-		}
-	}
 	/** @param widget cast=(GtkWidget *) */
 	public static final native int _gtk_widget_get_events(long /*int*/ widget);
 	public static final int gtk_widget_get_events(long /*int*/ widget) {
@@ -8055,20 +7997,6 @@ public class GTK extends OS {
 			lock.unlock();
 		}
 	}
-	/**
-	 * @method flags=dynamic
-	 * @param widget cast=(GtkWidget *)
-	 */
-	public static final native long /*int*/ _gtk_widget_get_modifier_style(long /*int*/ widget);
-	/** [GTK2/GTK3; 3.0 deprecated] */
-	public static final long /*int*/ gtk_widget_get_modifier_style(long /*int*/ widget) {
-		lock.lock();
-		try {
-			return _gtk_widget_get_modifier_style(widget);
-		} finally {
-			lock.unlock();
-		}
-	}
 	/** @param widget cast=(GtkWidget *)  */
 	public static final native boolean _gtk_widget_get_mapped(long /*int*/ widget);
 	public static final boolean gtk_widget_get_mapped(long /*int*/ widget) {
@@ -8291,21 +8219,6 @@ public class GTK extends OS {
 	}
 	/**
 	 * @method flags=dynamic
-	 * @param widget cast=(GtkWidget *)
-	 * @param style cast=(GtkRcStyle *)
-	 */
-	public static final native void _gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style);
-	/** [GTK2/GTK3; 3.0 deprecated] */
-	public static final void gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style) {
-		lock.lock();
-		try {
-			_gtk_widget_modify_style(widget, style);
-		} finally {
-			lock.unlock();
-		}
-	}
-	/**
-	 * @method flags=dynamic
 	 */
 	public static final native void _gtk_widget_override_color(long /*int*/ widget, int state, GdkRGBA color);
 	/** [GTK3; 3.16 deprecated]*/
@@ -8622,21 +8535,6 @@ public class GTK extends OS {
 			lock.unlock();
 		}
 	}
-	/**
-	 * @method flags=dynamic
-	 * @param widget cast=(GtkWidget *)
-	 * @param state cast=(GtkStateType)
-	 */
-	public static final native void _gtk_widget_set_state(long /*int*/ widget, int state);
-	/** [GTK2/GTK3; 3.0 deprecated] */
-	public static final void gtk_widget_set_state(long /*int*/ widget, int state) {
-		lock.lock();
-		try {
-			_gtk_widget_set_state(widget, state);
-		} finally {
-			lock.unlock();
-		}
-	}
 	/** @param widget cast=(GtkWidget *) */
 	public static final native void _gtk_widget_show(long /*int*/ widget);
 	public static final void gtk_widget_show(long /*int*/ widget) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index 38560abd55..554eb7caa1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -225,12 +225,6 @@ protected void checkSubclass () {
 }
 
 @Override
-long /*int*/ childStyle () {
-	if (scrolledHandle != 0) return 0;
-	return super.childStyle ();
-}
-
-@Override
 Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
 	checkWidget ();
 	display.runSkin();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 5ab14cb37e..9136e184b4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -732,10 +732,6 @@ boolean containedInRegion (int x, int y) {
 	return false;
 }
 
-long /*int*/ childStyle () {
-	return parent.childStyle ();
-}
-
 @Override
 void createWidget (int index) {
 	state |= DRAG_DETECT;
@@ -979,17 +975,6 @@ void markLayout (boolean changed, boolean all) {
 	/* Do nothing */
 }
 
-@Override
-void modifyStyle (long /*int*/ handle, long /*int*/ style) {
-	super.modifyStyle(handle, style);
-	/*
-	* Bug in GTK.  When changing the style of a control that
-	* has had a region set on it, the region is lost.  The
-	* fix is to set the region again.
-	*/
-	if (region != null) GDK.gdk_window_shape_combine_region (gtk_widget_get_window (topHandle ()), region.handle, 0, 0);
-}
-
 void moveHandle (int x, int y) {
 	long /*int*/ topHandle = topHandle ();
 	long /*int*/ parentHandle = parent.parentingHandle ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index a5560c1cd3..fe67120f91 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -641,11 +641,6 @@ void checkOpen () {
 	if (!opened) resized = false;
 }
 
-@Override
-long /*int*/ childStyle () {
-	return 0;
-}
-
 /**
  * Requests that the window manager close the receiver in
  * the same way it would be closed when the user clicks on
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
index d1b7ee9c6f..8ab786c0fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
@@ -142,14 +142,6 @@ protected void checkSubclass () {
 	if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
 }
 
-@Override
-long /*int*/ childStyle () {
-	long /*int*/ rcStyle = GTK.gtk_widget_get_modifier_style (handle);
-	if ((GTK.gtk_rc_style_get_color_flags (rcStyle, 0) & GTK.GTK_RC_BG) != 0) return 0;
-	GTK.gtk_widget_realize (handle);
-	return GTK.gtk_widget_get_style (handle);
-}
-
 /**
  * Adds the listener to the collection of listeners who will
  * be notified when the user changes the receiver's selection, by sending
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
index 5f355854ac..92902298dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
@@ -1142,10 +1142,6 @@ boolean mnemonicMatch (long /*int*/ mnemonicHandle, char key) {
 	return keyval1 == keyval2;
 }
 
-void modifyStyle (long /*int*/ handle, long /*int*/ style) {
-	GTK.gtk_widget_modify_style (handle, style);
-}
-
 /**
  * Notifies all of the receiver's listeners for events
  * of the given type that one such event has occurred by