From 361ba943f90a3dbc0da9155802baf27928998d23 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 2 Feb 2009 21:09:08 +0000 Subject: [PATCH] use explicit this-> with non-dependent names (compilation fix for standard-conforming compilers such as g++ 4) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/event.h b/include/wx/event.h index ed6a8017f2..eb9b3ac6ad 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -374,7 +374,7 @@ public: wxEventFunctorMethod(void (Class::*method)(EventArg&), ObjClass *handler) { - wxASSERT_MSG( handler || IsEvtHandler(), + wxASSERT_MSG( handler || this->IsEvtHandler(), "handlers defined in non-wxEvtHandler-derived classes " "must be connected with a valid sink object" ); @@ -387,7 +387,7 @@ public: Class * realHandler = m_handler; if ( !realHandler ) { - realHandler = ConvertFromEvtHandler(handler); + realHandler = this->ConvertFromEvtHandler(handler); // this is not supposed to happen but check for it nevertheless wxCHECK_RET( realHandler, "invalid event handler" ); @@ -413,12 +413,12 @@ public: virtual wxEventFunction GetMethod() const { - return ConvertToEvtFunction(m_method); + return this->ConvertToEvtFunction(m_method); } virtual wxEvtHandler *GetEvtHandler() const { - return ConvertToEvtHandler(m_handler); + return this->ConvertToEvtHandler(m_handler); } private: -- 2.45.2