fix for bug 1371386, with some minor mods and cleanup

[wxWidgets.git] / src / common / timercmn.cpp

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index ffcf0358a91f390f18a6624592d9cc31dcb27dca..90623b23eb8666e9122262aaf9be0f09a2e3908f 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -18,10 +18,6 @@
 // wxWin headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "timerbase.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -57,6 +53,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);
 }
 
@@ -84,7 +81,7 @@ bool wxTimerBase::Start(int milliseconds, bool oneShot)
 
     m_oneShot = oneShot;
 
-    return TRUE;
+    return true;
 }
 
 #endif // wxUSE_TIMER