summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-06-21 16:30:21 (EDT)
committer Silenio Quarti2012-06-21 17:28:30 (EDT)
commitdf3f5ee3d0ecc83dcfdfb65375cb94862cd8fe45 (patch)
tree18c07182f6f16aef231933bcd4985b7e4ef5ce14
parent486cb9d274cada4c313732fb1f41ca4e0cc984ca (diff)
downloadeclipse.platform.swt-df3f5ee3d0ecc83dcfdfb65375cb94862cd8fe45.zip
eclipse.platform.swt-df3f5ee3d0ecc83dcfdfb65375cb94862cd8fe45.tar.gz
eclipse.platform.swt-df3f5ee3d0ecc83dcfdfb65375cb94862cd8fe45.tar.bz2
Remove gtk_toolbar_insert_widget.
The function is deprecated, removed in GTK 3 and no longer used in SWT codebase.
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c17
-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.java16
4 files changed, 2 insertions, 37 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 321026e..e02fb86 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
@@ -14701,23 +14701,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1insert)
}
#endif
-#ifndef NO__1gtk_1toolbar_1insert_1widget
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1insert_1widget)
- (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
-{
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1insert_1widget_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
- gtk_toolbar_insert_widget((GtkToolbar *)arg0, (GtkWidget *)arg1, (const char *)lparg2, (const char *)lparg3, (gint)arg4);
-fail:
- if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1insert_1widget_FUNC);
-}
-#endif
-
#ifndef NO__1gtk_1toolbar_1new
JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
(JNIEnv *env, jclass that)
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 ca0a055..ce88501 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 = 1406;
-int OS_nativeFunctionCallCount[1406];
+int OS_nativeFunctionCount = 1405;
+int OS_nativeFunctionCallCount[1405];
char * OS_nativeFunctionNames[] = {
#ifndef JNI64
"Call__IIII",
@@ -1125,7 +1125,6 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1tool_1item_1set_1is_1important",
"_1gtk_1tool_1item_1set_1proxy_1menu_1item",
"_1gtk_1toolbar_1insert",
- "_1gtk_1toolbar_1insert_1widget",
"_1gtk_1toolbar_1new",
"_1gtk_1toolbar_1set_1orientation",
"_1gtk_1toolbar_1set_1show_1arrow",
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 e5b773c..4348ecd 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
@@ -1133,7 +1133,6 @@ typedef enum {
_1gtk_1tool_1item_1set_1is_1important_FUNC,
_1gtk_1tool_1item_1set_1proxy_1menu_1item_FUNC,
_1gtk_1toolbar_1insert_FUNC,
- _1gtk_1toolbar_1insert_1widget_FUNC,
_1gtk_1toolbar_1new_FUNC,
_1gtk_1toolbar_1set_1orientation_FUNC,
_1gtk_1toolbar_1set_1show_1arrow_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 99353aa..4f56e73 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
@@ -11370,22 +11370,6 @@ public static final void gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ i
lock.unlock();
}
}
-/**
- * @param toolbar cast=(GtkToolbar *)
- * @param widget cast=(GtkWidget *)
- * @param tooltip_text cast=(const char *)
- * @param tooltip_private_text cast=(const char *)
- * @param position cast=(gint)
- */
-public static final native void _gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position);
-public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position) {
- lock.lock();
- try {
- _gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position);
- } finally {
- lock.unlock();
- }
-}
public static final native int /*long*/ _gtk_toolbar_new();
public static final int /*long*/ gtk_toolbar_new() {
lock.lock();