Browse Source

WX_PROGRESS_REPORTER: fixed windows build error

pull/5/merge
Tomasz Włostowski 8 years ago
parent
commit
4bf90f9717
  1. 4
      common/widgets/progress_reporter.cpp
  2. 8
      include/widgets/progress_reporter.h

4
common/widgets/progress_reporter.cpp

@ -53,7 +53,7 @@ void PROGRESS_REPORTER::AdvancePhase( )
void PROGRESS_REPORTER::Report( const wxString& aMessage )
{
std::lock_guard<std::mutex> guard( m_lock );
m_message = aMessage;
m_rptMessage = aMessage;
updateUI();
}
@ -102,5 +102,5 @@ void WX_PROGRESS_REPORTER::updateUI()
cur = 0;
SetRange( 1000 );
Update( cur, m_message );
Update( cur, m_rptMessage );
}

8
include/widgets/progress_reporter.h

@ -47,9 +47,11 @@ class PROGRESS_REPORTER
int currentProgress() const;
virtual void updateUI() = 0;
wxString m_message;
int m_phase, m_numPhases;
int m_progress, m_maxProgress;
wxString m_rptMessage;
int m_phase;
int m_numPhases;
int m_progress;
int m_maxProgress;
std::mutex m_lock;
};

Loading…
Cancel
Save