From b41f29c357205531670a156b67247b9345688150 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 28 Sep 2004 21:16:57 +0000 Subject: [PATCH] suppress VC7.1 64 bit correctness warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/private.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index b1ee23b549..7ac00c9e05 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -612,6 +612,13 @@ inline void *wxSetWindowUserData(HWND hwnd, void *data) #else // __WIN32__ +#ifdef __VISUALC__ + // strangely enough, VC++ 7.1 gives warnings about 32 -> 64 bit conversions + // in the functions below, even in spite of the explicit casts + #pragma warning(disable:4311) + #pragma warning(disable:4312) +#endif + inline void *wxGetWindowProc(HWND hwnd) { return (void *)::GetWindowLong(hwnd, GWL_WNDPROC); @@ -632,6 +639,11 @@ inline void *wxSetWindowUserData(HWND hwnd, void *data) return (void *)::SetWindowLong(hwnd, GWL_USERDATA, (LONG)data); } +#ifdef __VISUALC__ + #pragma warning(default:4311) + #pragma warning(default:4312) +#endif + #endif // __WIN64__/__WIN32__ #endif // wxUSE_GUI -- 2.45.2