X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/650c0aa9180563eece310851973171cfaac83ad8..34b1fdebbf3d40caaffad62b5bf89604213afb4a:/include/wx/rawbmp.h diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index cdd4e66759..3e599a602b 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -167,6 +167,11 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat; // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 +#elif defined(__WXDFB__) + // Under DirectFB, RGB components are reversed, they're in BGR order + typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 #endif @@ -645,7 +650,7 @@ struct wxPixelDataOut<wxBitmap> #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 @@ -689,7 +694,6 @@ public: } }; - // some "predefined" pixel data classes #if wxUSE_IMAGE typedef wxPixelData<wxImage> wxImagePixelData;