Even more GTK2 cleanups.

* Don't look for SWT_GTK3
* Remove GTK2 specific comments.
* remove get_size from GtkCellRendererClass replaced by
get_preferred_width

Change-Id: If3f7f37a11310533257dc818fd1dd1f5112dbe91
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

8 files changed, 4 insertions, 174 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index fd3d40b653..5a37f88a04 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -158,7 +158,6 @@ X#define NO__1XWarpPointer
 
 #endif
 
-/* Disable access to sealed structs in GTK3 */
 #define GdkRegion cairo_region_t
 #define gdk_region_point_in cairo_region_contains_point
 #define gdk_region_new cairo_region_create
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
index dd7286b3b8..c31516f9c3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
@@ -1116,7 +1116,7 @@ void setGtkBorderFields(JNIEnv *env, jobject lpObject, GtkBorder *lpStruct)
 typedef struct GtkCellRendererClass_FID_CACHE {
 	int cached;
 	jclass clazz;
-	jfieldID render, get_size, get_preferred_width;
+	jfieldID render, get_preferred_width;
 } GtkCellRendererClass_FID_CACHE;
 
 GtkCellRendererClass_FID_CACHE GtkCellRendererClassFc;
@@ -1126,7 +1126,6 @@ void cacheGtkCellRendererClassFields(JNIEnv *env, jobject lpObject)
 	if (GtkCellRendererClassFc.cached) return;
 	GtkCellRendererClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", I_J);
-	GtkCellRendererClassFc.get_size = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_size", I_J);
 	GtkCellRendererClassFc.get_preferred_width = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_preferred_width", I_J);
 	GtkCellRendererClassFc.cached = 1;
 }
@@ -1135,12 +1134,7 @@ GtkCellRendererClass *getGtkCellRendererClassFields(JNIEnv *env, jobject lpObjec
 {
 	if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
 	lpStruct->render = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.render);
-#ifndef GTK3
-	lpStruct->get_size = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_size);
-#endif
-#ifdef GTK3
 	lpStruct->get_preferred_width = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width);
-#endif
 	return lpStruct;
 }
 
@@ -1148,12 +1142,7 @@ void setGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendere
 {
 	if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
 	(*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.render, (jintLong)lpStruct->render);
-#ifndef GTK3
-	(*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.get_size, (jintLong)lpStruct->get_size);
-#endif
-#ifdef GTK3
 	(*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width, (jintLong)lpStruct->get_preferred_width);
-#endif
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
index 70458cfcdd..6867be221c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
@@ -18,8 +18,6 @@ package org.eclipse.swt.internal.gtk;
 public class GtkCellRendererClass {
 	/** @field cast=(void(*)()) */
 	public long /*int*/ render;
-	/** @field cast=(void(*)()),exclude=#ifndef GTK3 */
-	public long /*int*/ get_size;
-	/** @field cast=(void(*)()),exclude=#ifdef GTK3 */
+	/** @field cast=(void(*)()) */
 	public long /*int*/ get_preferred_width;
 }
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 1cbc124d37..db4dc24065 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
@@ -2841,7 +2841,6 @@ public static final native void memmove(long /*int*/ dest, GTypeInfo src, int si
  * @param size cast=(size_t)
  */
 public static final native void memmove(long /*int*/ dest, GtkTargetEntry src, long /*int*/ size);
-//NOTE: Call only on GTK3 as this uses GdkRGBA.
 /**
  * @param dest cast=(void *)
  * @param src cast=(const void *),flags=no_out
@@ -2905,7 +2904,6 @@ public static final native void memmove(GtkBorder dest, long /*int*/ src, long /
  * @param size cast=(size_t)
  */
 public static final native void memmove(GdkKeymapKey dest, long /*int*/ src, long /*int*/ size);
-//NOTE: Call only on GTK3 as this uses GdkRGBA.
 /**
  * @param dest cast=(void *),flags=no_in
  * @param src cast=(const void *)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
index 306dcd1738..3a72a52ae2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
@@ -50,12 +50,10 @@ import org.eclipse.swt.widgets.*;
  * Versioning for webkit is somewhat confusing because it's trying to incorporate webkit, gtk and (various linux distribution) versions.
  * The way they version webkitGTK is different from webkit.
  *   WebkitGTK:
- *    1.4 - 2013                         (v1 is  webkit1/Gtk2)
  *    2.4 is the last webkit1 version.   [2.0-2.4) is Gtk3.
  *    2.5 is webkit2.                    [2.4-..)  is Gtk3.
  *  Further, linux distributions might refer to webkit1/2 bindings linked against gtk2/3 differently.
  *  E.g on Fedora:
- *     webkitgtk2 = webkit1 / Gtk2
  *     webkitgtk3 = Webkit1 / Gtk3
  *     webkitgtk4 = webkit2 / Gtk3
  *
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
index ec313e36c5..89f69dbf21 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
@@ -2103,11 +2103,11 @@ long /*int*/ gtk_output (long /*int*/ widget) {
 	}
 	int arrowType = getArrow(widget);
 	switch (arrowType) {
-	case SWT.ARROW_UP: // Gtk2 arrow up. Gtk3 "+" button.
+	case SWT.ARROW_UP: // Gtk3 "+" button.
 		commitData();
 		incrementField(+1);
 		break;
-	case SWT.ARROW_DOWN: // Gtk2 arrow down. Gtk3 "-" button.
+	case SWT.ARROW_DOWN: // Gtk3 "-" button.
 		commitData();
 		incrementField(-1);
 		break;
diff --git a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug465280_InvisibleControlAllocation.java b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug465280_InvisibleControlAllocation.java
index 622c1bd331..3b41aee294 100644
--- a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug465280_InvisibleControlAllocation.java
+++ b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug465280_InvisibleControlAllocation.java
@@ -30,10 +30,6 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class Bug465280_InvisibleControlAllocation {
 	public static void main(String[] args) {
-        String property = System.getenv("SWT_GTK3");
-        if (property != null) {
-        	System.err.println("GTK"+(property.equals("1")?"3":"2"));
-        }
         Display display = new Display ();
         Shell shell = new Shell(display);
         shell.setLayout(new FillLayout());
diff --git a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug497705_setBoundsAfterSetVisibleBroken.java b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug497705_setBoundsAfterSetVisibleBroken.java
deleted file mode 100644
index 2a2ed4afac..0000000000
--- a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug497705_setBoundsAfterSetVisibleBroken.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 Red Hat and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.tests.gtk.snippets;
-//package api.visibility;
-//
-//import static org.junit.Assert.*;
-//
-//import java.lang.reflect.Field;
-//import java.util.Collections;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//import org.eclipse.swt.SWT;
-//import org.eclipse.swt.graphics.Rectangle;
-//import org.eclipse.swt.widgets.Button;
-//import org.eclipse.swt.widgets.Display;
-//import org.eclipse.swt.widgets.Shell;
-//import org.junit.Test;
-//
-//public class Bug497705_nullCordsOnInvisible {
-//	
-//
-//	// The jvm doesn't permit one to set the environmental values of parents.
-//	// TODO
-//	// Linux only.
-//	// https://stackoverflow.com/questions/318239/how-do-i-set-environment-variables-from-java
-//	public static void setEnv(Map<String, String> newenv) throws Exception {
-//	    Class[] classes = Collections.class.getDeclaredClasses();
-//	    Map<String, String> env = System.getenv();
-//	    for(Class cl : classes) {
-//	        if("java.util.Collections$UnmodifiableMap".equals(cl.getName())) {
-//	            Field field = cl.getDeclaredField("m");
-//	            field.setAccessible(true);
-//	            Object obj = field.get(env);
-//	            Map<String, String> map = (Map<String, String>) obj;
-//	            map.clear();
-//	            map.putAll(newenv);
-//	        }
-//	    }
-//	}
-//
-//
-//	@Test
-//	public void myTestG2() {
-//		System.gc();
-//		Map<String, String> newEnv = new HashMap<>();
-//		newEnv.put("SWT_GTK3", "0");
-//		try {
-//			setEnv(newEnv);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//			fail("Faild to set proper version of gtk");
-//		}
-//		
-//		String property = System.getenv("SWT_GTK3");
-//		System.err.println("GTK" + (property.equals("1") ? "3" : "2"));
-//		Display display = Display.getDefault();
-//		Shell shell = new Shell(display);
-//		shell.setSize(400, 400);
-//		StringBuffer log = new StringBuffer("");
-//		int x = 5;
-//		int y = 10;
-//		int height = 100;
-//		int width = 200;
-//		boolean passed = true;
-//		
-//		
-//		Button myButton = new Button(shell, SWT.PUSH);
-//		myButton.setText("Sized button");
-//		myButton.setVisible(false);
-//		myButton.setVisible(true);
-//		myButton.setBounds(x, y, width, height);
-//		Rectangle bounds = myButton.getBounds();
-//		if (bounds.x != x | bounds.y != y) {
-//			passed = false;
-//			log.append("\nERROR: x,y do not match. Expected:" + x + "/" + y + " Actual:" + bounds.x + "/" + bounds.y);
-//		}
-//		if (bounds.height != height | bounds.width != width) {
-//			passed = false;
-//			log.append("\nERROR: width,height do not match. Expected:" + width + "/" + height + " Actual:" + bounds.width + "/" + bounds.height);
-//		}
-//		display.dispose();
-//		assertTrue(log.toString(), passed);
-//		
-//	}
-//	
-//	@Test
-//	public void myTestG3() {
-//		System.gc();
-//		Map<String, String> newEnv = new HashMap<>();
-//		newEnv.put("SWT_GTK3", "1");
-//		try {
-//			setEnv(newEnv);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//			fail("Faild to set proper version of gtk");
-//		}
-//		
-//		String property = System.getenv("SWT_GTK3");
-//		System.err.println("GTK" + (property.equals("1") ? "3" : "2"));
-//		Display display = Display.getDefault();
-//		Shell shell = new Shell(display);
-//		shell.setSize(400, 400);
-//		StringBuffer log = new StringBuffer("");
-//		int x = 5;
-//		int y = 10;
-//		int height = 100;
-//		int width = 200;
-//		boolean passed = true;
-//		
-//		
-//		Button myButton = new Button(shell, SWT.PUSH);
-//		myButton.setText("Sized button");
-//		myButton.setVisible(false);
-//		myButton.setVisible(true);
-//		myButton.setBounds(x, y, width, height);
-//		Rectangle bounds = myButton.getBounds();
-//		if (bounds.x != x | bounds.y != y) {
-//			passed = false;
-//			log.append("\nERROR: x,y do not match. Expected:" + x + "/" + y + " Actual:" + bounds.x + "/" + bounds.y);
-//		}
-//		if (bounds.height != height | bounds.width != width) {
-//			passed = false;
-//			log.append("\nERROR: width,height do not match. Expected:" + width + "/" + height + " Actual:" + bounds.width + "/" + bounds.height);
-//		}
-//		display.dispose();
-//		assertTrue(log.toString(), passed);
-//	
-//		
-////		shell.open();
-////		while (!shell.isDisposed()) {
-////			if (!display.readAndDispatch())
-////				display.sleep();
-////		}
-////		display.dispose();
-//	}
-//}