Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove these codes. The code could not work correctly under x11. Redesigning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-23 17:44:47 +00:00
parent 98c68150ed
commit cf5c6861a7
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/generic/graphicc.cpp
View File

@@ -1451,25 +1451,6 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
InitSurface(bufferFormat, stride); InitSurface(bufferFormat, stride);
#endif // wxHAS_RAW_BITMAP #endif // wxHAS_RAW_BITMAP
#if defined(__WXX11__)
// In include/feature.h, wxHAS_RAW_BITMAP defined for
// __WXGTK20__, __WXMAC__, __WXDFB__ and __WXMSW__. Without WXX11.
// This is because the bitmap in x11 is plain data.
// no need to convert it.
// The code in this block will only work for X11
cairo_format_t bufferFormat = bmp.GetDepth() == 32
? CAIRO_FORMAT_ARGB32
: CAIRO_FORMAT_RGB24;
int stride = InitBuffer(bmp.GetWidth(), bmp.GetHeight(), bufferFormat);
wxBitmap bmpSource = bmp; // we need a non-const instance
m_buffer = (unsigned char*)bmp.GetBitmap();
InitSurface(bufferFormat, stride);
#endif
} }
#if wxUSE_IMAGE #if wxUSE_IMAGE