added additional setters for the current clip region

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 7bb6d7a6a867862469ba7dcc9977f8d406017fce..efb55b34c026be5649b5bc2a1c09c0e4ff80c9be 100644 (file)
--- 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 ) ;
        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() ;
        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 ) ;
        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() ;
        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 ) ;
        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 ;
        /*
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_ok = TRUE ;
        /*

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 7bb6d7a6a867862469ba7dcc9977f8d406017fce..efb55b34c026be5649b5bc2a1c09c0e4ff80c9be 100644 (file)
--- 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 ) ;
        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() ;
        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 ) ;
        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() ;
        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 ) ;
        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 ;
        /*
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_ok = TRUE ;
        /*