solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix wxStatusBar crash when calling GetFieldRect early on wxQt.

Browse source
This commit is contained in:
Alex Shvartzkop 2024-01-10 02:26:00 +03:00
parent 966b6e9460
commit 8730858eae
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wx/qt/statusbar.h
View file

@ -37,7 +37,7 @@ protected:
virtual void DoUpdateStatusText(int number) override;
private:
void UpdateFields();
void CreateFieldsIfNeeded();
QStatusBar *m_qtStatusBar = nullptr;
std::vector<QWidget*> m_qtPanes;

8
src/qt/statusbar.cpp
View file

@ -53,7 +53,7 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
SetFieldsCount(1);
// Notice that child controls, if any, will be added using addWidget() in
// UpdateFields() function. So Unbind the base class handler which is not
// CreateFieldsIfNeeded() function. So Unbind the base class handler which is not
// needed here. And more importantely, it won't work properly either.
Unbind(wxEVT_SIZE, &wxStatusBar::OnSize, static_cast<wxStatusBarBase*>(this));
@ -102,6 +102,8 @@ bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const
wxCHECK_MSG( (i >= 0) && ((size_t)i < m_panes.GetCount()), false,
"invalid statusbar field index" );
const_cast<wxStatusBar *>(this)->CreateFieldsIfNeeded();
rect = wxQtConvertRect(m_qtPanes[i]->geometry());
return true;
}
@ -123,7 +125,7 @@ int wxStatusBar::GetBorderY() const
void wxStatusBar::DoUpdateStatusText(int number)
{
UpdateFields();
CreateFieldsIfNeeded();
const auto pane = dynamic_cast<QLabel*>(m_qtPanes[number]);
@ -157,7 +159,7 @@ void wxStatusBar::DoUpdateStatusText(int number)
pane->setText(text);
}
void wxStatusBar::UpdateFields()
void wxStatusBar::CreateFieldsIfNeeded()
{
if ( !m_qtPanes.empty() )
return;