second merge of the 2.2 branch (RL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -100,8 +100,9 @@
|
||||
# pragma warning(disable:4100) // unreferenced formal parameter
|
||||
# pragma warning(disable:4511) // copy ctor couldn't be generated
|
||||
# pragma warning(disable:4512) // operator=() couldn't be generated
|
||||
# pragma warning(disable:4699) // Using precompiled header
|
||||
# pragma warning(disable:4699) // using precompiled header
|
||||
# pragma warning(disable:4134) // conversion between pointers to members of same class
|
||||
# pragma warning(disable:4710) // function not inlined
|
||||
#ifndef WIN32
|
||||
# pragma warning(disable:4135) // conversion between different integral types
|
||||
# pragma warning(disable:4769) // assignment of near pointer to long integer
|
||||
|
Reference in New Issue
Block a user