use pragma warning push/pop under MSVC instead of enabling temporarily disabled warni...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index 9694f3e81a49f4035a6c2e0ab753b9722425f2f0..eecc4cd9807b0b56e247117f74ccfee3d4aec04f 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -514,6 +514,7 @@ private:
 
 #ifdef __VISUALC__
     // 'this' : used in base member initializer list (for m_commandString)
 
 #ifdef __VISUALC__
     // 'this' : used in base member initializer list (for m_commandString)

+    #pragma warning(push)

     #pragma warning(disable:4355)
 #endif
 
     #pragma warning(disable:4355)
 #endif
 


@@ -580,7 +581,7 @@ private:
 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__

-    #pragma warning(default:4355)
+    #pragma warning(pop)

 #endif
 
 #if WXWIN_COMPATIBILITY_2_4
 #endif
 
 #if WXWIN_COMPATIBILITY_2_4

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index c7ecc79bf1ba4085a6cc60c7fac61c6de149045c..801711d6abbed429d7e8c44b0ed3cf094b5982b0 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -32,6 +32,7 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
 
 // avoid triggering this stupid VC++ warning
 #ifdef __VISUALC__
 
 // avoid triggering this stupid VC++ warning
 #ifdef __VISUALC__

+    #pragma warning(push)

     #pragma warning(disable:4355) // 'this' used in base member initializer list
 #endif
 
     #pragma warning(disable:4355) // 'this' used in base member initializer list
 #endif
 


@@ -96,7 +97,7 @@ private:
 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__

-    #pragma warning(default:4355)
+    #pragma warning(pop)

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 43e20ab6ede42c9d5147fd996b375345a668a55a..8901f1b2f3ed3fe95f5cb3880c06a776f996f88d 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -73,6 +73,7 @@
 
 #ifdef __VISUALC__
     // VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor
 
 #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
 
     #pragma warning(disable: 4355) // 'this' used in initializer list
 #endif
 


@@ -717,8 +718,7 @@ struct wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__

-    #pragma warning(default: 4355)
-    #pragma warning(default: 4097)
+    #pragma warning(pop)

 #endif
 
 #endif // _WX_RAWBMP_H_BASE_
 #endif
 
 #endif // _WX_RAWBMP_H_BASE_