Attachment 855 Details for Bug 1429 – Diff to patch SWTAccessor

[patch] Diff to patch SWTAccessor

a85012696606080a474185fffc380e736a37eeaa.patch (text/plain), 3.02 KB, created by Peter Chang on 2022-06-22 13:04:34 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Chang

Created: 2022-06-22 13:04:34 CEST

Size: 3.02 KB

patch

obsolete

>From a85012696606080a474185fffc380e736a37eeaa Mon Sep 17 00:00:00 2001
>From: Peter Chang <peter.chang@diamond.ac.uk>
>Date: Thu, 14 Apr 2022 13:18:48 +0100
>Subject: [PATCH] Add new class location of SWT's gtk_widget_get_window
>
>In SWT version 4.20, some gtk methods moved to a new gtk3 subpackage so add
>check and find it in there. Note, this new package was not exported until
>SWT 4.23 (aka 3.119.0 or v4950) so intervening versions will not work when
>using OSGi class loading.
>---
> .../com/jogamp/nativewindow/swt/SWTAccessor.java       | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/swt/SWTAccessor.java b/src/nativewindow/classes/com/jogamp/nativewindow/swt/SWTAccessor.java
>index 7f4a94c5b3..05fc1aa8af 100644
>--- a/src/nativewindow/classes/com/jogamp/nativewindow/swt/SWTAccessor.java
>+++ b/src/nativewindow/classes/com/jogamp/nativewindow/swt/SWTAccessor.java
>@@ -95,6 +95,7 @@ public class SWTAccessor {
> 
>     private static final String str_OS_gtk_class = "org.eclipse.swt.internal.gtk.OS";    // used by earlier versions of SWT
>     private static final String str_GTK_gtk_class = "org.eclipse.swt.internal.gtk.GTK";  // used by later versions of SWT
>+    private static final String str_GTK3_gtk_class = "org.eclipse.swt.internal.gtk3.GTK3";  // used by later versions of SWT (4.21+)
>     private static final String str_GDK_gtk_class = "org.eclipse.swt.internal.gtk.GDK";  // used by later versions of SWT
>     public static final Class<?> OS_gtk_class;
>     private static final String str_OS_gtk_version = "GTK_VERSION";
>@@ -124,6 +125,8 @@ public class SWTAccessor {
>     private static final String str_gdk_window_set_back_pixmap = "gdk_window_set_back_pixmap";
>     private static final String str_gdk_window_set_background_pattern = "gdk_window_set_background_pattern";
> 
>+    private static final int SWT_VERSION_4_20 = 4944;
>+
>     private static final VersionNumber GTK_VERSION_2_14_0 = new VersionNumber(2, 14, 0);
>     private static final VersionNumber GTK_VERSION_2_24_0 = new VersionNumber(2, 24, 0);
>     private static final VersionNumber GTK_VERSION_2_90_0 = new VersionNumber(2, 90, 0);
>@@ -261,7 +264,12 @@ public Object run() {
>                 _gtk_version = GTK_VERSION(field_OS_gtk_version.getInt(null));
>                 m1 = cGTK.getDeclaredMethod(str_gtk_widget_realize, handleType);
>                 if (_gtk_version.compareTo(GTK_VERSION_2_14_0) >= 0) {
>-                    m4 = cGTK.getDeclaredMethod(str_gtk_widget_get_window, handleType);
>+                    if (SWT.getVersion() < SWT_VERSION_4_20) {
>+                        m4 = cGTK.getDeclaredMethod(str_gtk_widget_get_window, handleType);
>+                    } else {
>+                        Class<?> cGTK3 = ReflectionUtil.getClass(str_GTK3_gtk_class, false, cl);
>+                        m4 = cGTK3.getDeclaredMethod(str_gtk_widget_get_window, handleType);
>+                    }
>                 } else {
>                     m3 = cGTK.getDeclaredMethod(str_GTK_WIDGET_WINDOW, handleType);
>                 }

Actions: View | Diff

Attachments on bug 1429: 855