Omit use of deprecated GTK_WIDGET_FLAGS

Conflicts:
	bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
	bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
	bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
	bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h

5 files changed, 139 insertions, 2 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 8185f816e0..266b466b85 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
@@ -15502,6 +15502,26 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
 }
 #endif
 
+#ifndef NO__1gtk_1widget_1get_1can_1default
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1can_1default)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1can_1default_FUNC);
+/*
+	rc = (jboolean)gtk_widget_get_can_default(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_widget_get_can_default)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1can_1default_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1gtk_1widget_1get_1child_1visible
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1child_1visible)
 	(JNIEnv *env, jclass that, jintLong arg0)
@@ -15538,6 +15558,26 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1events)
 }
 #endif
 
+#ifndef NO__1gtk_1widget_1get_1has_1window
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1has_1window)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1has_1window_FUNC);
+/*
+	rc = (jboolean)gtk_widget_get_has_window(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_widget_get_has_window)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1has_1window_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1gtk_1widget_1get_1mapped
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1mapped)
 	(JNIEnv *env, jclass that, jintLong arg0)
@@ -15606,6 +15646,26 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent_1window)
 }
 #endif
 
+#ifndef NO__1gtk_1widget_1get_1realized
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1realized)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1realized_FUNC);
+/*
+	rc = (jboolean)gtk_widget_get_realized(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_widget_get_realized)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1realized_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1gtk_1widget_1get_1sensitive
 JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1sensitive)
 	(JNIEnv *env, jclass that, jintLong arg0)
@@ -15687,6 +15747,26 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
 }
 #endif
 
+#ifndef NO__1gtk_1widget_1get_1visible
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1visible)
+	(JNIEnv *env, jclass that, jintLong arg0)
+{
+	jboolean rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1visible_FUNC);
+/*
+	rc = (jboolean)gtk_widget_get_visible(arg0);
+*/
+	{
+		OS_LOAD_FUNCTION(fp, gtk_widget_get_visible)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+		}
+	}
+	OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1visible_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1gtk_1widget_1grab_1focus
 JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1grab_1focus)
 	(JNIEnv *env, jclass that, jintLong arg0)
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 0a5fd5fe20..19f89145b3 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
@@ -206,6 +206,10 @@
 #define gtk_fixed_set_has_window_LIB LIB_GTK
 #define gtk_widget_get_mapped_LIB LIB_GTK
 #define gtk_widget_get_sensitive_LIB LIB_GTK
+#define gtk_widget_get_has_window_LIB LIB_GTK
+#define gtk_widget_get_visible_LIB LIB_GTK
+#define gtk_widget_get_realized_LIB LIB_GTK
+#define gtk_widget_get_can_default_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
@@ -366,11 +370,16 @@
 #else
 #define GTK_SCROLLED_WINDOW_VSCROLLBAR(arg0) (arg0)->vscrollbar
 #endif
+<<<<<<< HEAD
 #ifndef GTK_WIDGET_HAS_DEFAULT
 #define GTK_WIDGET_HAS_DEFAULT(arg0) 0
 #endif
 #ifndef GTK_WIDGET_SENSITIVE
 #define GTK_WIDGET_SENSITIVE(arg0) 0
+=======
+#ifndef GTK_OBJECT_FLAGS
+#define GTK_OBJECT_FLAGS(arg0) 0
+>>>>>>> 4bf36e6... Omit use of deprecated  GTK_WIDGET_FLAGS
 #endif
 #define GTK_WIDGET_HEIGHT(arg0) (arg0)->allocation.height
 #define GTK_WIDGET_SET_HEIGHT(arg0, arg1) (arg0)->allocation.height = 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 746a2767fc..579ba0029a 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
@@ -18,8 +18,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 1325;
-int OS_nativeFunctionCallCount[1325];
+int OS_nativeFunctionCount = 1329;
+int OS_nativeFunctionCallCount[1329];
 char * OS_nativeFunctionNames[] = {
 #ifndef JNI64
 	"Call__IIII",
@@ -1227,19 +1227,23 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1widget_1destroy",
 	"_1gtk_1widget_1event",
 	"_1gtk_1widget_1get_1accessible",
+	"_1gtk_1widget_1get_1can_1default",
 	"_1gtk_1widget_1get_1child_1visible",
 	"_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_1pango_1context",
 	"_1gtk_1widget_1get_1parent",
 	"_1gtk_1widget_1get_1parent_1window",
+	"_1gtk_1widget_1get_1realized",
 	"_1gtk_1widget_1get_1sensitive",
 	"_1gtk_1widget_1get_1size_1request",
 	"_1gtk_1widget_1get_1style",
 	"_1gtk_1widget_1get_1tooltip_1text",
 	"_1gtk_1widget_1get_1toplevel",
+	"_1gtk_1widget_1get_1visible",
 	"_1gtk_1widget_1grab_1focus",
 	"_1gtk_1widget_1has_1default",
 	"_1gtk_1widget_1hide",
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 036e9d8d3a..b0e3596a81 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
@@ -1235,19 +1235,23 @@ typedef enum {
 	_1gtk_1widget_1destroy_FUNC,
 	_1gtk_1widget_1event_FUNC,
 	_1gtk_1widget_1get_1accessible_FUNC,
+	_1gtk_1widget_1get_1can_1default_FUNC,
 	_1gtk_1widget_1get_1child_1visible_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_1pango_1context_FUNC,
 	_1gtk_1widget_1get_1parent_FUNC,
 	_1gtk_1widget_1get_1parent_1window_FUNC,
+	_1gtk_1widget_1get_1realized_FUNC,
 	_1gtk_1widget_1get_1sensitive_FUNC,
 	_1gtk_1widget_1get_1size_1request_FUNC,
 	_1gtk_1widget_1get_1style_FUNC,
 	_1gtk_1widget_1get_1tooltip_1text_FUNC,
 	_1gtk_1widget_1get_1toplevel_FUNC,
+	_1gtk_1widget_1get_1visible_FUNC,
 	_1gtk_1widget_1grab_1focus_FUNC,
 	_1gtk_1widget_1has_1default_FUNC,
 	_1gtk_1widget_1hide_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 3357cf2ec5..1b09c73484 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
@@ -12150,6 +12150,46 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
 		lock.unlock();
 	}
 }
+/** @method flags=dynamic */
+public static final native boolean _gtk_widget_get_visible (int /*long*/ widget);
+public static final boolean gtk_widget_get_visible (int /*long*/ widget) {
+	lock.lock();
+	try {
+		return _gtk_widget_get_visible(widget);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @method flags=dynamic */
+public static final native boolean _gtk_widget_get_realized (int /*long*/ widget);
+public static final boolean gtk_widget_get_realized (int /*long*/ widget) {
+	lock.lock();
+	try {
+		return _gtk_widget_get_realized(widget);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @method flags=dynamic */
+public static final native boolean _gtk_widget_get_has_window (int /*long*/ widget);
+public static final boolean gtk_widget_get_has_window (int /*long*/ widget) {
+	lock.lock();
+	try {
+		return _gtk_widget_get_has_window(widget);
+	} finally {
+		lock.unlock();
+	}
+}
+/** @method flags=dynamic */
+public static final native boolean _gtk_widget_get_can_default (int /*long*/ widget);
+public static final boolean gtk_widget_get_can_default (int /*long*/ widget) {
+	lock.lock();
+	try {
+		return _gtk_widget_get_can_default(widget);
+	} finally {
+		lock.unlock();
+	}
+}
 /** @param widget cast=(GtkWidget *) */
 public static final native boolean _gtk_widget_get_child_visible (int /*long*/ widget);
 public static final boolean gtk_widget_get_child_visible (int /*long*/ widget) {