use explicit this-> with non-dependent names (compilation fix for standard-conforming...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index ed6a8017f2d9fcb76366a038b019a42f8a632f43..eb9b3ac6ad3c64bf021ff599e914444d5faf65bd 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -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 "
                       "must be connected with a valid sink object" );
 
                       "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 )
         {
         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" );
 
             // 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
     {
 
     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: