Make wxBase compiled for wxMotif compatible with wxbase compiled

[wxWidgets.git] / include / wx / rawbmp.h

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index 43e20ab6ede42c9d5147fd996b375345a668a55a..1595183e51a05d72ae6003d6df9f584fdb2f0e01 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
+    #pragma warning(push)
     #pragma warning(disable: 4355) // 'this' used in initializer list
 #endif
 
@@ -712,13 +713,12 @@ typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
     partial template specialization then and neither VC6 nor VC7 provide it.
  */
 template < class Image, class PixelFormat = wxPixelFormatFor<Image> >
-struct wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
+struct wxPixelIterator : public wxPixelData<Image, PixelFormat>::Iterator
 {
 };
 
 #ifdef __VISUALC__
-    #pragma warning(default: 4355)
-    #pragma warning(default: 4097)
+    #pragma warning(pop)
 #endif
 
 #endif // _WX_RAWBMP_H_BASE_