Make wxString::WorstEncodingCase take a const wxMBConv&

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index f102ace512ef8a7204c1a899deb05958f20751ae..1aebce5ee143222539b25e8c9eb994e45cc0517b 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -46,7 +46,7 @@ ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)

 
 void wxTimer::Init()
 {
 
 void wxTimer::Init()
 {


@@ -169,7 +169,7 @@ ULONG wxTimerProc(
 
     wxCHECK_MSG(pNode, 0, wxT("bogus timer id in wxTimerProc") );
     if (pNode)
 
     wxCHECK_MSG(pNode, 0, wxT("bogus timer id in wxTimerProc") );
     if (pNode)

-      wxProcessTimer(*(wxTimer *)pNode->Data());
+      wxProcessTimer(*(wxTimer *)pNode->GetData());

     return 0;
 }
 
     return 0;
 }