undef CreateWindow too, even if we don't use it ourselves it's still a very common...

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 4ea81319df4dbb4e8cd34333626bec95788c6916..e53d3af732a604a06717ef651ff1848d69b0206f 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -6,13 +6,13 @@
 // Created:     09.05.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballüder
 // Created:     09.05.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballüder

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ////////////////////////////////////////////////////
 
 #ifndef __PROGDLGH_G__
 #define __PROGDLGH_G__
 
 ////////////////////////////////////////////////////
 
 #ifndef __PROGDLGH_G__
 #define __PROGDLGH_G__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "progdlgg.h"
 #endif
 
 #pragma interface "progdlgg.h"
 #endif
 


@@ -55,7 +55,7 @@ public:
        @param newmsg if used, new message to display
        @returns true if ABORT button has not been pressed
    */
        @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
 
    /* 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,6 +63,8 @@ public:
    */
    void Resume();
 
    */
    void Resume();
 

+   bool Show( bool show = true );
+

 protected:
    // callback for optional abort button
    void OnCancel(wxCommandEvent& event);
 protected:
    // callback for optional abort button
    void OnCancel(wxCommandEvent& event);


@@ -76,9 +78,8 @@ protected:
 
 private:
    // create the label with given text and another one to show the time nearby
 
 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;
 
    // the status bar
    wxGauge *m_gauge;


@@ -90,6 +91,10 @@ private:
                       *m_remaining;
    // time when the dialog was created
    unsigned long m_timeStart;
                       *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;
 
    // parent top level window (may be NULL)
    wxWindow *m_parentTop;


@@ -109,7 +114,18 @@ private:
    // the maximum value
    int m_maximum;
 
    // the maximum value
    int m_maximum;
 

-#ifdef __WXMSW__
+   // 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
    size_t m_factor;
    // 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
    size_t m_factor;


@@ -122,6 +138,8 @@ private:
 private:
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }
 private:
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }

+
+    DECLARE_NO_COPY_CLASS(wxProgressDialog)

 };
 #endif
 
 };
 #endif