Skip to content

Commit f9508d7

Browse files
committed
[GTK] Remove always false local variable
This is a follow-up to 7460be0 which removed the setting of xFocus = to true but missed deleting variable itself.
1 parent e1fadc0 commit f9508d7

File tree

1 file changed

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

1 file changed

+2
-12
lines changed

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -580,17 +580,7 @@ void bringToTop (boolean force) {
580580
if (focusHandle != 0 && !GTK.gtk_widget_has_focus (focusHandle)) return;
581581
}
582582
}
583-
/*
584-
* Bug in GTK. When a shell that is not managed by the window
585-
* manage is given focus, GTK gets stuck in "focus follows pointer"
586-
* mode when the pointer is within the shell and its parent when
587-
* the shell is hidden or disposed. The fix is to use XSetInputFocus()
588-
* to assign focus when ever the active shell has not managed by
589-
* the window manager.
590-
*
591-
* NOTE: This bug is fixed in GTK+ 2.6.8 and above.
592-
*/
593-
boolean xFocus = false;
583+
594584
if (activeShell != null) {
595585
display.activeShell = null;
596586
display.activePending = true;
@@ -607,7 +597,7 @@ void bringToTop (boolean force) {
607597
} else {
608598
gdkResource = gtk_widget_get_window (shellHandle);
609599
}
610-
if ((xFocus || (style & SWT.ON_TOP) != 0)) {
600+
if ((style & SWT.ON_TOP) != 0) {
611601
if (OS.isX11()) {
612602
long gdkDisplay;
613603
if (GTK.GTK4) {

0 commit comments

Comments
 (0)