suppress VC7.1 64 bit correctness warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d22956def7
commit
b41f29c357
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user