From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 2 Jul 2005 11:22:24 +0000 (+0000)
Subject: only set focus to the grid window in wxGrid::HideCellEditControl() if it hadn't been... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2fb3e528a32c0175e8c61217f0821cc04295373a?ds=inline

only set focus to the grid window in wxGrid::HideCellEditControl() if it hadn't been switched to another window of our application


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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a04ed8c350..874499b1e2 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -7863,7 +7863,13 @@ void wxGrid::HideCellEditControl()
         editor->Show( false );
         editor->DecRef();
         attr->DecRef();
-        m_gridWin->SetFocus();
+
+        // if the focus moved completely outside this application, set it to
+        // ourselves so that it's not "lost" when the user switches back to
+        // this app
+        if ( !FindFocus() )
+            m_gridWin->SetFocus();
+
         // refresh whole row to the right
         wxRect rect( CellToRect(row, col) );
         CalcScrolledPosition(rect.x, rect.y, &rect.x, &rect.y );