projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed erroneous debug error message
[wxWidgets.git]
/
src
/
os2
/
timer.cpp
diff --git
a/src/os2/timer.cpp
b/src/os2/timer.cpp
index 54c26cbbeb940a2b78a62afb3e8a8c8bad951e3c..d3c2fdff27053130fc9987a39035401d5afd2f9c 100644
(file)
--- a/
src/os2/timer.cpp
+++ b/
src/os2/timer.cpp
@@
-42,11
+42,9
@@
ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
// macros
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-#endif
-
wxTimer::wxTimer
()
+
void wxTimer::Init
()
{
m_ulId = 0;
}
{
m_ulId = 0;
}
@@
-54,7
+52,7
@@
wxTimer::wxTimer()
wxTimer::~wxTimer()
{
Stop();
wxTimer::~wxTimer()
{
Stop();
-
+ wxTimer::Stop();
wxTimerList.DeleteObject(this);
}
wxTimerList.DeleteObject(this);
}