Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor updates to help compiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-11-29 05:18:49 +00:00
parent eedb15434a
commit 496fd9fb93
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/os2/app.cpp
View File

@@ -764,7 +764,7 @@ bool wxApp::ProcessMessage(
// We must relay Timer events to wxTimer's processing function // We must relay Timer events to wxTimer's processing function
// //
if (pMsg->msg == WM_TIMER) 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 // For some composite controls (like a combobox), wndThis might be NULL

8
src/os2/makefile.va
View File

@@ -1002,15 +1002,15 @@ $(WXDIR)\lib\wx.lib: \
!else !else
# Update the dynamic link library # Update the dynamic link library
$(WXDIR)\lib\wx22.dll: $(OBJECTS) $(WXDIR)\lib\wx23.dll: $(OBJECTS)
icc @<< icc @<<
/B" $(LINKFLAGS)" /Fe$@ /B" $(LINKFLAGS)" /Fe$@
$(LIBS) $(LIBS)
$(DUMMYOBJ) $(DUMMYOBJ)
$(OBJECTS) $(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 !endif
@@ -1106,7 +1106,7 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
rd ..\os2\$D rd ..\os2\$D
del $(LIBTARGET) del $(LIBTARGET)
!if "$(WXMAKINGDLL)" == "1" !if "$(WXMAKINGDLL)" == "1"
erase /N ..\..\lib\wx22.lib erase /N ..\..\lib\wx23.lib
!endif !endif
cleanall: clean cleanall: clean

2
src/os2/timer.cpp
View File

@@ -44,7 +44,7 @@ ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
wxTimer::Init() void wxTimer::Init()
{ {
m_ulId = 0; m_ulId = 0;
} }