From 38247f596c1e1d1214091e301f773a0eb425ba37 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 18 Oct 2019 03:45:31 +0200 Subject: [PATCH] Remove wrong wxGrid::GetMainWindowOfCompositeControl() override This method is supposed to be overridden in the sub-windows of a composite control (and is indeed correctly implemented in wxGridSubwindow), but it doesn't make any sense to implement it in the parent window itself. This method was probably never executed (which is how the problem went unnoticed for 10+ years since 760be3f7cb386924420a87045af761bbc964f041), but it's still wrong to define it here, so remove it. --- include/wx/generic/grid.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index f0f2ef0938..6ab7d5299e 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -1947,8 +1947,6 @@ public: // override some base class functions - virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE - { return (wxWindow*)m_gridWin; } virtual void Fit() wxOVERRIDE; // implementation only