X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77d8d6cd64c15837453362f386967b8a0bd22db9..8d8e24dfd72727e2bc3f43a5b706ee2740ce7456:/include/wx/msw/private.h?ds=sidebyside

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index b1ee23b549..31d97c60f2 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -225,7 +225,7 @@ enum wxSTD_COLOUR
     wxSTD_COL_BTNSHADOW,
     wxSTD_COL_BTNFACE,
     wxSTD_COL_BTNHIGHLIGHT,
-    wxSTD_COL_MAX,
+    wxSTD_COL_MAX
 };
 
 struct WXDLLEXPORT wxCOLORMAP
@@ -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