From: Stefan Csomor Date: Tue, 18 Dec 2012 17:59:22 +0000 (+0000) Subject: setting offsets for window and client dcs when not in a paint event, see #14904 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0ffa23cc5b1183802e8b3e0d2bed42ba097659d7 setting offsets for window and client dcs when not in a paint event, see #14904 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp index 21f3c245bd..97929e1093 100644 --- a/src/osx/carbon/dcclient.cpp +++ b/src/osx/carbon/dcclient.cpp @@ -58,6 +58,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) if ( cg == NULL ) { SetGraphicsContext( wxGraphicsContext::Create( window ) ) ; + SetDeviceOrigin(-window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize()); } else { @@ -157,7 +158,11 @@ wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *window ) : m_window->GetClientSize( &m_width , &m_height); if ( !m_window->IsShownOnScreen() ) m_width = m_height = 0; - SetDeviceOrigin( origin.x, origin.y ); + + int x0,y0; + DoGetDeviceOrigin(&x0,&y0); + SetDeviceOrigin( origin.x + x0, origin.y + y0 ); + DoSetClippingRegion( 0 , 0 , m_width , m_height ) ; }