From 4b0d74e04d2a002f913d2610d8aa161e05aecc62 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sun, 20 Jan 2019 18:32:48 +0100 Subject: [PATCH] Create wxPGHeaderCtrl in one step Code simplification - 2-step creation is useless here. --- src/propgrid/manager.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp index d32c6f42d8..fa5b37792a 100644 --- a/src/propgrid/manager.cpp +++ b/src/propgrid/manager.cpp @@ -229,8 +229,9 @@ void wxPropertyGridPage::DoSetSplitterPosition( int pos, class wxPGHeaderCtrl : public wxHeaderCtrl { public: - wxPGHeaderCtrl(wxPropertyGridManager* manager) : - wxHeaderCtrl() + wxPGHeaderCtrl(wxPropertyGridManager* manager, wxWindowID id, const wxPoint& pos, + const wxSize& size, long style) : + wxHeaderCtrl(manager, id, pos, size, style) { m_manager = manager; EnsureColumnCount(2); @@ -1637,12 +1638,9 @@ void wxPropertyGridManager::RecreateControls() #if wxUSE_HEADERCTRL if ( m_showHeader ) { - if ( !m_pHeaderCtrl ) { - wxPGHeaderCtrl* hc = new wxPGHeaderCtrl(this); - hc->Create(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0); - m_pHeaderCtrl = hc; + m_pHeaderCtrl = new wxPGHeaderCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0); } else {