X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69c695466d495aca6ab44e3d8e4219fc00ff2146..2dfa1d9e11128c9708bbf55feeb442471828ac63:/include/wx/generic/progdlgg.h diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 4256feee73..dff9e2fc06 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -12,10 +12,6 @@ #ifndef __PROGDLGH_G__ #define __PROGDLGH_G__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "progdlgg.h" -#endif - #include "wx/defs.h" #if wxUSE_PROGRESSDLG @@ -56,6 +52,8 @@ public: @returns true if ABORT button has not been pressed */ virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); + // Must provide overload to avoid hiding it (and warnings about it) + virtual void Update() { wxDialog::Update(); } /* 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 @@ -154,10 +152,6 @@ private: class WXDLLEXPORT wxWindowDisabler *m_winDisabler; DECLARE_EVENT_TABLE() -private: - // Virtual function hiding supression - virtual void Update() { wxDialog::Update(); } - DECLARE_NO_COPY_CLASS(wxProgressDialog) };