Keep wxPalmOS buildable after changes in wxConvAuto.

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index bc298194958547a4963123a3231a765e03a30066..dff9e2fc0626d8eb29963bf41c3a974f0064cd5c 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -52,6 +52,8 @@ public:
        @returns true if ABORT button has not been pressed
    */
    virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
        @returns true if ABORT button has not been pressed
    */
    virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);

+    // Must provide overload to avoid hiding it (and warnings about it)
+    virtual void Update() { wxDialog::Update(); }

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


@@ -150,10 +152,6 @@ private:
     class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
 
     DECLARE_EVENT_TABLE()
     class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
 
     DECLARE_EVENT_TABLE()

-private:
-    // Virtual function hiding supression
-    virtual void Update() { wxDialog::Update(); }
-

     DECLARE_NO_COPY_CLASS(wxProgressDialog)
 };
 
     DECLARE_NO_COPY_CLASS(wxProgressDialog)
 };