make access specifiers for the virtual functions match their access in the base class (patch 1400131)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,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
|
||||
@@ -150,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)
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user