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

Remove a now redundant test in UpdateExpandedInformation()

Browse Source 
Checking for m_progressBarMarquee is not necessary any longer, just
testing the value is enough.

Update the comments to explain why is it so.

No real changes.
This commit is contained in:
Vadim Zeitlin
2017-10-31 17:32:27 +01:00
parent 4ab676c967
commit 5a3fd23a68
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/progdlg.cpp
View File

@@ -569,8 +569,8 @@ bool wxProgressDialog::Pulse(const wxString& newmsg, bool *skip)
m_sharedData->m_notifications |= wxSPDD_MESSAGE_CHANGED; m_sharedData->m_notifications |= wxSPDD_MESSAGE_CHANGED;
} }
// The value passed here doesn't matter, only elapsed time makes sense // Value of 0 is special and is used when we can't estimate the
// in indeterminate mode anyhow. // remaining and total times, which is exactly what we need here.
UpdateExpandedInformation(0); UpdateExpandedInformation(0);
return m_sharedData->m_state != Canceled; return m_sharedData->m_state != Canceled;
@@ -990,8 +990,9 @@ void wxProgressDialog::UpdateExpandedInformation(int value)
// The value of 0 is special, we can't estimate anything before we have at // The value of 0 is special, we can't estimate anything before we have at
// least one update, so leave the times dependent on it indeterminate. // least one update, so leave the times dependent on it indeterminate.
// //
// Similarly, in indeterminate mode we don't have any estimations neither. // This value is also used by Pulse(), as in the indeterminate mode we can
if ( !value || m_sharedData->m_progressBarMarquee ) // never estimate anything.
if ( !value )
{ {
estimatedTime = estimatedTime =
remainingTime = static_cast<unsigned long>(-1); remainingTime = static_cast<unsigned long>(-1);