From 02610d5d4bcc9dffa4e2ad92ae6755b43423a62e Mon Sep 17 00:00:00 2001 From: ali kettab Date: Mon, 20 Nov 2023 13:46:19 +0100 Subject: [PATCH] Remove trivial Init() from wxStatusBar under wxQt --- include/wx/qt/statusbar.h | 5 ++--- src/qt/statusbar.cpp | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h index 55e4547a4e..447dcd7248 100644 --- a/include/wx/qt/statusbar.h +++ b/include/wx/qt/statusbar.h @@ -16,7 +16,7 @@ class QStatusBar; class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase { public: - wxStatusBar(); + wxStatusBar() = default; wxStatusBar(wxWindow *parent, wxWindowID winid = wxID_ANY, long style = wxSTB_DEFAULT_STYLE, const wxString& name = wxASCII_STR(wxStatusBarNameStr)); @@ -37,10 +37,9 @@ protected: virtual void DoUpdateStatusText(int number) override; private: - void Init(); void UpdateFields(); - QStatusBar *m_qtStatusBar; + QStatusBar *m_qtStatusBar = nullptr; wxVector m_qtPanes; wxDECLARE_DYNAMIC_CLASS(wxStatusBar); diff --git a/src/qt/statusbar.cpp b/src/qt/statusbar.cpp index 10b7ecfb29..1c32ede0ad 100644 --- a/src/qt/statusbar.cpp +++ b/src/qt/statusbar.cpp @@ -31,16 +31,10 @@ wxQtStatusBar::wxQtStatusBar( wxWindow *parent, wxStatusBar *handler ) //============================================================================== -wxStatusBar::wxStatusBar() -{ - Init(); -} - wxStatusBar::wxStatusBar(wxWindow *parent, wxWindowID winid, long style, const wxString& name) { - Init(); Create( parent, winid, style, name ); } @@ -94,11 +88,6 @@ void wxStatusBar::DoUpdateStatusText(int number) m_qtPanes[number]->setText( wxQtConvertString( m_panes[number].GetText() ) ); } -void wxStatusBar::Init() -{ - m_qtStatusBar = nullptr; -} - void wxStatusBar::UpdateFields() { // is it a good idea to recreate all the panes every update?