X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/210a651b4f4ef5ff4e220a100a10bb4f29e08cfd..a8f6ef519066976e75833343952f7b6dd70dafa0:/include/wx/generic/progdlgg.h diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index ec103f99a7..872bba1fe0 100644 --- 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 */ - 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 @@ -112,14 +112,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 - void Update() - { wxWindowBase::Update(); } + virtual void Update() { wxDialog::Update(); } }; #endif