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

emoving non-native bitmap code, using common code for iOS and macOS

Browse Source 
second part, sources were missing
This commit is contained in:
Stefan Csomor
2018-09-21 20:59:36 +02:00
committed by Vadim Zeitlin
parent 266f32493e
commit 7254515c54
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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