minimum changes required for toolbar text related changes

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index ec103f99a75f1158961e7433c129d7bf48b2723a..872bba1fe03ff9dd04080276cecc2fcad0f2716c 100644 (file)
--- 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
    */
        @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 = wxT(""));
+   bool Update(int value, const wxString& newmsg = wxT(""));

 
    /* 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


@@ -112,14 +112,19 @@ private:
    // the maximum value
    int m_maximum;
 
    // the maximum value
    int m_maximum;
 

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

    // for wxPD_APP_MODAL case
    class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
 
    DECLARE_EVENT_TABLE()
 private:
     // Virtual function hiding supression
    // for wxPD_APP_MODAL case
    class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
 
    DECLARE_EVENT_TABLE()
 private:
     // Virtual function hiding supression

-    void Update()
-    { wxWindowBase::Update(); }
+    virtual void Update() { wxDialog::Update(); }

 };
 #endif
 
 };
 #endif