From c713bee7ea726a46a19f6d6c7676f19f0157bcb6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 9 Jul 2018 17:54:09 +0200 Subject: [PATCH] Remove unnecessary wxSearchCtrl::DoMoveWindow() override There is no need to override this virtual function, if the control size changes, a wxEVT_SIZE event is generated in any case, resulting in a call to LayoutControls() without explicitly calling it from here. --- include/wx/generic/srchctlg.h | 1 - src/generic/srchctlg.cpp | 7 ------- 2 files changed, 8 deletions(-) diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h index 996f4e8560..79151ea5af 100644 --- a/include/wx/generic/srchctlg.h +++ b/include/wx/generic/srchctlg.h @@ -194,7 +194,6 @@ protected: // override the base class virtuals involved into geometry calculations virtual wxSize DoGetBestClientSize() const wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE; virtual void RecalcBitmaps(); diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp index 455dd1efa6..15a99c0927 100644 --- a/src/generic/srchctlg.cpp +++ b/src/generic/srchctlg.cpp @@ -468,13 +468,6 @@ wxSize wxSearchCtrl::DoGetBestClientSize() const height); } -void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height) -{ - wxSearchCtrlBase::DoMoveWindow(x, y, width, height); - - LayoutControls(); -} - void wxSearchCtrl::LayoutControls() { if ( !m_text )