Skip to content

[Gtk] Mark gtk_leave_notify as clearly gtk 3 method #3234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akurtakov merged 1 commit into from
Apr 14, 2026
Merged

[Gtk] Mark gtk_leave_notify as clearly gtk 3 method #3234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4033,7 +4033,7 @@ void gtk4_leave_event(long controller, long event) {
}

@Override
long gtk_leave_notify_event (long widget, long event) {
long gtk3_leave_notify_event (long widget, long event) {
if (display.currentControl != this) return 0;
int [] state = new int [1];
GDK.gdk_event_get_state(event, state);
Expand Down
18 changes: 5 additions & 13 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,29 +1656,21 @@ long gtk_focus_out_event (long widget, long event) {
}

@Override
long gtk_leave_notify_event (long widget, long event) {
long gtk3_leave_notify_event (long widget, long event) {
if (widget == shellHandle) {
if (isCustomResize ()) {
int [] state = new int [1];
if (GTK.GTK4) {
state[0] = GDK.gdk_event_get_modifier_state(event);
} else {
GDK.gdk_event_get_state(event, state);
}
GDK.gdk_event_get_state(event, state);

if ((state[0] & GDK.GDK_BUTTON1_MASK) == 0) {
if (GTK.GTK4) {
GTK4.gtk_widget_set_cursor (shellHandle, 0);
} else {
long window = gtk_widget_get_window (shellHandle);
GDK.gdk_window_set_cursor (window, 0);
}
long window = gtk_widget_get_window (shellHandle);
GDK.gdk_window_set_cursor (window, 0);
display.resizeMode = 0;
}
}
return 0;
}
return super.gtk_leave_notify_event (widget, event);
return super.gtk3_leave_notify_event (widget, event);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2025 IBM Corporation and others.
* Copyright (c) 2000, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -821,8 +821,8 @@ long gtk_focus_out_event (long widget, long event) {
}

@Override
long gtk_leave_notify_event (long widget, long event) {
parent.gtk_leave_notify_event (widget, event);
long gtk3_leave_notify_event (long widget, long event) {
parent.gtk3_leave_notify_event (widget, event);
if (drawHotImage) {
drawHotImage = false;
if (image != null) {
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2025 IBM Corporation and others.
* Copyright (c) 2000, 2026 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -1004,7 +1004,7 @@ long gtk3_key_release_event (long widget, long event) {
return sendKeyEvent (SWT.KeyUp, event) ? 0 : 1;
}

long gtk_leave_notify_event (long widget, long event) {
long gtk3_leave_notify_event (long widget, long event) {
return 0;
}

Expand Down Expand Up @@ -2646,7 +2646,7 @@ long windowProc (long handle, long arg0, long user_data) {
case KEY_PRESS_EVENT: return gtk3_key_press_event (handle, arg0);
case KEY_RELEASE_EVENT: return gtk3_key_release_event (handle, arg0);
case INPUT: return gtk_input (handle, arg0);
case LEAVE_NOTIFY_EVENT: return gtk_leave_notify_event (handle, arg0);
case LEAVE_NOTIFY_EVENT: return gtk3_leave_notify_event (handle, arg0);
case MAP_EVENT: return gtk_map_event (handle, arg0);
case MNEMONIC_ACTIVATE: return gtk_mnemonic_activate (handle, arg0);
case MOTION_NOTIFY_EVENT: return gtk3_motion_notify_event (handle, arg0);
Expand Down
Loading