X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..a24de76b33ff8c30343d322ba9031527f0ba060f:/include/wx/generic/progdlgg.h diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 08411b619f..e944e1a132 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -6,13 +6,13 @@ // Created: 09.05.1999 // RCS-ID: $Id$ // Copyright: (c) Karsten Ballüder -// Licence: wxWindows license +// Licence: wxWindows licence //////////////////////////////////////////////////// #ifndef __PROGDLGH_G__ #define __PROGDLGH_G__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "progdlgg.h" #endif @@ -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, const wxString& newmsg = wxT("")); + virtual bool Update(int value, const wxString& newmsg = wxEmptyString); /* 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,6 +63,8 @@ public: */ void Resume(); + bool Show( bool show = true ); + protected: // callback for optional abort button void OnCancel(wxCommandEvent& event); @@ -122,6 +124,8 @@ private: private: // Virtual function hiding supression virtual void Update() { wxDialog::Update(); } + + DECLARE_NO_COPY_CLASS(wxProgressDialog) }; #endif