X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87f8a3cf25a21d173212aa7b6c8244175942d6c4..949750de631b2c2ee59c6e9080e7d38fa66c0167:/src/msw/graphics.cpp diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index ba6e529f12..e2b875612a 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -35,8 +35,9 @@ #include "wx/module.h" #endif -#include "wx/graphics.h" +#include "wx/private/graphics.h" #include "wx/msw/wrapgdip.h" +#include "wx/msw/dc.h" #include "wx/stack.h" @@ -246,6 +247,20 @@ private : GraphicsPath* m_brushPath; }; +class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsObjectRefData +{ +public: + wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap ); + wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, const wxBitmap &bmp ); + ~wxGDIPlusBitmapData (); + + virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; } + +private : + Bitmap* m_bitmap; + Bitmap* m_helper; +}; + class wxGDIPlusFontData : public wxGraphicsObjectRefData { public: @@ -281,6 +296,12 @@ public: virtual void StrokePath( const wxGraphicsPath& p ); virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxODDEVEN_RULE ); + // stroke lines connecting each of the points + virtual void StrokeLines( size_t n, const wxPoint2DDouble *points); + + // draws a polygon + virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxODDEVEN_RULE ); + virtual void Translate( wxDouble dx , wxDouble dy ); virtual void Scale( wxDouble xScale , wxDouble yScale ); virtual void Rotate( wxDouble angle ); @@ -294,6 +315,7 @@ public: // gets the matrix of this context virtual wxGraphicsMatrix GetTransform() const; + virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); virtual void PushState(); @@ -317,6 +339,26 @@ private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext) }; +class WXDLLIMPEXP_CORE wxGDIPlusMeasuringContext : public wxGDIPlusContext +{ +public: + wxGDIPlusMeasuringContext( wxGraphicsRenderer* renderer ) : wxGDIPlusContext( renderer , m_hdc = GetDC(NULL) ) + { + } + wxGDIPlusMeasuringContext() + { + } + + virtual ~wxGDIPlusMeasuringContext() + { + ReleaseDC( NULL, m_hdc ); + } + +private: + HDC m_hdc ; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusMeasuringContext) +} ; + //----------------------------------------------------------------------------- // wxGDIPlusPen implementation //----------------------------------------------------------------------------- @@ -604,6 +646,115 @@ wxGDIPlusFontData::~wxGDIPlusFontData() delete m_font; } +// the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the +// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied +// bytes as parameter, since there is no real copying of the data going in, only references are stored +// m_helper has to be kept alive as well + +//----------------------------------------------------------------------------- +// wxGDIPlusBitmapData implementation +//----------------------------------------------------------------------------- + +wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap ) : + wxGraphicsObjectRefData( renderer ), m_bitmap( bitmap ) +{ + m_helper = NULL; +} + +wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, + const wxBitmap &bmp) : wxGraphicsObjectRefData( renderer ) +{ + m_bitmap = NULL; + m_helper = NULL; + + Bitmap* image = NULL; + if ( bmp.GetMask() ) + { + Bitmap interim((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()) ; + + size_t width = interim.GetWidth(); + size_t height = interim.GetHeight(); + Rect bounds(0,0,width,height); + + image = new Bitmap(width,height,PixelFormat32bppPARGB) ; + + Bitmap interimMask((HBITMAP)bmp.GetMask()->GetMaskBitmap(),NULL); + wxASSERT(interimMask.GetPixelFormat() == PixelFormat1bppIndexed); + + BitmapData dataMask ; + interimMask.LockBits(&bounds,ImageLockModeRead, + interimMask.GetPixelFormat(),&dataMask); + + + BitmapData imageData ; + image->LockBits(&bounds,ImageLockModeWrite, PixelFormat32bppPARGB, &imageData); + + BYTE maskPattern = 0 ; + BYTE maskByte = 0; + size_t maskIndex ; + + for ( size_t y = 0 ; y < height ; ++y) + { + maskIndex = 0 ; + for( size_t x = 0 ; x < width; ++x) + { + if ( x % 8 == 0) + { + maskPattern = 0x80; + maskByte = *((BYTE*)dataMask.Scan0 + dataMask.Stride*y + maskIndex); + maskIndex++; + } + else + maskPattern = maskPattern >> 1; + + ARGB *dest = (ARGB*)((BYTE*)imageData.Scan0 + imageData.Stride*y + x*4); + if ( (maskByte & maskPattern) == 0 ) + *dest = 0x00000000; + else + { + Color c ; + interim.GetPixel(x,y,&c) ; + *dest = (c.GetValue() | Color::AlphaMask); + } + } + } + + image->UnlockBits(&imageData); + + interimMask.UnlockBits(&dataMask); + interim.UnlockBits(&dataMask); + } + else + { + image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()); + if ( bmp.HasAlpha() && GetPixelFormatSize(image->GetPixelFormat()) == 32 ) + { + size_t width = image->GetWidth(); + size_t height = image->GetHeight(); + Rect bounds(0,0,width,height); + static BitmapData data ; + + m_helper = image ; + image = NULL ; + m_helper->LockBits(&bounds, ImageLockModeRead, + m_helper->GetPixelFormat(),&data); + + image = new Bitmap(data.Width, data.Height, data.Stride, + PixelFormat32bppPARGB , (BYTE*) data.Scan0); + + m_helper->UnlockBits(&data); + } + } + if ( image ) + m_bitmap = image; +} + +wxGDIPlusBitmapData::~wxGDIPlusBitmapData() +{ + delete m_bitmap; + delete m_helper; +} + //----------------------------------------------------------------------------- // wxGDIPlusPath implementation //----------------------------------------------------------------------------- @@ -846,6 +997,27 @@ void * wxGDIPlusMatrixData::GetNativeMatrix() const //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext) +IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusMeasuringContext,wxGDIPlusContext) + +class wxGDIPlusOffsetHelper +{ +public : + wxGDIPlusOffsetHelper( Graphics* gr , bool offset ) + { + m_gr = gr; + m_offset = offset; + if ( m_offset ) + m_gr->TranslateTransform( 0.5, 0.5 ); + } + ~wxGDIPlusOffsetHelper( ) + { + if ( m_offset ) + m_gr->TranslateTransform( -0.5, -0.5 ); + } +public : + Graphics* m_gr; + bool m_offset; +} ; wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc ) : wxGraphicsContext(renderer) @@ -885,6 +1057,8 @@ void wxGDIPlusContext::Init() void wxGDIPlusContext::SetDefaults() { + m_context->SetTextRenderingHint(TextRenderingHintSystemDefault); + m_context->SetPixelOffsetMode(PixelOffsetModeHalf); m_context->SetSmoothingMode(SmoothingModeHighQuality); m_state1 = m_context->Save(); m_state2 = m_context->Save(); @@ -917,10 +1091,45 @@ void wxGDIPlusContext::ResetClip() m_context->ResetClip(); } +void wxGDIPlusContext::StrokeLines( size_t n, const wxPoint2DDouble *points) +{ + if ( !m_pen.IsNull() ) + { + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); + Point *cpoints = new Point[n]; + for (size_t i = 0; i < n; i++) + { + cpoints[i].X = (int)(points[i].m_x ); + cpoints[i].Y = (int)(points[i].m_y ); + + } // for (size_t i = 0; i < n; i++) + m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ; + delete[] cpoints; + } +} + +void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, int WXUNUSED(fillStyle) ) +{ + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); + Point *cpoints = new Point[n]; + for (size_t i = 0; i < n; i++) + { + cpoints[i].X = (int)(points[i].m_x ); + cpoints[i].Y = (int)(points[i].m_y ); + + } // for (int i = 0; i < n; i++) + if ( !m_brush.IsNull() ) + m_context->FillPolygon( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , cpoints , n ) ; + if ( !m_pen.IsNull() ) + m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ; + delete[] cpoints; +} + void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path ) { if ( !m_pen.IsNull() ) { + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); m_context->DrawPath( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , (GraphicsPath*) path.GetNativePath() ); } } @@ -929,6 +1138,7 @@ void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , int fillStyle ) { if ( !m_brush.IsNull() ) { + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); ((GraphicsPath*) path.GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding); m_context->FillPath( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , (GraphicsPath*) path.GetNativePath()); @@ -963,111 +1173,45 @@ void wxGDIPlusContext::PopState() m_context->Restore(state); } -// the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the -// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied -// bytes as parameter - -void wxGDIPlusContext::DrawBitmap( const wxBitmap &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 = NULL; - Bitmap* helper = NULL; - if ( bmp.GetMask() ) + Bitmap* image = static_cast(bmp.GetRefData())->GetGDIPlusBitmap(); + if ( image ) { - Bitmap interim((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()) ; - - size_t width = interim.GetWidth(); - size_t height = interim.GetHeight(); - Rect bounds(0,0,width,height); - - image = new Bitmap(width,height,PixelFormat32bppPARGB) ; - - Bitmap interimMask((HBITMAP)bmp.GetMask()->GetMaskBitmap(),NULL); - wxASSERT(interimMask.GetPixelFormat() == PixelFormat1bppIndexed); - - BitmapData dataMask ; - interimMask.LockBits(&bounds,ImageLockModeRead, - interimMask.GetPixelFormat(),&dataMask); - - - BitmapData imageData ; - image->LockBits(&bounds,ImageLockModeWrite, PixelFormat32bppPARGB, &imageData); - - BYTE maskPattern = 0 ; - BYTE maskByte = 0; - size_t maskIndex ; - - for ( size_t y = 0 ; y < height ; ++y) + if( image->GetWidth() != (UINT) w || image->GetHeight() != (UINT) h ) { - maskIndex = 0 ; - for( size_t x = 0 ; x < width; ++x) - { - if ( x % 8 == 0) - { - maskPattern = 0x80; - maskByte = *((BYTE*)dataMask.Scan0 + dataMask.Stride*y + maskIndex); - maskIndex++; - } - else - maskPattern = maskPattern >> 1; - - ARGB *dest = (ARGB*)((BYTE*)imageData.Scan0 + imageData.Stride*y + x*4); - if ( (maskByte & maskPattern) == 0 ) - *dest = 0x00000000; - else - { - Color c ; - interim.GetPixel(x,y,&c) ; - *dest = (c.GetValue() | Color::AlphaMask); - } - } + Rect drawRect((REAL) x, (REAL)y, (REAL)w, (REAL)h); + m_context->SetPixelOffsetMode( PixelOffsetModeNone ); + m_context->DrawImage(image, drawRect, 0 , 0 , image->GetWidth()-1, image->GetHeight()-1, UnitPixel ) ; + m_context->SetPixelOffsetMode( PixelOffsetModeHalf ); } - - image->UnlockBits(&imageData); - - interimMask.UnlockBits(&dataMask); - interim.UnlockBits(&dataMask); + else + m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ; } - else - { - image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()); - if ( GetPixelFormatSize(image->GetPixelFormat()) == 32 ) - { - size_t width = image->GetWidth(); - size_t height = image->GetHeight(); - Rect bounds(0,0,width,height); - BitmapData data ; - - helper = image ; - image = NULL ; - helper->LockBits(&bounds, ImageLockModeRead, - helper->GetPixelFormat(),&data); - - image = new Bitmap(data.Width, data.Height, data.Stride, - PixelFormat32bppPARGB , (BYTE*) data.Scan0); +} - helper->UnlockBits(&data); - } - } - if ( image ) - m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ; - delete image ; - delete helper ; +void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp); + DrawBitmap(bitmap, x, y, w, h); } void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { + // the built-in conversion fails when there is alpha in the HICON (eg XP style icons), we can only + // find out by looking at the bitmap data whether there really was alpha in it HICON hIcon = (HICON)icon.GetHICON(); ICONINFO iconInfo ; // IconInfo creates the bitmaps for color and mask, we must dispose of them after use if (!GetIconInfo(hIcon,&iconInfo)) return; - BITMAP iconBmpData ; - GetObject(iconInfo.hbmColor,sizeof(BITMAP),&iconBmpData); Bitmap interim(iconInfo.hbmColor,NULL); Bitmap* image = NULL ; + // if it's not 32 bit, it doesn't have an alpha channel, note that since the conversion doesn't + // work correctly, asking IsAlphaPixelFormat at this point fails as well if( GetPixelFormatSize(interim.GetPixelFormat())!= 32 ) { image = Bitmap::FromHICON(hIcon); @@ -1081,8 +1225,28 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD interim.LockBits(&bounds, ImageLockModeRead, interim.GetPixelFormat(),&data); + + bool hasAlpha = false; + for ( size_t y = 0 ; y < height && !hasAlpha ; ++y) + { + for( size_t x = 0 ; x < width && !hasAlpha; ++x) + { + ARGB *dest = (ARGB*)((BYTE*)data.Scan0 + data.Stride*y + x*4); + if ( ( *dest & Color::AlphaMask ) != 0 ) + hasAlpha = true; + } + } + + if ( hasAlpha ) + { image = new Bitmap(data.Width, data.Height, data.Stride, PixelFormat32bppARGB , (BYTE*) data.Scan0); + } + else + { + image = Bitmap::FromHICON(hIcon); + } + interim.UnlockBits(&data); } @@ -1100,8 +1264,7 @@ void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) wxWCharBuffer s = str.wc_str( *wxConvUI ); m_context->DrawString( s , -1 , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont() , - PointF( x , y ) , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() ); - // TODO m_backgroundMode == wxSOLID + PointF( x , y ) , StringFormat::GenericTypographic() , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() ); } void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, @@ -1123,11 +1286,11 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo f->GetSize() / ffamily.GetEmHeight(FontStyleRegular); if ( height ) - *height = rHeight * factorY + 0.5 ; + *height = rHeight * factorY; if ( descent ) - *descent = rDescent * factorY + 0.5 ; + *descent = rDescent * factorY; if ( externalLeading ) - *externalLeading = (rHeight - rAscent - rDescent) * factorY + 0.5 ; + *externalLeading = (rHeight - rAscent - rDescent) * factorY; // measuring empty strings is not guaranteed, so do it by hand if ( str.IsEmpty()) { @@ -1136,18 +1299,14 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo } else { - // MeasureString does return a rectangle that is way too large, so it is - // not usable here RectF layoutRect(0,0, 100000.0f, 100000.0f); - StringFormat strFormat; - CharacterRange strRange(0,wcslen(s)); - strFormat.SetMeasurableCharacterRanges(1,&strRange); - Region region ; - m_context->MeasureCharacterRanges(s, -1 , f,layoutRect, &strFormat,1,®ion) ; - RectF bbox ; - region.GetBounds(&bbox,m_context); + StringFormat strFormat( StringFormat::GenericTypographic() ); + strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); + + RectF bounds ; + m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, &strFormat, &bounds ) ; if ( width ) - *width = bbox.GetRight()-bbox.GetLeft()+0.5; + *width = bounds.Width; } } @@ -1165,21 +1324,21 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations")); RectF layoutRect(0,0, 100000.0f, 100000.0f); - StringFormat strFormat; + StringFormat strFormat( StringFormat::GenericTypographic() ); CharacterRange* ranges = new CharacterRange[len] ; Region* regions = new Region[len]; - size_t i; - for( i = 0 ; i < len ; ++i) + for( size_t i = 0 ; i < len ; ++i) { ranges[i].First = i ; ranges[i].Length = 1 ; } strFormat.SetMeasurableCharacterRanges(len,ranges); + strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,1,regions) ; RectF bbox ; - for ( i = 0 ; i < len ; ++i) + for ( size_t i = 0 ; i < len ; ++i) { regions[i].GetBounds(&bbox,m_context); widths[i] = bbox.GetRight()-bbox.GetLeft(); @@ -1249,6 +1408,8 @@ public : virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc); + virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc); + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ); @@ -1282,6 +1443,13 @@ public : // sets the font virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ; + + // create a native bitmap representation + virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ); + + // create a subimage from a native image representation + virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + protected : void EnsureIsLoaded(); void Load(); @@ -1337,21 +1505,28 @@ void wxGDIPlusRenderer::Unload() wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc) { EnsureIsLoaded(); - return new wxGDIPlusContext(this,(HDC) dc.GetHDC()); + wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl ); + return new wxGDIPlusContext(this,(HDC) msw->GetHDC()); +} + +wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxPrinterDC& dc) +{ + EnsureIsLoaded(); + wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl ); + return new wxGDIPlusContext(this,(HDC) msw->GetHDC()); } wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxMemoryDC& dc) { EnsureIsLoaded(); - return new wxGDIPlusContext(this,(HDC) dc.GetHDC()); + wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl ); + return new wxGDIPlusContext(this,(HDC) msw->GetHDC()); } wxGraphicsContext * wxGDIPlusRenderer::CreateMeasuringContext() { EnsureIsLoaded(); - return NULL; - // TODO use GetDC(NULL) but then we have to release it from the context - //return new wxGDIPlusContext(this,(HDC) dc.GetHDC()); + return new wxGDIPlusMeasuringContext(this); } wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeContext( void * context ) @@ -1463,6 +1638,33 @@ wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColou return wxNullGraphicsFont; } +wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap &bitmap ) +{ + EnsureIsLoaded(); + if ( bitmap.Ok() ) + { + wxGraphicsBitmap p; + p.SetRefData(new wxGDIPlusBitmapData( this , bitmap )); + return p; + } + else + return wxNullGraphicsBitmap; +} + +wxGraphicsBitmap wxGDIPlusRenderer::CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + EnsureIsLoaded(); + Bitmap* image = static_cast(bitmap.GetRefData())->GetGDIPlusBitmap(); + if ( image ) + { + wxGraphicsBitmap p; + p.SetRefData(new wxGDIPlusBitmapData( this , image->Clone( (REAL) x , (REAL) y , (REAL) w , (REAL) h , PixelFormat32bppPARGB) )); + return p; + } + else + return wxNullGraphicsBitmap; +} + // Shutdown GDI+ at app exit, before possible dll unload class wxGDIPlusRendererModule : public wxModule {