git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8863
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
// We must relay Timer events to wxTimer's processing function
//
if (pMsg->msg == WM_TIMER)
- wxTimerProc(NULL, 0, pMsg->mp1, 0);
+ wxTimerProc(NULL, 0, (int)pMsg->mp1, 0);
//
// For some composite controls (like a combobox), wndThis might be NULL
!else
# Update the dynamic link library
-$(WXDIR)\lib\wx22.dll: $(OBJECTS)
+$(WXDIR)\lib\wx23.dll: $(OBJECTS)
icc @<<
/B" $(LINKFLAGS)" /Fe$@
$(LIBS)
$(DUMMYOBJ)
$(OBJECTS)
- $(WXDIR)\lib\wx22.def
+ $(WXDIR)\lib\wx23.def
<<
- implib $(WXDIR)\lib\wx22.lib $(WXDIR)\lib\wx22.def
+ implib $(WXDIR)\lib\wx23.lib $(WXDIR)\lib\wx23.def
!endif
rd ..\os2\$D
del $(LIBTARGET)
!if "$(WXMAKINGDLL)" == "1"
- erase /N ..\..\lib\wx22.lib
+ erase /N ..\..\lib\wx23.lib
!endif
cleanall: clean
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-wxTimer::Init()
+void wxTimer::Init()
{
m_ulId = 0;
}