VC6 (harmless) warning fix

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 380a2fe5c63ae69e87d4f41fd3c26a6d7ca88d0a..8cf2357171bb3e46c2a20a70b968d374ba1290de 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -103,9 +103,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
     #pragma warning "TODO: remove gs_menuItems hack"
 #endif
 
+// VC++ 6 gives a warning here:
+//
+//      return type for 'OwnerDrawnSet_wxImplementation_HashTable::iterator::
+//      operator ->' is 'class wxOwnerDrawn ** ' (ie; not a UDT or reference to
+//      a UDT.  Will produce errors if applied using infix notation.
+//
+// shut it down
+#ifdef __VISUALC__
+    #if __VISUALC__ <= 1300
+        #pragma warning(push)
+        #pragma warning(disable: 4284)
+        #define POP_WARNINGS
+    #endif
+#endif
+
 #include "wx/hashset.h"
 WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet);
 
+#ifdef POP_WARNINGS
+    #pragma warning(pop)
+#endif
+
 static OwnerDrawnSet gs_menuItems;
 
 // ============================================================================