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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index eaf4cc7177..0940e052b6 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -17,9 +17,11 @@
 #endif
 
 #include "wx/setup.h"
-#include "wx/frame.h"
 
+#if wxUSE_PROGRESSDLG
 
+#include "wx/frame.h"
+#include "wx/time.h"
 
 /** Progress dialog which shows a moving progress bar.
     Taken from the Mahogany project.*/
@@ -50,7 +52,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 = "");
+   bool Update(int value = -1, const wxString& newmsg = _T(""));
 
    /** 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
@@ -59,7 +61,7 @@ public:
    void Resume() { m_state = Continue; }
 
    /// Callback for optional abort button
-   void OnCancel(wxEvent& WXUNUSED(event)) { m_state = Canceled; }
+   void OnCancel(wxCommandEvent& WXUNUSED(event)) { m_state = Canceled; }
 
    /// callback to disable "hard" window closing
    void OnClose(wxCloseEvent& event);
@@ -71,6 +73,10 @@ private:
    class wxStaticText *m_msg;
    /// disable all or parent window only
    bool m_disableParentOnly;
+   /// displayed elapsed, estimated, remaining time
+   class wxStaticText *m_elapsed, *m_estimated, *m_remaining;
+   /// time when the dialog was created or NULL 
+   class wxTime *m_time;
    /// parent window
    class wxWindow *m_parent;
    /// continue processing or not (return value for Update())
@@ -88,5 +94,7 @@ private:
 
    DECLARE_EVENT_TABLE()
 };
+#endif
+
 #endif
     // __PROGDLGH_G__