X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc300f9ffc0c83713e38d8fb123ca4515d894af2..0a21bea0dd8f42b09fbf07b220ed9d17633cdde7:/include/wx/rawbmp.h diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index 377836fc99..9de976c0ea 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -72,7 +72,7 @@ */ /* - Note: we do not use WXDLLEXPORT with classes in this file because VC++ has + Note: we do not use WXDLLIMPEXP_CORE with classes in this file because VC++ has problems with exporting inner class defined inside a specialization of a template class from a DLL. Besides, as all the methods are inline it's not really necessary to put them in DLL at all. @@ -650,7 +650,7 @@ struct wxPixelDataOut #if WXWIN_COMPATIBILITY_2_8 // not needed anymore, calls to it should be simply removed - wxDEPRECATED( inline void UseAlpha() ); + wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE ) #endif // private: -- see comment in the beginning of the file @@ -694,12 +694,6 @@ public: } }; -#if WXWIN_COMPATIBILITY_2_8 -template -inline void wxPixelDataOut::wxPixelDataIn::UseAlpha() {} -#endif - - // some "predefined" pixel data classes #if wxUSE_IMAGE typedef wxPixelData wxImagePixelData;