Avoid warnings with MSVC 5.

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 2e083e46b51f88da2c5f36baf8068d36e61e7c78..4563a36f16c9997ef71f0183f39f1ec1d6367ff2 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -514,7 +514,9 @@ private:
 
 #ifdef __VISUALC__
     // 'this' : used in base member initializer list (for m_commandString)
-    #pragma warning(push)
+    #if _MSC_VER > 1100
+        #pragma warning(push)
+    #endif
     #pragma warning(disable:4355)
 #endif
 
@@ -580,7 +582,7 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent)
 };
 
-#ifdef __VISUALC__
+#if defined(__VISUALC__) && (_MSC_VER > 1100)
     #pragma warning(pop)
 #endif
 

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index 801711d6abbed429d7e8c44b0ed3cf094b5982b0..8ce2e1499622d0efed89e86bf00536eb24996a8a 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -32,7 +32,9 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
 
 // avoid triggering this stupid VC++ warning
 #ifdef __VISUALC__
-    #pragma warning(push)
+    #if _MSC_VER > 1100
+        #pragma warning(push)
+    #endif
     #pragma warning(disable:4355) // 'this' used in base member initializer list
 #endif
 
@@ -96,7 +98,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#ifdef __VISUALC__
+#if defined(__VISUALC__) && (_MSC_VER > 1100)
     #pragma warning(pop)
 #endif