diff options
| author | Alexander Kurtakov | 2018-09-13 06:24:59 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-09-13 06:24:59 +0000 |
| commit | 0c960694b9a77c9811c9b36e2f6c6e590c86646f (patch) | |
| tree | a021f959ce03ed82ac77ba769b9ae95cbe75c011 /bundles/org.eclipse.swt | |
| parent | f25be5b085812ca2605f7ed4b92f7c31fe9170d1 (diff) | |
| download | eclipse.platform.swt-0c960694b9a77c9811c9b36e2f6c6e590c86646f.tar.gz eclipse.platform.swt-0c960694b9a77c9811c9b36e2f6c6e590c86646f.tar.xz eclipse.platform.swt-0c960694b9a77c9811c9b36e2f6c6e590c86646f.zip | |
Bug 530841: [GTK2] Remove GTK 2.x support
Handle GL.
Change-Id: Idfb4f0cf89546aa9c15c8bda6c2df987977236b0
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java | 8 |
1 files changed, 2 insertions, 6 deletions
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 9f1f80a1fb..109b6139c0 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2018 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -138,11 +138,7 @@ public GLCanvas (Composite parent, int style, GLData data) { glWindow = GDK.gdk_window_new (window, attrs, GDK.GDK_WA_VISUAL); GDK.gdk_window_set_user_data (glWindow, handle); if ((style & SWT.NO_BACKGROUND) != 0) GDK.gdk_window_set_back_pixmap (window, 0, false); - if (GTK.GTK3) { - xWindow = GDK.gdk_x11_window_get_xid (glWindow); - } else { - xWindow = GDK.gdk_x11_drawable_get_xid (glWindow); - } + xWindow = GDK.gdk_x11_window_get_xid (glWindow); GDK.gdk_window_show (glWindow); Listener listener = event -> { |