From e368aa6911633b49bab943be43826fb7d34f3ab6 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 16 Nov 2008 23:46:58 +0000 Subject: [PATCH] Fix issues caused by making DrawBitmap/CreateBitmap non-virtual on MSW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/graphics.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index 33f39009f0..e4a71d9d41 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -1171,6 +1171,11 @@ void wxGDIPlusContext::PopState() // premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied // bytes as parameter +void wxGraphicsContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + static_cast(this)->DrawBitmap(bmp, x, y, w, h); +} + void wxGDIPlusContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { Bitmap* image = static_cast(bmp.GetRefData())->GetGDIPlusBitmap(); @@ -1611,7 +1616,7 @@ wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColou return wxNullGraphicsFont; } -wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap& bmp ) +wxGraphicsBitmap wxGraphicsRenderer::CreateBitmap( const wxBitmap& bmp ) { if ( bmp.Ok() ) {