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

Remove trivial Init() from wxStatusBar under wxQt

Browse source
This commit is contained in:
ali kettab 2023-11-20 13:46:19 +01:00
parent d3bdf486b3
commit 02610d5d4b
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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<QLabel*> m_qtPanes;
wxDECLARE_DYNAMIC_CLASS(wxStatusBar);

11
src/qt/statusbar.cpp
View file

@ -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?