X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d497dca47560bb375902c2a261d819e7470a92b3..c2ef70ec8aae8e28bfc82d59c0519d06234dd4ec:/src/mac/dcclient.cpp diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp index 74533a7442..efb55b34c0 100644 --- a/src/mac/dcclient.cpp +++ b/src/mac/dcclient.cpp @@ -51,8 +51,10 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas) wxWindowMac* rootwindow ; // this time it is really the full window - - the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow ); + Rect clipRect ; + the_canvas->MacGetPortParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow ); + SetRectRgn( m_macBoundaryClipRgn , clipRect.left , clipRect.top , clipRect.right , clipRect.bottom ) ; + CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ; m_macPort = UMAGetWindowPort( windowref ) ; m_minY = m_minX = 0; wxSize size = the_canvas->GetSize() ; @@ -80,7 +82,10 @@ wxClientDC::wxClientDC(wxWindow *window) WindowRef windowref ; wxWindowMac* rootwindow ; - window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow ); + Rect clipRect ; + window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow ); + SetRectRgn( m_macBoundaryClipRgn , clipRect.left , clipRect.top , clipRect.right , clipRect.bottom ) ; + CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ; m_macPort = UMAGetWindowPort( windowref ) ; m_minY = m_minX = 0; wxSize size = window->GetSize() ; @@ -108,8 +113,10 @@ wxPaintDC::wxPaintDC(wxWindow *window) WindowRef windowref ; wxWindowMac* rootwindow ; - window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow ); - + Rect clipRect ; + window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow ); + CopyRgn( window->GetUpdateRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ; + CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ; m_macPort = UMAGetWindowPort( windowref ) ; m_ok = TRUE ; /*