Put check at the right place (#545)

Only OnActivate needs to be checked for focus, not all events that lead to ReFocus being called.
aardappel · Oct 15, 2023 · 702f242 · 702f242
1 parent 35c49a8
commit 702f242
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/myframe.h b/src/myframe.h
@@ -1084,12 +1084,7 @@ struct MyFrame : wxFrame {
     }
 
     void ReFocus() {
-        #ifdef __WXGTK__
-        if (wxWindow::HasFocus())
-        #endif
-        {
-            if (GetCurTab()) GetCurTab()->SetFocus();
-        }
+        if (GetCurTab()) GetCurTab()->SetFocus();
     }
 
     void OnChangeColor(wxCommandEvent &ce) {
@@ -1110,6 +1105,9 @@ struct MyFrame : wxFrame {
     void OnActivate(wxActivateEvent &ae) {
         // This causes warnings in the debug log, but without it keyboard entry upon window select
         // doesn't work.
+        #ifdef __WXGTK__
+        if (HasFocus())
+        #endif
         ReFocus();
     }