summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAnatoly Spektor2012-08-07 13:24:13 (EDT)
committer Silenio Quarti2012-08-08 10:00:24 (EDT)
commitfc2d2ec1727bbf89af6fa75dcff471c41c95b0be (patch)
treea953bcf63b5610c486a85b57a9a9ddf7400e3918
parent1b29b62773b879ebe6e2bfebcaf549fca1fa38b9 (diff)
downloadeclipse.platform.swt-fc2d2ec1727bbf89af6fa75dcff471c41c95b0be.zip
eclipse.platform.swt-fc2d2ec1727bbf89af6fa75dcff471c41c95b0be.tar.gz
eclipse.platform.swt-fc2d2ec1727bbf89af6fa75dcff471c41c95b0be.tar.bz2
Omit use of deprecated GTK_WIDGET_SET_FLAG
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 bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c74
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java40
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java8
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java32
15 files changed, 175 insertions, 16 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 c8897bb..41d9821 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
@@ -16019,6 +16019,44 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1app_1paintable)
}
#endif
+#ifndef NO__1gtk_1widget_1set_1can_1default
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1can_1default)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1can_1default_FUNC);
+/*
+ gtk_widget_set_can_default(arg0, arg1);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gtk_widget_set_can_default)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1can_1default_FUNC);
+}
+#endif
+
+#ifndef NO__1gtk_1widget_1set_1can_1focus
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1set_1can_1focus)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+ jboolean rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1can_1focus_FUNC);
+/*
+ rc = (jboolean)gtk_widget_set_can_focus(arg0, arg1);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gtk_widget_set_can_focus)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1can_1focus_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1gtk_1widget_1set_1default_1direction
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1default_1direction)
(JNIEnv *env, jclass that, jint arg0)
@@ -16067,6 +16105,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1has_1window)
}
#endif
+#ifndef NO__1gtk_1widget_1set_1mapped
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1mapped)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1mapped_FUNC);
+/*
+ gtk_widget_set_mapped(arg0, arg1);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gtk_widget_set_mapped)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1mapped_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1widget_1set_1name
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1name)
(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
@@ -16153,6 +16209,24 @@ fail:
}
#endif
+#ifndef NO__1gtk_1widget_1set_1visible
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1visible)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1visible_FUNC);
+/*
+ gtk_widget_set_visible(arg0, arg1);
+*/
+ {
+ OS_LOAD_FUNCTION(fp, gtk_widget_set_visible)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1visible_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1widget_1show
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show)
(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 42ff173..1e38d0b 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
@@ -218,6 +218,11 @@
#define gtk_widget_get_realized_LIB LIB_GTK
#define gtk_widget_get_can_default_LIB LIB_GTK
#define gtk_widget_get_window_LIB LIB_GTK
+#define gtk_widget_set_can_default_LIB LIB_GTK
+#define gtk_widget_set_can_focus_LIB LIB_GTK
+#define gtk_widget_set_mapped_LIB LIB_GTK
+#define gtk_widget_set_sensitive_LIB LIB_GTK
+#define gtk_widget_set_visible_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
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 3f141d2..626e121 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 = 1330;
-int OS_nativeFunctionCallCount[1330];
+int OS_nativeFunctionCount = 1334;
+int OS_nativeFunctionCallCount[1334];
char * OS_nativeFunctionNames[] = {
#ifndef JNI64
"Call__IIII",
@@ -1262,10 +1262,13 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1widget_1reparent",
"_1gtk_1widget_1send_1expose",
"_1gtk_1widget_1set_1app_1paintable",
+ "_1gtk_1widget_1set_1can_1default",
+ "_1gtk_1widget_1set_1can_1focus",
"_1gtk_1widget_1set_1default_1direction",
"_1gtk_1widget_1set_1direction",
"_1gtk_1widget_1set_1double_1buffered",
"_1gtk_1widget_1set_1has_1window",
+ "_1gtk_1widget_1set_1mapped",
"_1gtk_1widget_1set_1name",
"_1gtk_1widget_1set_1parent_1window",
"_1gtk_1widget_1set_1redraw_1on_1allocate",
@@ -1273,6 +1276,7 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1widget_1set_1size_1request",
"_1gtk_1widget_1set_1state",
"_1gtk_1widget_1set_1tooltip_1text",
+ "_1gtk_1widget_1set_1visible",
"_1gtk_1widget_1show",
"_1gtk_1widget_1size_1allocate",
"_1gtk_1widget_1size_1request",
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 ff90161..8975724 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
@@ -1270,10 +1270,13 @@ typedef enum {
_1gtk_1widget_1reparent_FUNC,
_1gtk_1widget_1send_1expose_FUNC,
_1gtk_1widget_1set_1app_1paintable_FUNC,
+ _1gtk_1widget_1set_1can_1default_FUNC,
+ _1gtk_1widget_1set_1can_1focus_FUNC,
_1gtk_1widget_1set_1default_1direction_FUNC,
_1gtk_1widget_1set_1direction_FUNC,
_1gtk_1widget_1set_1double_1buffered_FUNC,
_1gtk_1widget_1set_1has_1window_FUNC,
+ _1gtk_1widget_1set_1mapped_FUNC,
_1gtk_1widget_1set_1name_FUNC,
_1gtk_1widget_1set_1parent_1window_FUNC,
_1gtk_1widget_1set_1redraw_1on_1allocate_FUNC,
@@ -1281,6 +1284,7 @@ typedef enum {
_1gtk_1widget_1set_1size_1request_FUNC,
_1gtk_1widget_1set_1state_FUNC,
_1gtk_1widget_1set_1tooltip_1text_FUNC,
+ _1gtk_1widget_1set_1visible_FUNC,
_1gtk_1widget_1show_FUNC,
_1gtk_1widget_1size_1allocate_FUNC,
_1gtk_1widget_1size_1request_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 a1c1097..eb2d39a 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
@@ -12545,6 +12545,46 @@ public static final void gtk_widget_set_default_direction(int dir) {
lock.unlock();
}
}
+/** @method flags=dynamic */
+public static final native void _gtk_widget_set_can_default(int /*long*/ widget, boolean can_default);
+public static final void gtk_widget_set_can_default(int /*long*/ widget, boolean can_default) {
+ lock.lock();
+ try {
+ _gtk_widget_set_can_default(widget,can_default) ;
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
+public static final native boolean _gtk_widget_set_can_focus(int /*long*/ widget, boolean can_focus);
+public static final boolean gtk_widget_set_can_focus(int /*long*/ widget, boolean can_focus) {
+ lock.lock();
+ try {
+ return _gtk_widget_set_can_focus(widget,can_focus);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
+public static final native void _gtk_widget_set_mapped(int /*long*/ widget, boolean mapped);
+public static final void gtk_widget_set_mapped(int /*long*/ widget, boolean mapped) {
+ lock.lock();
+ try {
+ _gtk_widget_set_mapped(widget,mapped);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
+public static final native void _gtk_widget_set_visible(int /*long*/ widget, boolean visible);
+public static final void gtk_widget_set_visible(int /*long*/ widget, boolean visible) {
+ lock.lock();
+ try {
+ _gtk_widget_set_visible(widget, visible);
+ } finally {
+ lock.unlock();
+ }
+}
/**
* @param widget cast=(GtkWidget *)
* @param dir cast=(GtkTextDirection)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
index 8a1d466..b4a341f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
@@ -302,7 +302,7 @@ void createHandle (int index) {
default:
handle = OS.gtk_button_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
- OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default (handle, true);
break;
}
if ((style & SWT.ARROW) != 0) {
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 84c8a8e..35c0369 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
@@ -277,7 +277,7 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
handle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
gtk_widget_set_has_window (handle, true);
- OS.GTK_WIDGET_SET_FLAGS(handle, OS.GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (handle, true);
if ((style & SWT.EMBEDDED) == 0) {
if ((state & CANVAS) != 0) {
/* Prevent an input method context from being created for the Browser widget */
@@ -530,7 +530,7 @@ int /*long*/ focusHandle () {
}
boolean forceFocus (int /*long*/ focusHandle) {
- if (socketHandle != 0) OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
+ if (socketHandle != 0) gtk_widget_set_can_focus (focusHandle, true);
boolean result = super.forceFocus (focusHandle);
if (socketHandle != 0) OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
return result;
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 27e8a5b..6e57710 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
@@ -191,7 +191,7 @@ void fixFocus (Control focusControl) {
}
shell.setSavedFocus (focusControl);
int /*long*/ focusHandle = shell.vboxHandle;
- OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (focusHandle, true);
OS.gtk_widget_grab_focus (focusHandle);
// widget could be disposed at this point
if (isDisposed ()) return;
@@ -843,7 +843,7 @@ void moveHandle (int x, int y) {
OS.GTK_WIDGET_UNSET_FLAGS (parentHandle, OS.GTK_VISIBLE);
OS.gtk_fixed_move (parentHandle, topHandle, x, y);
if (visible) {
- OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_VISIBLE);
+ gtk_widget_set_visible (parentHandle, true);
}
}
@@ -2368,7 +2368,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
}
int /*long*/ fixedMapProc (int /*long*/ widget) {
- OS.GTK_WIDGET_SET_FLAGS (widget, OS.GTK_MAPPED);
+ gtk_widget_set_mapped (widget, true);
int /*long*/ widgetList = OS.gtk_container_get_children (widget);
if (widgetList != 0) {
int /*long*/ widgets = widgetList;
@@ -4567,7 +4567,7 @@ public void setVisible (boolean visible) {
OS.GTK_WIDGET_UNSET_FLAGS (topHandle, OS.GTK_VISIBLE);
fixFocus (control);
if (isDisposed ()) return;
- OS.GTK_WIDGET_SET_FLAGS (topHandle, OS.GTK_VISIBLE);
+ gtk_widget_set_visible (topHandle, true);
}
OS.gtk_widget_hide (topHandle);
if (isDisposed ()) return;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
index 62ac399..05d4dce 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
@@ -136,7 +136,7 @@ void createHandle (int index) {
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
OS.gtk_expander_set_label_widget (handle, boxHandle);
- OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (handle, true);
}
void createWidget (int index) {
@@ -509,7 +509,7 @@ public void setExpanded (boolean expanded) {
boolean setFocus () {
if (!OS.gtk_widget_get_child_visible (handle)) return false;
- OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (handle, true);
OS.gtk_widget_grab_focus (handle);
// widget could be disposed at this point
if (isDisposed ()) return false;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
index d45f7c2..9afefbb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
@@ -146,7 +146,7 @@ void createHandle(int index) {
handle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
gtk_widget_set_has_window (handle, true);
- OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (handle, true);
layout = new TextLayout (display);
linkColor = new Color (display, LINK_FOREGROUND);
disabledColor = new Color (display, LINK_DISABLED_FOREGROUND);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
index 65c0356..072dd38 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java
@@ -961,7 +961,7 @@ public void setDefaultItem (MenuItem item) {
public void setEnabled (boolean enabled) {
checkWidget();
if (enabled) {
- OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_SENSITIVE);
+ OS.gtk_widget_set_sensitive (handle, true);
} else {
OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_SENSITIVE);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
index ee8915e..87f0b0a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
@@ -276,7 +276,7 @@ void createHandle (int index) {
}
int /*long*/ parentHandle = parent.handle;
boolean enabled = gtk_widget_get_sensitive (parentHandle);
- if (!enabled) OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_SENSITIVE);
+ if (!enabled) OS.gtk_widget_set_sensitive (parentHandle, true);
OS.gtk_menu_shell_insert (parentHandle, handle, index);
if (!enabled) OS.GTK_WIDGET_UNSET_FLAGS (parentHandle, OS.GTK_SENSITIVE);
OS.gtk_widget_show (handle);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
index 036c84c..7485d19 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
@@ -137,7 +137,7 @@ void createHandle (int index) {
handle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
gtk_widget_set_has_window (handle, true);
- OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (handle, true);
int type = (style & SWT.VERTICAL) != 0 ? OS.GDK_SB_H_DOUBLE_ARROW : OS.GDK_SB_V_DOUBLE_ARROW;
defaultCursor = OS.gdk_cursor_new (type);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
index e2386d1..fb26b7d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
@@ -170,7 +170,7 @@ void createHandle (int index) {
* (http://bugzilla.gnome.org/show_bug.cgi?id=475909)
*/
if (OS.GTK_VERSION < OS.VERSION (2, 10, 0) || (style & SWT.VERTICAL) != 0) {
- OS.GTK_WIDGET_SET_FLAGS (handle, OS.GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (handle, true);
}
OS.gtk_container_add (fixedHandle, handle);
}
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 0c8ec24..eb1b4e8 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
@@ -1746,6 +1746,38 @@ int /*long*/ gtk_widget_get_window (int /*long*/ widget){
}
}
+void gtk_widget_set_can_default (int /*long*/ widget, boolean can_default) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
+ OS.gtk_widget_set_can_default (widget, can_default);
+ } else {
+ OS.GTK_WIDGET_SET_FLAGS (widget, OS.GTK_CAN_DEFAULT);
+ }
+}
+
+void gtk_widget_set_can_focus (int /*long*/ widget, boolean can_focus) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
+ OS.gtk_widget_set_can_focus (widget, can_focus);
+ } else {
+ OS.GTK_WIDGET_SET_FLAGS (widget, OS.GTK_CAN_FOCUS);
+ }
+}
+
+void gtk_widget_set_mapped (int /*long*/ widget, boolean mapped) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 20, 0)) {
+ OS.gtk_widget_set_mapped (widget, mapped);
+ } else {
+ OS.GTK_WIDGET_SET_FLAGS (widget, OS.GTK_MAPPED);
+ }
+}
+
+void gtk_widget_set_visible (int /*long*/ widget, boolean visible) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
+ OS.gtk_widget_set_visible (widget,visible);
+ } else {
+ OS.GTK_WIDGET_SET_FLAGS (widget, OS.GTK_VISIBLE);
+ }
+}
+
/**
* Returns a string containing a concise, human-readable
* description of the receiver.