X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..8ea3a63ea9b48da919a5f9eb3c60e137dc333db8:/include/wx/generic/progdlgg.h diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index dff9e2fc06..85cbeedabd 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -13,14 +13,15 @@ #define __PROGDLGH_G__ #include "wx/defs.h" +#include "wx/progdlg.h" #if wxUSE_PROGRESSDLG #include "wx/dialog.h" -class WXDLLEXPORT wxButton; -class WXDLLEXPORT wxGauge; -class WXDLLEXPORT wxStaticText; +class WXDLLIMPEXP_FWD_CORE wxButton; +class WXDLLIMPEXP_FWD_CORE wxGauge; +class WXDLLIMPEXP_FWD_CORE wxStaticText; /* Progress dialog which shows a moving progress bar. Taken from the Mahogany project.*/ @@ -44,7 +45,7 @@ public: /* Destructor. Re-enables event handling for other windows. */ - ~wxProgressDialog(); + virtual ~wxProgressDialog(); /* Update the status bar to the new value. @param value new value @@ -52,6 +53,11 @@ public: @returns true if ABORT button has not been pressed */ virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); + + /* Switches the dialog to use a gauge in indeterminate mode and calls + wxGauge::Pulse() to show to the user a bit of progress */ + virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL); + // Must provide overload to avoid hiding it (and warnings about it) virtual void Update() { wxDialog::Update(); } @@ -82,6 +88,12 @@ private: // as the next windows in the sizer, returns the created control wxStaticText *CreateLabel(const wxString& text, wxSizer *sizer); + // updates the label message + void UpdateMessage(const wxString &newmsg); + + // common part of Update() and Pulse(), returns true if not cancelled + bool DoAfterUpdate(bool *skip); + // shortcuts for enabling buttons void EnableClose(); void EnableSkip(bool enable=true); @@ -149,7 +161,7 @@ private: #endif // __WXMSW__ // for wxPD_APP_MODAL case - class WXDLLEXPORT wxWindowDisabler *m_winDisabler; + class WXDLLIMPEXP_FWD_CORE wxWindowDisabler *m_winDisabler; DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxProgressDialog)