X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..6b5403c8d65be699529995d221c3119f1da353c8:/src/common/timercmn.cpp

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 7371b1ffbf..2b310c0599 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -18,7 +18,7 @@
 // wxWin headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "timerbase.h"
 #endif
 
@@ -32,6 +32,7 @@
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP
+    #include "wx/timer.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -56,6 +57,7 @@ void wxTimerBase::Notify()
     wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
 
     wxTimerEvent event(m_idTimer, m_milli);
+    event.SetEventObject(this);
     (void)m_owner->ProcessEvent(event);
 }
 
@@ -83,7 +85,7 @@ bool wxTimerBase::Start(int milliseconds, bool oneShot)
 
     m_oneShot = oneShot;
 
-    return TRUE;
+    return true;
 }
 
 #endif // wxUSE_TIMER