some conflicts resolved

[wxWidgets.git] / src / motif / timer.cpp

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index 1bf9297621a2124b2fd5ad7055a594ac43d8d69e..69b4917557fadf688f2e92eae9a35941d9cb00b1 100644 (file)
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -55,6 +55,7 @@ wxTimer::wxTimer()
 wxTimer::~wxTimer()
 {
     Stop();
+    wxTimerList.DeleteObject(this);
 }
 
 bool wxTimer::Start(int milliseconds, bool mode)