Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index b7f3b01c301ae3a4353614dc671b5b84c223be51..568fd7c667d7cac7ca0a1a8e3f976ea3a8f506a4 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -322,7 +322,7 @@ struct WXDLLEXPORT wxPixelDataOut<wxImage>
             {
                 m_pRGB += PixelFormat::SizePixel;
                 if ( m_pAlpha )
             {
                 m_pRGB += PixelFormat::SizePixel;
                 if ( m_pAlpha )

-                    m_pAlpha += PixelFormat::SizePixel;
+                    ++m_pAlpha;

 
                 return *this;
             }
 
                 return *this;
             }


@@ -623,26 +623,31 @@ struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
     };
 };
 
     };
 };
 

+#ifdef __VISUALC__
+    // typedef-name 'foo' used as synonym for class-name 'bar'
+    // (VC++ gives this warning each time wxPixelData::Base is used but it
+    //  doesn't make any sense here -- what's wrong with using typedef instead
+    //  of class, this is what it is here for!)
+    #pragma warning(disable: 4097)
+#endif // __VISUALC__

 
 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :
 
 template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :

-    public wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>
+    public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>

 {
 public:
 {
 public:

-    wxPixelData(Image& image)
-        : wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(image)
-        {
-        }
+    typedef
+        typename wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
+        Base;

 
 

-    wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz)
-        : wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(i, pt, sz)
-        {
-        }
+    wxPixelData(Image& image) : Base(image) { }

 
 

-    wxPixelData(Image& i, const wxRect& rect)
-        : wxPixelDataOut<Image>::wxPixelDataIn<PixelFormat>(i, rect)
-        {
-        }
+    wxPixelData(Image& i, const wxRect& rect) : Base(i, rect) { }
+
+    wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz)
+        : Base(i, pt, sz)
+    {
+    }

 };
 
 
 };
 
 


@@ -674,6 +679,7 @@ struct WXDLLEXPORT wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
 
 #ifdef __VISUALC__
     #pragma warning(default: 4355)
 
 #ifdef __VISUALC__
     #pragma warning(default: 4355)

+    #pragma warning(default: 4097)

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