Skip to content

Commit 0ae60e3

Browse files
committed
[Gtk] Mark gtk_leave_notify as clearly gtk 3 method
Simplify overrides to not try to handle gtk 4 in it as it can never happen.
1 parent 9b0b255 commit 0ae60e3

4 files changed

Lines changed: 12 additions & 20 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4033,7 +4033,7 @@ void gtk4_leave_event(long controller, long event) {
40334033
}
40344034

40354035
@Override
4036-
long gtk_leave_notify_event (long widget, long event) {
4036+
long gtk3_leave_notify_event (long widget, long event) {
40374037
if (display.currentControl != this) return 0;
40384038
int [] state = new int [1];
40394039
GDK.gdk_event_get_state(event, state);

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,29 +1656,21 @@ long gtk_focus_out_event (long widget, long event) {
16561656
}
16571657

16581658
@Override
1659-
long gtk_leave_notify_event (long widget, long event) {
1659+
long gtk3_leave_notify_event (long widget, long event) {
16601660
if (widget == shellHandle) {
16611661
if (isCustomResize ()) {
16621662
int [] state = new int [1];
1663-
if (GTK.GTK4) {
1664-
state[0] = GDK.gdk_event_get_modifier_state(event);
1665-
} else {
1666-
GDK.gdk_event_get_state(event, state);
1667-
}
1663+
GDK.gdk_event_get_state(event, state);
16681664

16691665
if ((state[0] & GDK.GDK_BUTTON1_MASK) == 0) {
1670-
if (GTK.GTK4) {
1671-
GTK4.gtk_widget_set_cursor (shellHandle, 0);
1672-
} else {
1673-
long window = gtk_widget_get_window (shellHandle);
1674-
GDK.gdk_window_set_cursor (window, 0);
1675-
}
1666+
long window = gtk_widget_get_window (shellHandle);
1667+
GDK.gdk_window_set_cursor (window, 0);
16761668
display.resizeMode = 0;
16771669
}
16781670
}
16791671
return 0;
16801672
}
1681-
return super.gtk_leave_notify_event (widget, event);
1673+
return super.gtk3_leave_notify_event (widget, event);
16821674
}
16831675

16841676
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2025 IBM Corporation and others.
2+
* Copyright (c) 2000, 2026 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
@@ -821,8 +821,8 @@ long gtk_focus_out_event (long widget, long event) {
821821
}
822822

823823
@Override
824-
long gtk_leave_notify_event (long widget, long event) {
825-
parent.gtk_leave_notify_event (widget, event);
824+
long gtk3_leave_notify_event (long widget, long event) {
825+
parent.gtk3_leave_notify_event (widget, event);
826826
if (drawHotImage) {
827827
drawHotImage = false;
828828
if (image != null) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2025 IBM Corporation and others.
2+
* Copyright (c) 2000, 2026 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
@@ -1004,7 +1004,7 @@ long gtk3_key_release_event (long widget, long event) {
10041004
return sendKeyEvent (SWT.KeyUp, event) ? 0 : 1;
10051005
}
10061006

1007-
long gtk_leave_notify_event (long widget, long event) {
1007+
long gtk3_leave_notify_event (long widget, long event) {
10081008
return 0;
10091009
}
10101010

@@ -2646,7 +2646,7 @@ long windowProc (long handle, long arg0, long user_data) {
26462646
case KEY_PRESS_EVENT: return gtk3_key_press_event (handle, arg0);
26472647
case KEY_RELEASE_EVENT: return gtk3_key_release_event (handle, arg0);
26482648
case INPUT: return gtk_input (handle, arg0);
2649-
case LEAVE_NOTIFY_EVENT: return gtk_leave_notify_event (handle, arg0);
2649+
case LEAVE_NOTIFY_EVENT: return gtk3_leave_notify_event (handle, arg0);
26502650
case MAP_EVENT: return gtk_map_event (handle, arg0);
26512651
case MNEMONIC_ACTIVATE: return gtk_mnemonic_activate (handle, arg0);
26522652
case MOTION_NOTIFY_EVENT: return gtk3_motion_notify_event (handle, arg0);

0 commit comments

Comments
 (0)