// Author: Stefan Csomor
// Modified by:
// Created: 01/02/97
-// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
wxMemoryDCImpl::~wxMemoryDCImpl()
{
- if ( m_selected.Ok() )
+ if ( m_selected.IsOk() )
{
m_selected.EndRawAccess() ;
wxDELETE(m_graphicContext);
void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
{
- if ( m_selected.Ok() )
+ if ( m_selected.IsOk() )
{
m_selected.EndRawAccess() ;
wxDELETE(m_graphicContext);
}
m_selected = bitmap;
- if (m_selected.Ok())
+ if (m_selected.IsOk())
{
if ( m_selected.GetDepth() != 1 )
m_selected.UseAlpha() ;
m_selected.BeginRawAccess() ;
- m_width = bitmap.GetWidth();
- m_height = bitmap.GetHeight();
+ m_width = bitmap.GetScaledWidth();
+ m_height = bitmap.GetScaledHeight();
+ m_contentScaleFactor = bitmap.GetScaleFactor();
CGColorSpaceRef genericColorSpace = wxMacGetGenericRGBColorSpace();
CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP();
void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
{
- if (m_selected.Ok())
+ if (m_selected.IsOk())
{
if (width)
- (*width) = m_selected.GetWidth();
+ (*width) = m_selected.GetScaledWidth();
if (height)
- (*height) = m_selected.GetHeight();
+ (*height) = m_selected.GetScaledHeight();
}
else
{