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

Use wxBitmap::GetNSImage() in Cocoa code

Browse Source 
Use Cocoa-specific function rather than generically-named GetImage().

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-09-03 21:27:58 +02:00
parent 6f4c57260b
commit be923dc9fe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/carbon/graphics.cpp
View File

@@ -2419,7 +2419,7 @@ void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDo
if (EnsureIsValid()) if (EnsureIsValid())
{ {
CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h ); CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h );
wxOSXDrawNSImage( m_cgContext, &r, bmp.GetImage()); wxOSXDrawNSImage( m_cgContext, &r, bmp.GetNSImage());
} }
#else #else
wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp); wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp);
@@ -2482,7 +2482,7 @@ void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDoubl
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
{ {
CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h ); CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h );
wxOSXDrawNSImage( m_cgContext, &r, icon.GetImage()); wxOSXDrawNSImage( m_cgContext, &r, icon.GetNSImage());
} }
#endif #endif