Moved bunch of #defines (LOG2DEV etc) from msw/dc.cpp to msw/dc.h

[wxWidgets.git] / include / wx / generic / progdlgg.h

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index e839b7fe350bf55b75f228cea628dec4e84ac981..0940e052b6cfde6fbf51f0878bbc79be3f8d20b5 100644 (file)
--- 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,16 +52,16 @@ 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
-       configrm it)
+       confirm it)
    */
    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())
@@ -78,10 +84,17 @@ private:
    {
       Uncancelable = -1,   // dialog can't be canceled
       Canceled,            // can be cancelled and, in fact, was
-      Continue             // can be cancelled but wasn't
+      Continue,            // can be cancelled but wasn't
+      Finished             // finished, waiting to be removed from screen
    } m_state;
+   /// the abort button (or NULL if none)
+   class wxButton *m_btnAbort;
+   /// the maximum value
+   int m_maximum;
 
    DECLARE_EVENT_TABLE()
 };
+#endif
+
 #endif
     // __PROGDLGH_G__