X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3103e8a97e834e9793f0eb149aa82a99fd64ef9a..991d57f8443fc8a31c2ad3e3a8180af08a6394d6:/include/wx/rawbmp.h?ds=inline diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index 43e20ab6ed..f9a8df2ab7 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -71,11 +71,6 @@ } */ -#ifdef __VISUALC__ - // VC++ gives an absolutely harmless warning for wxPixelData ctor - #pragma warning(disable: 4355) // 'this' used in initializer list -#endif - /* Note: we do not use WXDLLEXPORT with classes in this file because VC++ has problems with exporting inner class defined inside a specialization of a @@ -170,7 +165,7 @@ typedef wxPixelFormat wxImagePixelFormat; #define wxPIXEL_FORMAT_ALPHA 3 #elif defined(__WXGTK__) // Under GTK+ 2.X we use GdkPixbuf, which should be RGBA - typedef wxPixelFormat wxNativePixelFormat; + typedef wxPixelFormat wxNativePixelFormat; #define wxPIXEL_FORMAT_ALPHA 3 #endif @@ -657,14 +652,6 @@ struct wxPixelDataOut }; #endif //wxUSE_GUI -#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 wxPixelData : public wxPixelDataOut::template wxPixelDataIn @@ -712,14 +699,9 @@ typedef wxPixelData wxAlphaPixelData; partial template specialization then and neither VC6 nor VC7 provide it. */ template < class Image, class PixelFormat = wxPixelFormatFor > -struct wxPixelIterator : wxPixelData::Iterator +struct wxPixelIterator : public wxPixelData::Iterator { }; -#ifdef __VISUALC__ - #pragma warning(default: 4355) - #pragma warning(default: 4097) -#endif - #endif // _WX_RAWBMP_H_BASE_