X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbdb0e1313e5fe26df04bc14bae1a1c723332102..794bcc2dea743ac907b839f54e451847c9ea4b72:/include/wx/generic/progdlgg.h?ds=sidebyside

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 7ea2672c35..8979d2f003 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -23,6 +23,7 @@
 #include "wx/dialog.h"
 
 class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxGauge;
 class WXDLLEXPORT wxStaticText;
 
 /* Progress dialog which shows a moving progress bar.
@@ -54,7 +55,7 @@ public:
        @param newmsg if used, new message to display
        @returns true if ABORT button has not been pressed
    */
-   bool Update(int value = -1, const wxString& newmsg = _T(""));
+   bool Update(int value = -1, const wxString& newmsg = wxT(""));
 
    /* Can be called to continue after the cancel button has been pressed, but
        the program decided to continue the operation (e.g., user didn't
@@ -75,21 +76,19 @@ private:
    wxStaticText *CreateLabel(const wxString& text, wxWindow **lastWindow);
 
    // the status bar
-   class wxGauge *m_gauge;
+   wxGauge *m_gauge;
    // the message displayed
-   class wxStaticText *m_msg;
-   // disable all or parent window only
-   bool m_disableParentOnly;
-   // auto-hide?
-   bool m_AutoHide;
+   wxStaticText *m_msg;
    // displayed elapsed, estimated, remaining time
    class wxStaticText *m_elapsed,
                       *m_estimated,
                       *m_remaining;
    // time when the dialog was created
    unsigned long m_timeStart;
-   // parent window
-   wxWindow *m_parent;
+
+   // parent top level window (may be NULL)
+   wxWindow *m_parentTop;
+
    // continue processing or not (return value for Update())
    enum
    {