Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use pragma warning push/pop under MSVC instead of enabling temporarily disabled warnings unconditionally (patch 1207689)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-06-07 12:10:48 +00:00
parent 9d03b4eee2
commit 97cffad594
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/event.h
View File

@@ -514,6 +514,7 @@ private:
#ifdef __VISUALC__ #ifdef __VISUALC__
// 'this' : used in base member initializer list (for m_commandString) // 'this' : used in base member initializer list (for m_commandString)
#pragma warning(push)
#pragma warning(disable:4355) #pragma warning(disable:4355)
#endif #endif
@@ -580,7 +581,7 @@ private:
}; };
#ifdef __VISUALC__ #ifdef __VISUALC__
#pragma warning(default:4355) #pragma warning(pop)
#endif #endif
#if WXWIN_COMPATIBILITY_2_4 #if WXWIN_COMPATIBILITY_2_4

3
include/wx/generic/scrolwin.h
View File

@@ -32,6 +32,7 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
// avoid triggering this stupid VC++ warning // avoid triggering this stupid VC++ warning
#ifdef __VISUALC__ #ifdef __VISUALC__
#pragma warning(push)
#pragma warning(disable:4355) // 'this' used in base member initializer list #pragma warning(disable:4355) // 'this' used in base member initializer list
#endif #endif
@@ -96,7 +97,7 @@ private:
}; };
#ifdef __VISUALC__ #ifdef __VISUALC__
#pragma warning(default:4355) #pragma warning(pop)
#endif #endif
#endif #endif

4
include/wx/rawbmp.h
View File

@@ -73,6 +73,7 @@
#ifdef __VISUALC__ #ifdef __VISUALC__
// VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor // VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor
#pragma warning(push)
#pragma warning(disable: 4355) // 'this' used in initializer list #pragma warning(disable: 4355) // 'this' used in initializer list
#endif #endif
@@ -717,8 +718,7 @@ struct wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
}; };
#ifdef __VISUALC__ #ifdef __VISUALC__
#pragma warning(default: 4355) #pragma warning(pop)
#pragma warning(default: 4097)
#endif #endif
#endif // _WX_RAWBMP_H_BASE_ #endif // _WX_RAWBMP_H_BASE_