summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVeronika Irvine <veronika>2006-02-09 18:53:57 +0000
committerVeronika Irvine <veronika>2006-02-09 18:53:57 +0000
commit8b07739025e4483fd6ae8247a0edcd7b527a4681 (patch)
treeb4742b92de2d2f73e1043462d6422711f5b56903
parenta1a38e77f966d4086d57828d92c30ac56a644d45 (diff)
downloadeclipse.platform.swt-8b07739025e4483fd6ae8247a0edcd7b527a4681.tar.gz
eclipse.platform.swt-8b07739025e4483fd6ae8247a0edcd7b527a4681.tar.xz
eclipse.platform.swt-8b07739025e4483fd6ae8247a0edcd7b527a4681.zip
Bug 126966 can't set text or image asynchronously in virtual table or tree
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.gtk.OS.properties3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java27
5 files changed, 37 insertions, 11 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 508d4b8360..e02805ae62 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
@@ -3556,6 +3556,9 @@ OS__gtk_tree_view_column_get_reorderable_0=cast=GtkTreeViewColumn *
OS__gtk_tree_view_column_get_resizable=
OS__gtk_tree_view_column_get_resizable_0=cast=(GtkTreeViewColumn *)
+OS__gtk_tree_view_column_get_sizing=
+OS__gtk_tree_view_column_get_sizing_0=cast=(GtkTreeViewColumn *)
+
OS__gtk_tree_view_column_get_sort_indicator=
OS__gtk_tree_view_column_get_sort_indicator_0=cast=GtkTreeViewColumn *
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 bce944524b..7abc9b1196 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
@@ -10374,6 +10374,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable)
}
#endif
+#ifndef NO__1gtk_1tree_1view_1column_1get_1sizing
+JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sizing)
+ (JNIEnv *env, jclass that, jint arg0)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sizing_FUNC);
+ rc = (jint)gtk_tree_view_column_get_sizing((GtkTreeViewColumn *)arg0);
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1sizing_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1gtk_1tree_1view_1column_1get_1sort_1indicator
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1indicator)
(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 9ed0a5ff51..d463315eb5 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 = 1065;
-int OS_nativeFunctionCallCount[1065];
+int OS_nativeFunctionCount = 1066;
+int OS_nativeFunctionCallCount[1066];
char * OS_nativeFunctionNames[] = {
"Call",
"GDK_1EVENT_1TYPE",
@@ -804,6 +804,7 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1tree_1view_1column_1get_1fixed_1width",
"_1gtk_1tree_1view_1column_1get_1reorderable",
"_1gtk_1tree_1view_1column_1get_1resizable",
+ "_1gtk_1tree_1view_1column_1get_1sizing",
"_1gtk_1tree_1view_1column_1get_1sort_1indicator",
"_1gtk_1tree_1view_1column_1get_1sort_1order",
"_1gtk_1tree_1view_1column_1get_1spacing",
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 6fc49b3f65..f83f2b55b9 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
@@ -808,6 +808,7 @@ typedef enum {
_1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC,
_1gtk_1tree_1view_1column_1get_1reorderable_FUNC,
_1gtk_1tree_1view_1column_1get_1resizable_FUNC,
+ _1gtk_1tree_1view_1column_1get_1sizing_FUNC,
_1gtk_1tree_1view_1column_1get_1sort_1indicator_FUNC,
_1gtk_1tree_1view_1column_1get_1sort_1order_FUNC,
_1gtk_1tree_1view_1column_1get_1spacing_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 47e07314cc..c16d414c3f 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
@@ -6848,15 +6848,6 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
lock.unlock();
}
}
-public static final native boolean _gtk_tree_view_column_get_reorderable(int /*long*/ column);
-public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ column) {
- lock.lock();
- try {
- return _gtk_tree_view_column_get_reorderable(column);
- } finally {
- lock.unlock();
- }
-}
public static final native int /*long*/ _gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column);
public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column) {
lock.lock();
@@ -6875,6 +6866,15 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
lock.unlock();
}
}
+public static final native boolean _gtk_tree_view_column_get_reorderable(int /*long*/ column);
+public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ column) {
+ lock.lock();
+ try {
+ return _gtk_tree_view_column_get_reorderable(column);
+ } finally {
+ lock.unlock();
+ }
+}
public static final native boolean _gtk_tree_view_column_get_resizable(int /*long*/ column);
public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ column) {
lock.lock();
@@ -6884,6 +6884,15 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
lock.unlock();
}
}
+public static final native int _gtk_tree_view_column_get_sizing(int /*long*/ tree_column);
+public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column) {
+ lock.lock();
+ try {
+ return _gtk_tree_view_column_get_sizing(tree_column);
+ } finally {
+ lock.unlock();
+ }
+}
public static final native int _gtk_tree_view_column_get_spacing(int /*long*/ tree_column);
public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_column) {
lock.lock();