AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use explicit this-> with non-dependent names (compilation fix for standard-conforming compilers such as g++ 4)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-02-02 21:09:08 +00:00
parent 79935f61bf
commit 361ba943f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/event.h
View File

@ -374,7 +374,7 @@ public:
wxEventFunctorMethod(void (Class::*method)(EventArg&), ObjClass *handler) wxEventFunctorMethod(void (Class::*method)(EventArg&), ObjClass *handler)
{ {
wxASSERT_MSG( handler || IsEvtHandler(), wxASSERT_MSG( handler || this->IsEvtHandler(),
"handlers defined in non-wxEvtHandler-derived classes " "handlers defined in non-wxEvtHandler-derived classes "
"must be connected with a valid sink object" ); "must be connected with a valid sink object" );
@ -387,7 +387,7 @@ public:
Class * realHandler = m_handler; Class * realHandler = m_handler;
if ( !realHandler ) if ( !realHandler )
{ {
realHandler = ConvertFromEvtHandler(handler); realHandler = this->ConvertFromEvtHandler(handler);
// this is not supposed to happen but check for it nevertheless // this is not supposed to happen but check for it nevertheless
wxCHECK_RET( realHandler, "invalid event handler" ); wxCHECK_RET( realHandler, "invalid event handler" );
@ -413,12 +413,12 @@ public:
virtual wxEventFunction GetMethod() const virtual wxEventFunction GetMethod() const
{ {
return ConvertToEvtFunction(m_method); return this->ConvertToEvtFunction(m_method);
} }
virtual wxEvtHandler *GetEvtHandler() const virtual wxEvtHandler *GetEvtHandler() const
{ {
return ConvertToEvtHandler(m_handler); return this->ConvertToEvtHandler(m_handler);
} }
private: private: