From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 22 Oct 2007 11:35:19 +0000 (+0000)
Subject: calling SetFocus() in OnMouseUp() is unnecessary if we skip the event in OnMouseDown()
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bc0e68ebafe96f9ebbe9a37296c9fae785a5d045

calling SetFocus() in OnMouseUp() is unnecessary if we skip the event in OnMouseDown()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 8ac31d319f..c437f70709 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -1136,9 +1136,10 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
             CaptureMouse();
         }
     }
-#else
-    wxUnusedVar(event);
 #endif // wxUSE_CLIPBOARD
+
+    // in any case, let the default handler set focus to this window
+    event.Skip();
 }
 
 void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
@@ -1163,8 +1164,6 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event)
     }
 #endif // wxUSE_CLIPBOARD
 
-    SetFocus();
-
     wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
     wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event);
 }