Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxGenericProgressDialog::Resume() virtual

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2017-10-28 02:01:24 +02:00
parent 27110bfa72
commit 8c5dae9491
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/progdlgg.h
View File

@@ -44,7 +44,7 @@ public:
virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
virtual bool Pulse(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 GetValue() const;
int GetRange() const; int GetRange() const;

2
include/wx/msw/progdlg.h
View File

@@ -26,7 +26,7 @@ public:
virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL) wxOVERRIDE; virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL) wxOVERRIDE;
virtual bool Pulse(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; int GetValue() const;
wxString GetMessage() const; wxString GetMessage() const;