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

Make other wxGenericProgressDialog methods virtual too

Browse Source 
Solve the same problem as was recently with hiding, instead of
overriding, Resume() in the native MSW wxProgressDialog class for all
the other methods which were also affected by it.
This commit is contained in:
Vadim Zeitlin
2017-10-31 16:47:38 +01:00
parent cac3d39fa1
commit 7481c74365
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,16 +46,16 @@ public:
virtual void Resume();
int GetValue() const;
int GetRange() const;
wxString GetMessage() const;
virtual int GetValue() const;
virtual int GetRange() const;
virtual wxString GetMessage() const;
void SetRange(int maximum);
virtual void SetRange(int maximum);
// Return whether "Cancel" or "Skip" button was pressed, always return
// false if the corresponding button is not shown.
bool WasCancelled() const;
bool WasSkipped() const;
virtual bool WasCancelled() const;
virtual bool WasSkipped() const;
// Must provide overload to avoid hiding it (and warnings about it)
virtual void Update() wxOVERRIDE { wxDialog::Update(); }

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

@@ -28,15 +28,15 @@ public:
virtual void Resume() wxOVERRIDE;
int GetValue() const;
wxString GetMessage() const;
virtual int GetValue() const wxOVERRIDE;
virtual wxString GetMessage() const wxOVERRIDE;
void SetRange(int maximum);
virtual void SetRange(int maximum) wxOVERRIDE;
// Return whether "Cancel" or "Skip" button was pressed, always return
// false if the corresponding button is not shown.
bool WasSkipped() const;
bool WasCancelled() const;
virtual bool WasSkipped() const wxOVERRIDE;
virtual bool WasCancelled() const wxOVERRIDE;
virtual void SetTitle(const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const wxOVERRIDE;