fix: undo some changes in fix for 2024, for mingw/windows builds

Author: jochumdev

vendor/fltk2/src/run.cxx

@@ -88,6 +88,26 @@ bool      fltk::grab_,
 	  fltk::exit_modal_;
 
 
+static Window *xfocus;	// which window X thinks has focus
+static Window *xmousewin; // which window X thinks has ENTER
+// Update focus() in response to anything that might change it.
+// This is called whenever a window is added or hidden, and whenever
+// X says the focus window has changed.
+static void fix_focus() {
+  Widget* w = xfocus;
+  // Modal overrides whatever the system says the focus is:
+  if (grab_ || w && modal_) w = modal_;
+  if (w) {
+    if (w->contains(focus())) return; // already has it
+    unsigned saved = e_keysym;
+    e_keysym = 0; // make widgets not think a keystroke moved focus
+    if (w->take_focus()) {e_keysym = saved; return;}
+    e_keysym = saved;
+  }
+  // give nothing the focus:
+  focus(0);
+}
+
 extern "C" {
 // This function is here because Window::label() uses it:
 // Make sure fltk/string.h is included above. Without it it appears

vendor/fltk2/src/x11/run.cxx

@@ -66,27 +66,6 @@
 using namespace fltk;
 
 
-static Window *xfocus;	// which window X thinks has focus
-static Window *xmousewin; // which window X thinks has ENTER
-
-// Update focus() in response to anything that might change it.
-// This is called whenever a window is added or hidden, and whenever
-// X says the focus window has changed.
-static void fix_focus() {
-  Widget* w = xfocus;
-  // Modal overrides whatever the system says the focus is:
-  if (grab_ || w && modal_) w = modal_;
-  if (w) {
-    if (w->contains(focus())) return; // already has it
-    unsigned saved = e_keysym;
-    e_keysym = 0; // make widgets not think a keystroke moved focus
-    if (w->take_focus()) {e_keysym = saved; return;}
-    e_keysym = saved;
-  }
-  // give nothing the focus:
-  focus(0);
-}
-
 ////////////////////////////////////////////////////////////////
 // interface to poll/select call: