Version number bump

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 125e2d2d38eb50917288000dfac6f85944bc6b99..a267427ae015725884f9b1a88d48b975a7cec37e 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __PROGDLGH_G__
 #define __PROGDLGH_G__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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
    */
-   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;