Skip to content

Commit 69e6d9c

Browse files
committed
[GTK4] Don't print version warning
All GTK 4.x versions are supposed to be supported (for now) and printing a warning that version is too new when comparing with gtk 3.22.0.
1 parent 940240a commit 69e6d9c

File tree

1 file changed

+12
-10
lines changed
  • bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets

1 file changed

+12
-10
lines changed

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2022 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -1208,15 +1208,17 @@ void createDisplay (DeviceData data) {
12081208
System.setProperty("org.eclipse.swt.internal.gdk.backend", "x11");
12091209
}
12101210
if (OS.SWT_DEBUG) Device.DEBUG = true;
1211-
long ptr = GTK.gtk_check_version (GTK3_MAJOR, GTK3_MINOR, GTK3_MICRO);
1212-
if (ptr != 0) {
1213-
int length = C.strlen (ptr);
1214-
byte [] buffer = new byte [length];
1215-
C.memmove (buffer, ptr, length);
1216-
System.out.println ("***WARNING: " + new String (Converter.mbcsToWcs (buffer))); //$NON-NLS-1$
1217-
System.out.println ("***WARNING: SWT requires GTK " + GTK3_MAJOR+ "." + GTK3_MINOR + "." + GTK3_MICRO); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
1218-
int major = GTK.gtk_get_major_version(), minor = GTK.gtk_get_minor_version (), micro = GTK.gtk_get_micro_version ();
1219-
System.out.println ("***WARNING: Detected: " + major + "." + minor + "." + micro); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
1211+
if (!GTK.GTK4) {
1212+
long ptr = GTK.gtk_check_version (GTK3_MAJOR, GTK3_MINOR, GTK3_MICRO);
1213+
if (ptr != 0) {
1214+
int length = C.strlen (ptr);
1215+
byte [] buffer = new byte [length];
1216+
C.memmove (buffer, ptr, length);
1217+
System.out.println ("***WARNING: " + new String (Converter.mbcsToWcs (buffer))); //$NON-NLS-1$
1218+
System.out.println ("***WARNING: SWT requires GTK " + GTK3_MAJOR+ "." + GTK3_MINOR + "." + GTK3_MICRO); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
1219+
int major = GTK.gtk_get_major_version(), minor = GTK.gtk_get_minor_version (), micro = GTK.gtk_get_micro_version ();
1220+
System.out.println ("***WARNING: Detected: " + major + "." + minor + "." + micro); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
1221+
}
12201222
}
12211223
fixed_type = OS.swt_fixed_get_type();
12221224
if (rendererClassInitProc == 0) {

0 commit comments

Comments
 (0)