Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Heidrich2008-09-03 16:49:51 -0400
committerFelipe Heidrich2008-09-03 16:49:51 -0400
commit820534ff20edc149977f4f59e6f4461bfc0354fa (patch)
tree136278befb9b8022c3bec716307174bd0db2d607
parent5f20ccb777d73502613fd086d5dba178b1053016 (diff)
downloadeclipse.platform.swt-820534ff20edc149977f4f59e6f4461bfc0354fa.tar.gz
eclipse.platform.swt-820534ff20edc149977f4f59e6f4461bfc0354fa.tar.xz
eclipse.platform.swt-820534ff20edc149977f4f59e6f4461bfc0354fa.zip
Bug 139070 - ExpandBar draws on top of scrollbars
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties7
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c22
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java18
5 files changed, 53 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties
index 1c5bf96271..d775e7a568 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties
@@ -4577,6 +4577,13 @@ OS__gtk_vbox_new=
OS__gtk_vbox_new_0=cast=(gboolean)
OS__gtk_vbox_new_1=cast=(gint)
+OS__gtk_viewport_get_shadow_type=
+OS__gtk_viewport_get_shadow_type_0=cast=GtkViewport *
+
+OS__gtk_viewport_set_shadow_type=
+OS__gtk_viewport_set_shadow_type_0=cast=GtkViewport *
+OS__gtk_viewport_set_shadow_type_1=cast=GtkShadowType
+
OS__gtk_vscale_new=
OS__gtk_vscale_new_0=cast=(GtkAdjustment *)
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 be71afa039..0ad01b63e8 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
@@ -14896,6 +14896,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vbox_1new)
}
#endif
+#ifndef NO__1gtk_1viewport_1get_1shadow_1type
+JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1viewport_1get_1shadow_1type)
+ (JNIEnv *env, jclass that, jint arg0)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1viewport_1get_1shadow_1type_FUNC);
+ rc = (jint)gtk_viewport_get_shadow_type((GtkViewport *)arg0);
+ OS_NATIVE_EXIT(env, that, _1gtk_1viewport_1get_1shadow_1type_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1gtk_1viewport_1set_1shadow_1type
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1viewport_1set_1shadow_1type)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
+ gtk_viewport_set_shadow_type((GtkViewport *)arg0, (GtkShadowType)arg1);
+ OS_NATIVE_EXIT(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1vscale_1new
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vscale_1new)
(JNIEnv *env, jclass that, jint arg0)
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 879302448c..2070f52a17 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 = 1268;
-int OS_nativeFunctionCallCount[1268];
+int OS_nativeFunctionCount = 1270;
+int OS_nativeFunctionCallCount[1270];
char * OS_nativeFunctionNames[] = {
"Call",
"GDK_1EVENT_1TYPE",
@@ -1026,6 +1026,8 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1tree_1view_1unset_1rows_1drag_1dest",
"_1gtk_1tree_1view_1widget_1to_1tree_1coords",
"_1gtk_1vbox_1new",
+ "_1gtk_1viewport_1get_1shadow_1type",
+ "_1gtk_1viewport_1set_1shadow_1type",
"_1gtk_1vscale_1new",
"_1gtk_1vscrollbar_1new",
"_1gtk_1vseparator_1new",
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 48004e7352..ddc53cb5d2 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
@@ -1034,6 +1034,8 @@ typedef enum {
_1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC,
_1gtk_1tree_1view_1widget_1to_1tree_1coords_FUNC,
_1gtk_1vbox_1new_FUNC,
+ _1gtk_1viewport_1get_1shadow_1type_FUNC,
+ _1gtk_1viewport_1set_1shadow_1type_FUNC,
_1gtk_1vscale_1new_FUNC,
_1gtk_1vscrollbar_1new_FUNC,
_1gtk_1vseparator_1new_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 a81c8d1967..258c286a4c 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
@@ -8924,6 +8924,24 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
lock.unlock();
}
}
+public static final native int _gtk_viewport_get_shadow_type(int /*long*/ viewport);
+public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
+ lock.lock();
+ try {
+ return _gtk_viewport_get_shadow_type(viewport);
+ } finally {
+ lock.unlock();
+ }
+}
+public static final native void _gtk_viewport_set_shadow_type(int /*long*/ viewport, int type);
+public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int type) {
+ lock.lock();
+ try {
+ _gtk_viewport_set_shadow_type(viewport, type);
+ } finally {
+ lock.unlock();
+ }
+}
public static final native int /*long*/ _gtk_vscale_new(int /*long*/ adjustment);
public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
lock.lock();

Back to the top