Rename wxGenericProgressDialog::ProgressDialogState to just State.

Repeating "ProgressDialog" twice is redundant.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 20ee5a17be20360de4f3e9f4bdd518b98dfe6293..a58ee786b283e54aa56ee0a182b5c4b07f37c4b0 100644 (file)
--- 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 3dd8c34e5c0b41120ba524e9d70b0b2a7a1ce1a1..948b14bbb8d9a10057f3e0d3af3ba6e02464e5fc 100644 (file)
--- 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;