X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef8698d677c97b2d662ee1c5adbdaadf58103e0e..24f4ad95920746ebc6cfc6f2ab86f65fb53345ca:/include/wx/generic/progdlgg.h

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 3c6de05288..4ea81319df 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -55,13 +55,13 @@ public:
        @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
        confirm it)
    */
-   void Resume() { m_state = Continue; }
+   void Resume();
 
 protected:
    // callback for optional abort button
@@ -70,9 +70,6 @@ protected:
    // callback to disable "hard" window closing
    void OnClose(wxCloseEvent& event);
 
-   // callback to detect when the dialog is closed
-   void OnShow(wxShowEvent& event);
-
    // must be called to reenable the other windows temporarily disabled while
    // the dialog was shown
    void ReenableOtherWindows();
@@ -112,10 +109,19 @@ private:
    // 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
+    virtual void Update() { wxDialog::Update(); }
 };
 #endif