implementation streamlined

[wxWidgets.git] / src / msw / ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 5b3312796e58bcbac3c3e7f7dc65b2e046f26ce2..c7b56a1dbc4469ed2a179e483cb0300fc8653216 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -100,12 +100,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
 //      a UDT.  Will produce errors if applied using infix notation.
 //
 // shut it down
 //      a UDT.  Will produce errors if applied using infix notation.
 //
 // shut it down

-#ifdef __VISUALC__
-    #if __VISUALC__ <= 1300
+#if defined __VISUALC__ && __VISUALC__ <= 1300
+    #if __VISUALC__ >= 1200

         #pragma warning(push)
         #pragma warning(push)

-        #pragma warning(disable: 4284)

         #define POP_WARNINGS
     #endif
         #define POP_WARNINGS
     #endif

+    #pragma warning(disable: 4284)

 #endif
 
 #include "wx/hashset.h"
 #endif
 
 #include "wx/hashset.h"