diff options
author | Anatoly Spektor <aspektor@redhat.com> | 2012-07-06 15:22:07 -0400 |
---|---|---|
committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-01 10:19:25 -0400 |
commit | 0d23f871e57d5ad4ac4223f8da9d549bb534627e (patch) | |
tree | 6b0cc2ee1dec16e06e10492b272f2482d1de742b /bundles/org.eclipse.swt/Eclipse SWT PI/gtk | |
parent | b2f2631812bb255ec81879bc4ce8063e64a87354 (diff) | |
download | eclipse.platform.swt-0d23f871e57d5ad4ac4223f8da9d549bb534627e.tar.gz eclipse.platform.swt-0d23f871e57d5ad4ac4223f8da9d549bb534627e.tar.xz eclipse.platform.swt-0d23f871e57d5ad4ac4223f8da9d549bb534627e.zip |
Use gtk_widget_set_has_window() instead of gtk_fixed_set_has_window()
Conflicts:
bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk')
5 files changed, 46 insertions, 5 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 63031a38ab..f2fee3d8f5 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 @@ -9238,7 +9238,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1set_1has_1window) (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) { OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1set_1has_1window_FUNC); - gtk_fixed_set_has_window((GtkFixed *)arg0, (gboolean)arg1); +/* + gtk_fixed_set_has_window(arg0, arg1); +*/ + { + OS_LOAD_FUNCTION(fp, gtk_fixed_set_has_window) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); + } + } OS_NATIVE_EXIT(env, that, _1gtk_1fixed_1set_1has_1window_FUNC); } #endif @@ -15819,6 +15827,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1double_1buffered) } #endif +#ifndef NO__1gtk_1widget_1set_1has_1window +JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1has_1window) + (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) +{ + OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1has_1window_FUNC); +/* + gtk_widget_set_has_window(arg0, arg1); +*/ + { + OS_LOAD_FUNCTION(fp, gtk_widget_set_has_window) + if (fp) { + ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); + } + } + OS_NATIVE_EXIT(env, that, _1gtk_1widget_1set_1has_1window_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) 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 c2e471afaf..7996ea0d06 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 @@ -202,6 +202,8 @@ #define gtk_widget_get_tooltip_text_LIB LIB_GTK #define gtk_widget_has_default_LIB LIB_GTK #define gtk_widget_set_tooltip_text_LIB LIB_GTK +#define gtk_widget_set_has_window_LIB LIB_GTK +#define gtk_fixed_set_has_window_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 d82496e9d6..bedece6c8d 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 = 1319; -int OS_nativeFunctionCallCount[1319]; +int OS_nativeFunctionCount = 1320; +int OS_nativeFunctionCallCount[1320]; char * OS_nativeFunctionNames[] = { #ifndef JNI64 "Call__IIII", @@ -1255,6 +1255,7 @@ char * OS_nativeFunctionNames[] = { "_1gtk_1widget_1set_1default_1direction", "_1gtk_1widget_1set_1direction", "_1gtk_1widget_1set_1double_1buffered", + "_1gtk_1widget_1set_1has_1window", "_1gtk_1widget_1set_1name", "_1gtk_1widget_1set_1parent_1window", "_1gtk_1widget_1set_1redraw_1on_1allocate", 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 140db9df8b..c1af2f83cb 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 @@ -1263,6 +1263,7 @@ typedef enum { _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_1name_FUNC, _1gtk_1widget_1set_1parent_1window_FUNC, _1gtk_1widget_1set_1redraw_1on_1allocate_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 c5c40cc494..03395f8eba 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 @@ -6969,8 +6969,7 @@ public static final int /*long*/ gtk_fixed_new() { } } /** - * @param fixed cast=(GtkFixed *) - * @param has_window cast=(gboolean) + * @method flags=dynamic */ public static final native void _gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window); public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window) { @@ -6981,6 +6980,18 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha lock.unlock(); } } +/** + * @method flags=dynamic + */ +public static final native void _gtk_widget_set_has_window(int /*long*/ widget, boolean has_window); +public static final void gtk_widget_set_has_window(int /*long*/ widget, boolean has_window) { + lock.lock(); + try { + _gtk_fixed_set_has_window(widget, has_window); + } finally { + lock.unlock(); + } +} /** @param fsd cast=(GtkFontSelectionDialog *) */ public static final native int /*long*/ _gtk_font_selection_dialog_get_font_name(int /*long*/ fsd); public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*long*/ fsd) { |