From: David Webster <Dave.Webster@bhmi.com>
Date: Wed, 29 Nov 2000 05:18:49 +0000 (+0000)
Subject: Minor updates to help compiles
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/496fd9fb93d3222159c1d024c25e79eab6abe34c?ds=sidebyside;hp=eedb15434a5f0350f4e1a11faaab3391b900cb5b

Minor updates to help compiles


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index cf75302c78..35f7a8481c 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -764,7 +764,7 @@ bool wxApp::ProcessMessage(
     // 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
diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index ba49185c32..d0859d67d3 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -1002,15 +1002,15 @@ $(WXDIR)\lib\wx.lib: \
 !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
 
@@ -1106,7 +1106,7 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
         rd      ..\os2\$D
         del      $(LIBTARGET)
 !if "$(WXMAKINGDLL)" == "1"
-        erase /N ..\..\lib\wx22.lib
+        erase /N ..\..\lib\wx23.lib
 !endif
 
 cleanall: clean
diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index bd07b4ead0..d3c2fdff27 100644
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -44,7 +44,7 @@ ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 
-wxTimer::Init()
+void wxTimer::Init()
 {
     m_ulId = 0;
 }