fixed compilation problem with multiple Update()s
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -55,7 +55,7 @@ public:
|
|||||||
@param newmsg if used, new message to display
|
@param newmsg if used, new message to display
|
||||||
@returns true if ABORT button has not been pressed
|
@returns true if ABORT button has not been pressed
|
||||||
*/
|
*/
|
||||||
bool Update(int value = -1, const wxString& newmsg = wxT(""));
|
bool Update(int value, const wxString& newmsg = wxT(""));
|
||||||
|
|
||||||
/* Can be called to continue after the cancel button has been pressed, but
|
/* 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
|
the program decided to continue the operation (e.g., user didn't
|
||||||
@@ -118,8 +118,7 @@ private:
|
|||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
private:
|
private:
|
||||||
// Virtual function hiding supression
|
// Virtual function hiding supression
|
||||||
void Update()
|
virtual void Update() { wxDialog::Update(); }
|
||||||
{ wxWindowBase::Update(); }
|
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user