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

offsetting dcs correctly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-10-20 17:24:09 +00:00
parent 1e81241f3a
commit 80f0a1be13
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mac/carbon/dcclient.cpp
View File

@@ -130,9 +130,21 @@ wxWindowDC::wxWindowDC(wxWindow *window)
CGContextRef cg = (CGContextRef) window->MacGetCGContextRef(); CGContextRef cg = (CGContextRef) window->MacGetCGContextRef();
m_release = false; m_release = false;
if ( cg == NULL ) if ( cg == NULL )
{
SetGraphicsContext( wxGraphicsContext::Create( window ) ) ; SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
SetDeviceOrigin( x, y );
}
else else
{
CGContextSaveGState( cg );
m_release = true ;
// make sure the context is having its origin at the wx-window coordinates of the
// view (read at the top of window.cpp about the differences)
if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 )
CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) ); SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );
}
m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetPen( m_pen ) ;
m_graphicContext->SetBrush( m_brush ) ; m_graphicContext->SetBrush( m_brush ) ;
SetClippingRegion( 0 , 0 , m_width , m_height ) ; SetClippingRegion( 0 , 0 , m_width , m_height ) ;
@@ -155,6 +167,8 @@ wxWindowDC::~wxWindowDC()
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
if ( m_release && m_graphicContext ) if ( m_release && m_graphicContext )
{ {
CGContextRef cg = (CGContextRef) m_window->MacGetCGContextRef();
CGContextRestoreGState(cg);
// CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ; // CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ;
} }
#endif #endif
@@ -194,6 +208,7 @@ wxClientDC::wxClientDC(wxWindow *window) :
y = origin.y ; y = origin.y ;
window->MacWindowToRootWindow( &x , &y ) ; window->MacWindowToRootWindow( &x , &y ) ;
m_window->GetClientSize( &m_width , &m_height); m_window->GetClientSize( &m_width , &m_height);
SetDeviceOrigin( origin.x, origin.y );
SetClippingRegion( 0 , 0 , m_width , m_height ) ; SetClippingRegion( 0 , 0 , m_width , m_height ) ;
} }
#else #else
@@ -260,6 +275,7 @@ wxPaintDC::wxPaintDC(wxWindow *window) :
y = origin.y ; y = origin.y ;
window->MacWindowToRootWindow( &x , &y ) ; window->MacWindowToRootWindow( &x , &y ) ;
m_window->GetClientSize( &m_width , &m_height); m_window->GetClientSize( &m_width , &m_height);
SetDeviceOrigin( origin.x, origin.y );
SetClippingRegion( 0 , 0 , m_width , m_height ) ; SetClippingRegion( 0 , 0 , m_width , m_height ) ;
} }
#else #else