X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..dcb139ff26b3fc3b03852c95ae72c3fd7dc5153f:/include/wx/generic/progdlgg.h

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 9fc06a25bf..e53d3af732 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -55,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, const wxString& newmsg = wxT(""));
+   virtual bool Update(int value, const wxString& newmsg = wxEmptyString);
 
    /* 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
@@ -63,7 +63,7 @@ public:
    */
    void Resume();
 
-   bool Show( bool show = TRUE );
+   bool Show( bool show = true );
 
 protected:
    // callback for optional abort button
@@ -78,9 +78,8 @@ protected:
 
 private:
    // create the label with given text and another one to show the time nearby
-   // under the lastWindow and modify it to be the same as the control created
-   // (which is returned)
-   wxStaticText *CreateLabel(const wxString& text, wxWindow **lastWindow);
+   // as the next windows in the sizer, returns the created control
+   wxStaticText *CreateLabel(const wxString& text, wxSizer *sizer);
 
    // the status bar
    wxGauge *m_gauge;
@@ -92,6 +91,10 @@ private:
                       *m_remaining;
    // time when the dialog was created
    unsigned long m_timeStart;
+   // time when the dialog was closed or cancelled
+   unsigned long m_timeStop;
+   // time between the moment the dialog was closed/cancelled and resume
+   unsigned long m_break;
 
    // parent top level window (may be NULL)
    wxWindow *m_parentTop;
@@ -111,6 +114,17 @@ private:
    // the maximum value
    int m_maximum;
 
+   // saves the time when elapsed time was updated so there is only one
+   // update per second
+   unsigned long m_last_timeupdate;
+   // tells how often a change of the estimated time has to be confirmed
+   // before it is actually displayed - this reduces the frequence of updates
+   // of estimated and remaining time
+   const int m_delay;
+   // counts the confirmations
+   int m_ctdelay;
+   unsigned long m_display_estimated;
+
 #if defined(__WXMSW__ ) || defined(__WXPM__)
    // the factor we use to always keep the value in 16 bit range as the native
    // control only supports ranges from 0 to 65,535