X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbc66a27047635e86fbba08043da831666d74f4a..d7eee191c55687785a2be927fd387d10514cdf1b:/include/wx/generic/progdlgg.h diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index b02ba1ef28..11437238a0 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 @@ -63,12 +63,20 @@ public: */ void Resume() { m_state = Continue; } - // implementation from now on - // callback for optional abort button +protected: + // callback for optional abort button void OnCancel(wxCommandEvent& event); - // callback to disable "hard" window closing + + // 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(); + private: // create the label with given text and another one to show the time nearby // under the lastWindow and modify it to be the same as the control created @@ -108,6 +116,9 @@ private: class WXDLLEXPORT wxWindowDisabler *m_winDisabler; DECLARE_EVENT_TABLE() +private: + // Virtual function hiding supression + virtual void Update() { wxDialog::Update(); } }; #endif