diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-25 17:42:08 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-05-25 22:40:02 +0200 |
| commit | 943c3a71404f00d2fb95ea19d936b27af79e0a80 (patch) | |
| tree | 8f50b3d6563c32a45058c541c74dbff799b3594a | |
| parent | 61e0deb8c5200cdc66a8d6215a462e433f1804da (diff) | |
| download | cppunit-943c3a71404f00d2fb95ea19d936b27af79e0a80.tar.gz | |
allow compiling the cppunit solution as 64bit with MSVC
4 files changed, 5 insertions, 5 deletions
diff --git a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp index 2a95ef9..1ac4a6e 100644 --- a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp +++ b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp @@ -79,7 +79,7 @@ void cdxCDynamicDialog::OnSizing(UINT fwSide, LPRECT pRect) DoOnSizing(fwSide, pRect); } -void cdxCDynamicDialog::OnTimer(UINT idEvent) +void cdxCDynamicDialog::OnTimer(UINT_PTR idEvent) { CDialog::OnTimer(idEvent); DoOnTimer(idEvent); diff --git a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h index d888313..b59566b 100644 --- a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h +++ b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h @@ -44,7 +44,7 @@ protected: afx_msg void OnParentNotify(UINT message, LPARAM lParam); afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnSizing(UINT fwSide, LPRECT pRect); - afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnTimer(UINT_PTR nIDEvent); DECLARE_MESSAGE_MAP(); }; diff --git a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp index d35ebf5..f72bb8f 100644 --- a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp +++ b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp @@ -676,7 +676,7 @@ void cdxCDynamicWnd::StartAntiFlickering(bool bIsBotRight) * Changes back the class style. */ -void cdxCDynamicWnd::DoOnTimer(UINT nIDEvent) +void cdxCDynamicWnd::DoOnTimer(UINT_PTR nIDEvent) { if(IsWindow() && (nIDEvent == m_nMyTimerID)) { diff --git a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h index 6f18a38..3cabfa3 100644 --- a/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h +++ b/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h @@ -254,7 +254,7 @@ public: CSize m_szMin, // min/max CLIENT size (set to zero to disable) m_szMax; UINT m_idSizeIcon; // id of size icon (default to AFX_IDW_SIZE_BOX) - UINT m_nMyTimerID; // id of the timer used by me + UINT_PTR m_nMyTimerID; // id of the timer used by me bool m_bUseScrollPos; // use scroll position when moving controls public: @@ -353,7 +353,7 @@ protected: void DoOnDestroy(); void DoOnParentNotify(UINT message, LPARAM lParam); - void DoOnTimer(UINT nIDEvent); + void DoOnTimer(UINT_PTR nIDEvent); void DoOnSize(UINT nType, int cx, int cy); void DoOnSizing(UINT fwSide, LPRECT pRect); void DoOnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); |