Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Ufimtsev2018-02-01 20:22:05 +0000
committerAlexander Kurtakov2018-02-02 10:25:45 +0000
commitb9b818f3a8a00e500f1a4a7bd628dd845e22c986 (patch)
treec4745cb89520a4b5f9d8819a35e531ff231c6694 /bundles/org.eclipse.swt/Eclipse SWT Accessibility
parent2b0fa3968f21dad792be1d5a40217a1c40070c3c (diff)
downloadeclipse.platform.swt-b9b818f3a8a00e500f1a4a7bd628dd845e22c986.tar.gz
eclipse.platform.swt-b9b818f3a8a00e500f1a4a7bd628dd845e22c986.tar.xz
eclipse.platform.swt-b9b818f3a8a00e500f1a4a7bd628dd845e22c986.zip
Bug 529151 [Gtk] Move gtk/gdk function from OS.java to GTk.java and
GDK.java 1) a) Moved gdk functions from OS.java to a new GDK.java. This removes the need to have manual entries in os_custom.h for dynamic functions. (I took care to add copyright header to GDK.java :-). b) Added custom macro to os.h to link GDK_LOAD_FUNCTION to LIB_GDK c) Removed manual links from os_custom.h, as they're now auto-generated. 2) a) In OS.java, I moved custom functions close to each other and labeled with with '@category custom', to make it easier to tell them apart. For some functions, it's hard to tell if they're custom or native, e.g 'g_utf16_strlen' is actually a custom function in os_custom.c. Also added documentation on the two types of custom functions and how to add a custom function. New SWT developers often struggle to figure this out. b) I left 2 custom macros and a custom gdk fuction in OS.java. (e.g gdk_keymap_translate_keyboard_state). This is because it belongs more to 'OS.java custom' with link to os_custom.h type functions. Testing: - JUnits Gtk2.24 & Gtk3.22 - Child eclipse on wayland backend, on Gtk2.24/Gtk3.22 * (X11) * (Wayland). - Child eclipse on X11 desktop backend, on gtk3.22/gtk2.24 and x11 eclipse. Afaik good to merge. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=529151 Change-Id: I4becc174df8d2dc3375828b4c8e2e3cdcf5c3c3a Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Accessibility')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index 50e7ad087f..5e7ce5ff99 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -4661,7 +4661,7 @@ class AccessibleObject {
if (widget == 0) return;
long /*int*/ topLevel = GTK.gtk_widget_get_toplevel (widget);
long /*int*/ window = GTK.gtk_widget_get_window (topLevel);
- OS.gdk_window_get_origin (window, x, y);
+ GDK.gdk_window_get_origin (window, x, y);
}
static int nextIndexOfChar (String string, String searchChars, int startIndex) {

Back to the top