X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..a24de76b33ff8c30343d322ba9031527f0ba060f:/include/wx/generic/progdlgg.h diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 125e2d2d38..e944e1a132 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -12,7 +12,7 @@ #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,7 +63,7 @@ public: */ void Resume(); - bool Show( bool show = TRUE ); + bool Show( bool show = true ); protected: // callback for optional abort button