Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-03-15 10:48:42 +0000
committerAlexander Kurtakov2018-03-15 11:24:06 +0000
commit7e12552c9a07769ee3a3b13ed09fd8efefc7b9f9 (patch)
tree23ad8f14053b31d8f3035589b0a27c1d8ecdbbe3 /bundles/org.eclipse.swt/Eclipse SWT PI/gtk
parentade68b5881c75e9ada29a2c6f0d946f2802551ec (diff)
downloadeclipse.platform.swt-7e12552c9a07769ee3a3b13ed09fd8efefc7b9f9.tar.gz
eclipse.platform.swt-7e12552c9a07769ee3a3b13ed09fd8efefc7b9f9.tar.xz
eclipse.platform.swt-7e12552c9a07769ee3a3b13ed09fd8efefc7b9f9.zip
Bug 532483 - Remove XFlush usage
gdk_flush under x11 just calls XFlush so there is no need for calling gdk_flush on non x11 and XFlush on x11. Change-Id: I8939328f053e9fd45e10c0b310ff48d6da78ef32 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c1
-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.java10
5 files changed, 0 insertions, 23 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 91418ba426..be7f14f720 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
@@ -15417,16 +15417,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen)
}
#endif
-#ifndef NO__1XFlush
-JNIEXPORT void JNICALL OS_NATIVE(_1XFlush)
- (JNIEnv *env, jclass that, jintLong arg0)
-{
- OS_NATIVE_ENTER(env, that, _1XFlush_FUNC);
- XFlush((Display *)arg0);
- OS_NATIVE_EXIT(env, that, _1XFlush_FUNC);
-}
-#endif
-
#ifndef NO__1XFree
JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
(JNIEnv *env, jclass that, jintLong arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index 7664c1ccc5..a779a44076 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -119,7 +119,6 @@
#define NO__1XCheckIfEvent
#define NO__1XDefaultScreen
#define NO__1XDefaultRootWindow
-#define NO__1XFlush
#define NO__1XFree
#define NO__1XGetWindowProperty
#define NO__1XQueryPointer
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 af6c5895eb..4307c3ffc3 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
@@ -1268,7 +1268,6 @@ char * OS_nativeFunctionNames[] = {
"_1XCheckIfEvent",
"_1XDefaultRootWindow",
"_1XDefaultScreen",
- "_1XFlush",
"_1XFree",
"_1XKeysymToKeycode",
"_1XQueryPointer",
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 6307240031..acb4dbf71f 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
@@ -1254,7 +1254,6 @@ typedef enum {
_1XCheckIfEvent_FUNC,
_1XDefaultRootWindow_FUNC,
_1XDefaultScreen_FUNC,
- _1XFlush_FUNC,
_1XFree_FUNC,
_1XKeysymToKeycode_FUNC,
_1XQueryPointer_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 97fcc1a0a6..dcb4daf37d 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
@@ -880,16 +880,6 @@ public static final long /*int*/ XDefaultRootWindow(long /*int*/ display) {
lock.unlock();
}
}
-/** @param display cast=(Display *) */
-public static final native void _XFlush(long /*int*/ display);
-public static final void XFlush(long /*int*/ display) {
- lock.lock();
- try {
- _XFlush(display);
- } finally {
- lock.unlock();
- }
-}
/** @param address cast=(void *) */
public static final native void _XFree(long /*int*/ address);
public static final void XFree(long /*int*/ address) {

Back to the top