Disable a harmless deprecation MSVC warning for wxNORMAL in a test.
Explicitly disable the warning just for the code using wxNORMAL as the use of this deprecated constant can't be avoided in the code which tests for its support. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e393f96dcc
commit
db65392b95
@ -107,9 +107,20 @@ void FontTestCase::Construct()
|
||||
wxFONTWEIGHT_NORMAL).IsOk() );
|
||||
|
||||
#if WXWIN_COMPATIBILITY_3_0
|
||||
// Disable the warning about deprecated wxNORMAL as we use it here
|
||||
// intentionally.
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4996)
|
||||
#endif
|
||||
|
||||
// Tests relying on the soon-to-be-deprecated ctor taking ints and not
|
||||
// wxFontXXX enum elements.
|
||||
CPPUNIT_ASSERT( wxFont(10, wxDEFAULT, wxNORMAL, wxNORMAL).IsOk() );
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
#endif // WXWIN_COMPATIBILITY_3_0
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user