diff options
Diffstat (limited to 'bundles/org.eclipse.swt')
5 files changed, 7 insertions, 15 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 3e4b22eae1..58bc74c9fb 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 @@ -3508,8 +3508,7 @@ class AccessibleObject { } static void windowPoint (AccessibleObject object, int [] x, int [] y) { - long /*int*/ widget; - widget = OS.gtk_accessible_get_widget(object.handle); + long /*int*/ widget = OS.gtk_accessible_get_widget(object.handle); while (widget == 0 && object.parent != null) { object = object.parent; if (OS.GTK_VERSION >= OS.VERSION(2, 22, 0)) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java index a4947980f0..3d25263f67 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java @@ -77,8 +77,7 @@ public void javaToNative (Object object, TransferData transferData) { int[] format = new int[1]; long /*int*/[] ctext = new long /*int*/[1]; int[] length = new int[1]; - boolean result; - result = OS.gdk_x11_display_utf8_to_compound_text (OS.gdk_display_get_default(), utf8, encoding, format, ctext, length); + boolean result = OS.gdk_x11_display_utf8_to_compound_text (OS.gdk_display_get_default(), utf8, encoding, format, ctext, length); if (!result) return; transferData.type = encoding[0]; transferData.format = format[0]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java index 7f3fc16aae..f56e6c9491 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java @@ -107,8 +107,7 @@ public GLCanvas (Composite parent, int style, GLData data) { OS.gtk_widget_realize (handle); long /*int*/ window = OS.gtk_widget_get_window (handle); - long /*int*/ xDisplay; - xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window)); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window)); long /*int*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib); if (infoPtr == 0) { dispose (); @@ -277,8 +276,6 @@ public void swapBuffers () { } private long /*int*/ gdk_x11_display_get_xdisplay(long /*int*/ window) { - long /*int*/ xdisplay; - xdisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window)); - return xdisplay; + return OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window)); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index e37d4314e1..04792c2806 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -829,8 +829,7 @@ long /*int*/ checkIfEventProc (long /*int*/ display, long /*int*/ xEvent, long / default: return 0; } - long /*int*/ window = 0; - window = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), OS.X_EVENT_WINDOW (xEvent)); + long /*int*/ window = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), OS.X_EVENT_WINDOW (xEvent)); if (window == 0) return 0; if (flushWindow != 0) { if (flushAll) { @@ -1539,8 +1538,7 @@ public Control getCursorControl () { } if ((xWindow = buffer [0]) != 0) { xParent = xWindow; - long /*int*/ gdkWindow = 0; - gdkWindow = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), xWindow); + long /*int*/ gdkWindow = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), xWindow); if (gdkWindow != 0) { OS.gdk_window_get_user_data (gdkWindow, user_data); if (user_data[0] != 0) handle = user_data[0]; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java index 2a5af3f57d..014bf9ac39 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java @@ -573,8 +573,7 @@ void bringToTop (boolean force) { long /*int*/ window = gtk_widget_get_window (shellHandle); if ((xFocus || (style & SWT.ON_TOP) != 0)) { if (OS.isX11()) { - long /*int*/ xDisplay; - xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window)); + long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window)); long /*int*/ xWindow; if (OS.GTK3) { xWindow = OS.gdk_x11_window_get_xid (window); |