diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index 7bb6d7a6a8..efb55b34c0 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -54,6 +54,7 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas) 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() ; @@ -84,6 +85,7 @@ wxClientDC::wxClientDC(wxWindow *window) 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() ; @@ -114,6 +116,7 @@ wxPaintDC::wxPaintDC(wxWindow *window) 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 ; /* diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp index 7bb6d7a6a8..efb55b34c0 100644 --- a/src/mac/dcclient.cpp +++ b/src/mac/dcclient.cpp @@ -54,6 +54,7 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas) 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() ; @@ -84,6 +85,7 @@ wxClientDC::wxClientDC(wxWindow *window) 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() ; @@ -114,6 +116,7 @@ wxPaintDC::wxPaintDC(wxWindow *window) 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 ; /*