From d3bdf486b31bd06e7bb2d10d7776d3a37ee4b1ac Mon Sep 17 00:00:00 2001 From: ali kettab Date: Mon, 20 Nov 2023 13:34:25 +0100 Subject: [PATCH] Don't override Refresh() in wxStatusBar under wxQt This is not necessary and, more importantly, results in a crash if you try to recreate the status bar (which can be seen in the statbar example) Also remove leftover QList declaration --- include/wx/qt/statusbar.h | 4 ---- src/qt/statusbar.cpp | 8 -------- 2 files changed, 12 deletions(-) diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h index 38a4eba722..55e4547a4e 100644 --- a/include/wx/qt/statusbar.h +++ b/include/wx/qt/statusbar.h @@ -13,8 +13,6 @@ class QLabel; class QStatusBar; -template < class T > class QList; - class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase { public: @@ -31,8 +29,6 @@ public: virtual void SetMinHeight(int height) override; virtual int GetBorderX() const override; virtual int GetBorderY() const override; - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = nullptr ) override; QStatusBar *GetQStatusBar() const { return m_qtStatusBar; } QWidget *GetHandle() const override; diff --git a/src/qt/statusbar.cpp b/src/qt/statusbar.cpp index c87f3fbd2f..10b7ecfb29 100644 --- a/src/qt/statusbar.cpp +++ b/src/qt/statusbar.cpp @@ -94,14 +94,6 @@ void wxStatusBar::DoUpdateStatusText(int number) m_qtPanes[number]->setText( wxQtConvertString( m_panes[number].GetText() ) ); } -// Called each time number/size of panes changes -void wxStatusBar::Refresh( bool eraseBackground, const wxRect *rect ) -{ - UpdateFields(); - - wxWindow::Refresh( eraseBackground, rect ); -} - void wxStatusBar::Init() { m_qtStatusBar = nullptr;