haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WX_PROGRESS_REPORTER: fixed windows build error

This commit is contained in:
Tomasz Włostowski 2017-12-04 19:29:57 +01:00
parent 4facfd846a
commit 4bf90f9717
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/widgets/progress_reporter.cpp
View File

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

8
include/widgets/progress_reporter.h
View File

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