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

support for scaled bitmaps in wxMemoryDC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-25 14:19:41 +00:00
parent f8bfebfcb8
commit 7e0fda87a9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osx/core/dcmemory.cpp
View File

@@ -76,8 +76,9 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
if ( m_selected.GetDepth() != 1 ) if ( m_selected.GetDepth() != 1 )
m_selected.UseAlpha() ; m_selected.UseAlpha() ;
m_selected.BeginRawAccess() ; m_selected.BeginRawAccess() ;
m_width = bitmap.GetWidth(); m_width = bitmap.GetScaledWidth();
m_height = bitmap.GetHeight(); m_height = bitmap.GetScaledHeight();
m_contentScaleFactor = bitmap.GetScaleFactor();
CGColorSpaceRef genericColorSpace = wxMacGetGenericRGBColorSpace(); CGColorSpaceRef genericColorSpace = wxMacGetGenericRGBColorSpace();
CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP(); CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP();
@@ -100,9 +101,9 @@ void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
if (m_selected.IsOk()) if (m_selected.IsOk())
{ {
if (width) if (width)
(*width) = m_selected.GetWidth(); (*width) = m_selected.GetScaledWidth();
if (height) if (height)
(*height) = m_selected.GetHeight(); (*height) = m_selected.GetScaledHeight();
} }
else else
{ {