diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 20ee5a17be..a58ee786b2 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -57,7 +57,7 @@ public: // This enum is an implementation detail and should not be used // by user code. - enum ProgressDialogState + enum State { Uncancelable = -1, // dialog can't be canceled Canceled, // can be cancelled and, in fact, was @@ -121,7 +121,7 @@ protected: // continue processing or not (return value for Update()) - ProgressDialogState m_state; + State m_state; // the maximum value int m_maximum; diff --git a/src/msw/progdlg.cpp b/src/msw/progdlg.cpp index 3dd8c34e5c..948b14bbb8 100644 --- a/src/msw/progdlg.cpp +++ b/src/msw/progdlg.cpp @@ -86,7 +86,7 @@ public: wxString m_labelCancel; // Privately used by callback. unsigned long m_timeStop; - wxProgressDialog::ProgressDialogState m_state; + wxProgressDialog::State m_state; bool m_progressBarMarquee; bool m_skipped;