use pragma warning push/pop under MSVC instead of enabling temporarily disabled warnings unconditionally (patch 1207689)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9d03b4eee2
commit
97cffad594
@ -514,6 +514,7 @@ private:
|
||||
|
||||
#ifdef __VISUALC__
|
||||
// 'this' : used in base member initializer list (for m_commandString)
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4355)
|
||||
#endif
|
||||
|
||||
@ -580,7 +581,7 @@ private:
|
||||
};
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(default:4355)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
|
@ -32,6 +32,7 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
|
||||
|
||||
// avoid triggering this stupid VC++ warning
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4355) // 'this' used in base member initializer list
|
||||
#endif
|
||||
|
||||
@ -96,7 +97,7 @@ private:
|
||||
};
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(default:4355)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -73,6 +73,7 @@
|
||||
|
||||
#ifdef __VISUALC__
|
||||
// VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 4355) // 'this' used in initializer list
|
||||
#endif
|
||||
|
||||
@ -717,8 +718,7 @@ struct wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
|
||||
};
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#pragma warning(default: 4355)
|
||||
#pragma warning(default: 4097)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#endif // _WX_RAWBMP_H_BASE_
|
||||
|
Loading…
Reference in New Issue
Block a user