Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change member variable type

Browse Source
This commit is contained in:
Cătălin Răceanu
2019-02-27 16:58:35 +02:00
parent c00187eaeb
commit 113822d024
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/qt/statusbar.h
View File

@@ -10,8 +10,6 @@
#include "wx/statusbr.h" #include "wx/statusbr.h"
#include <QtCore/QScopedPointer>
class QLabel; class QLabel;
class QStatusBar; class QStatusBar;
@@ -47,7 +45,7 @@ private:
void UpdateFields(); void UpdateFields();
QStatusBar *m_qtStatusBar; QStatusBar *m_qtStatusBar;
QScopedPointer< QList<QLabel*> > m_qtPanes; // should this really be a pointer? wxVector<QLabel*> m_qtPanes;
wxDECLARE_DYNAMIC_CLASS(wxStatusBar); wxDECLARE_DYNAMIC_CLASS(wxStatusBar);
}; };

17
src/qt/statusbar.cpp
View File

@@ -48,7 +48,6 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID WXUNUSED(winid),
long style, const wxString& WXUNUSED(name)) long style, const wxString& WXUNUSED(name))
{ {
m_qtStatusBar = new wxQtStatusBar( parent, this ); m_qtStatusBar = new wxQtStatusBar( parent, this );
m_qtPanes.reset(new QList<QLabel*>());
if ( style & wxSTB_SIZEGRIP ) if ( style & wxSTB_SIZEGRIP )
m_qtStatusBar->setSizeGripEnabled(true); m_qtStatusBar->setSizeGripEnabled(true);
@@ -65,10 +64,10 @@ bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const
wxCHECK_MSG( (i >= 0) && ((size_t)i < m_panes.GetCount()), false, wxCHECK_MSG( (i >= 0) && ((size_t)i < m_panes.GetCount()), false,
"invalid statusbar field index" ); "invalid statusbar field index" );
if ( static_cast<size_t>(m_qtPanes->count()) != m_panes.GetCount() ) if ( m_qtPanes.size() != m_panes.GetCount() )
const_cast<wxStatusBar*>(this)->UpdateFields(); const_cast<wxStatusBar*>(this)->UpdateFields();
rect = wxQtConvertRect((*m_qtPanes)[i]->geometry()); rect = wxQtConvertRect(m_qtPanes[i]->geometry());
return true; return true;
} }
@@ -89,10 +88,10 @@ int wxStatusBar::GetBorderY() const
void wxStatusBar::DoUpdateStatusText(int number) void wxStatusBar::DoUpdateStatusText(int number)
{ {
if ( static_cast<size_t>(m_qtPanes->count()) != m_panes.GetCount() ) if ( m_qtPanes.size() != m_panes.GetCount() )
UpdateFields(); UpdateFields();
(*m_qtPanes)[number]->setText( wxQtConvertString( m_panes[number].GetText() ) ); m_qtPanes[number]->setText( wxQtConvertString( m_panes[number].GetText() ) );
} }
// Called each time number/size of panes changes // Called each time number/size of panes changes
@@ -112,11 +111,13 @@ void wxStatusBar::UpdateFields()
{ {
// is it a good idea to recreate all the panes every update? // is it a good idea to recreate all the panes every update?
while ( !m_qtPanes->isEmpty() ) for ( wxVector<QLabel*>::const_iterator it = m_qtPanes.begin();
it != m_qtPanes.end(); ++it )
{ {
//Remove all panes //Remove all panes
delete m_qtPanes->takeLast(); delete *it;
} }
m_qtPanes.clear();
for (size_t i = 0; i < m_panes.GetCount(); i++) for (size_t i = 0; i < m_panes.GetCount(); i++)
{ {
@@ -124,7 +125,7 @@ void wxStatusBar::UpdateFields()
int width = m_panes[i].GetWidth(); int width = m_panes[i].GetWidth();
QLabel *pane = new QLabel( m_qtStatusBar ); QLabel *pane = new QLabel( m_qtStatusBar );
m_qtPanes->append( pane ); m_qtPanes.push_back(pane);
if ( width >= 0 ) if ( width >= 0 )
{ {