From b4dee76b4c74a2db13677e9a7447e09349e956b0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 18 Oct 2019 03:57:22 +0200
Subject: [PATCH] Set focus to the main grid window in wxGrid::SetFocus()

After changing wxGrid to not inherit from wxPanel, this needs to be done
explicitly now.
---
 include/wx/generic/grid.h | 1 +
 src/generic/grid.cpp      | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 6ab7d5299e..90c4869f7d 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1948,6 +1948,7 @@ public:
 
     // override some base class functions
     virtual void Fit() wxOVERRIDE;
+    virtual void SetFocus() wxOVERRIDE;
 
     // implementation only
     void CancelMouseCapture();
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 1841bf34bb..9643698bb8 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -9659,6 +9659,11 @@ void wxGrid::Fit()
     AutoSize();
 }
 
+void wxGrid::SetFocus()
+{
+    m_gridWin->SetFocus();
+}
+
 #if WXWIN_COMPATIBILITY_2_8
 wxPen& wxGrid::GetDividerPen() const
 {