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

No changes, just use less long progress dialog states names.

Browse Source 
We can refer to them using wxProgressDialog class name and not the base
wxGenericProgressDialog so do this as it is shorter and more clear because
these states have nothing to do with the generic version when used by the
native MSW implementation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-09-10 17:25:45 +00:00
parent 928da15b8e
commit 979901c8df
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/msw/progdlg.cpp
View File

@@ -86,7 +86,7 @@ public:
wxString m_labelCancel; // Privately used by callback.
unsigned long m_timeStop;
wxGenericProgressDialog::ProgressDialogState m_state;
wxProgressDialog::ProgressDialogState m_state;
bool m_progressBarMarquee;
bool m_skipped;
@@ -249,7 +249,7 @@ void PerformNotificationUpdates(HWND hwnd,
// Is the progress finished?
if ( sharedData->m_notifications & wxSPDD_FINISHED )
{
sharedData->m_state = wxGenericProgressDialog::Finished;
sharedData->m_state = wxProgressDialog::Finished;
if ( !(sharedData->m_style & wxPD_AUTO_HIDE) )
{
@@ -812,8 +812,7 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
return TRUE;
case IDCANCEL:
if ( sharedData->m_state
== wxGenericProgressDialog::Finished )
if ( sharedData->m_state == wxProgressDialog::Finished )
{
return FALSE;
}
@@ -823,16 +822,18 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
// a finished dialog.
if ( !UsesCloseButtonOnly(sharedData->m_style) )
{
wxCHECK_MSG( sharedData->m_state ==
wxGenericProgressDialog::Continue,
wxCHECK_MSG
(
sharedData->m_state == wxProgressDialog::Continue,
TRUE,
"Dialog not in a cancelable state!");
"Dialog not in a cancelable state!"
);
::SendMessage(hwnd, TDM_ENABLE_BUTTON, Id_SkipBtn, FALSE);
::SendMessage(hwnd, TDM_ENABLE_BUTTON, IDCANCEL, FALSE);
sharedData->m_timeStop = wxGetCurrentTime();
sharedData->m_state = wxGenericProgressDialog::Canceled;
sharedData->m_state = wxProgressDialog::Canceled;
}
return TRUE;