From 6c5cc8a07552434655ef8986da674b98d3f3dbf4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 28 Nov 2011 19:15:59 +0000 Subject: [PATCH] Override GetMainWindowOfCompositeControl() in wxGrid subwindows. This is necessary for HasFocus() to work correctly for them since the changes of r69788. Closes #13686. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/private/grid.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h index b1eb3a7adf..39ca13794a 100644 --- a/include/wx/generic/private/grid.h +++ b/include/wx/generic/private/grid.h @@ -301,6 +301,8 @@ public: m_owner = owner; } + virtual wxWindow *GetMainWindowOfCompositeControl() { return m_owner; } + virtual bool AcceptsFocus() const { return false; } wxGrid *GetOwner() { return m_owner; } -- 2.45.2