From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 10 Sep 2010 17:25:53 +0000 (+0000)
Subject: Rename wxGenericProgressDialog::ProgressDialogState to just State.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4f4d6f44f9deb819972e68618f1745479fbfbe72

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 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;