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

Fix issues caused by making DrawBitmap/CreateBitmap non-virtual on MSW.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2008-11-16 23:46:58 +00:00
parent 5df481d7cc
commit e368aa6911
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/graphics.cpp
View File

@@ -1171,6 +1171,11 @@ void wxGDIPlusContext::PopState()
// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied // premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied
// bytes as parameter // bytes as parameter
void wxGraphicsContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
{
static_cast<wxGDIPlusContext*>(this)->DrawBitmap(bmp, x, y, w, h);
}
void wxGDIPlusContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) void wxGDIPlusContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
{ {
Bitmap* image = static_cast<wxGDIPlusBitmapData*>(bmp.GetRefData())->GetGDIPlusBitmap(); Bitmap* image = static_cast<wxGDIPlusBitmapData*>(bmp.GetRefData())->GetGDIPlusBitmap();
@@ -1611,7 +1616,7 @@ wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColou
return wxNullGraphicsFont; return wxNullGraphicsFont;
} }
wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap& bmp ) wxGraphicsBitmap wxGraphicsRenderer::CreateBitmap( const wxBitmap& bmp )
{ {
if ( bmp.Ok() ) if ( bmp.Ok() )
{ {