From 8c5dae949111609238f9f4373e1bef26aee5b6e7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 28 Oct 2017 02:01:24 +0200 Subject: [PATCH] Make wxGenericProgressDialog::Resume() virtual It needs to be overridden in the native MSW wxProgressDialog implementation, but was only hidden by the function with the same name in the derived class, making it impossible to call the right function via the base class pointer, for example. --- include/wx/generic/progdlgg.h | 2 +- include/wx/msw/progdlg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index e5f4bb0eb3..ae74bd122d 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -44,7 +44,7 @@ public: virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL); - void Resume(); + virtual void Resume(); int GetValue() const; int GetRange() const; diff --git a/include/wx/msw/progdlg.h b/include/wx/msw/progdlg.h index 9e3e8422d6..f073c66060 100644 --- a/include/wx/msw/progdlg.h +++ b/include/wx/msw/progdlg.h @@ -26,7 +26,7 @@ public: virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL) wxOVERRIDE; virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL) wxOVERRIDE; - void Resume(); + virtual void Resume() wxOVERRIDE; int GetValue() const; wxString GetMessage() const;