fixed compilation problem with multiple Update()s

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index ec103f99a75f1158961e7433c129d7bf48b2723a..11437238a0014d5162ced12a9dd5885d68169f39 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


@@ -118,8 +118,7 @@ private:
    DECLARE_EVENT_TABLE()
 private:
     // Virtual function hiding supression
    DECLARE_EVENT_TABLE()
 private:
     // Virtual function hiding supression

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

 };
 #endif
 
 };
 #endif