X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d497dca47560bb375902c2a261d819e7470a92b3..853e3ce9745af987df637c2a68c11761092a8bfe:/src/mac/carbon/dcclient.cpp diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index 74533a7442..eb9d6e467b 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -17,7 +17,9 @@ #include "wx/dcmemory.h" #include "wx/region.h" #include "wx/window.h" +#include "wx/toplevel.h" #include +#include "wx/mac/private.h" //----------------------------------------------------------------------------- // constants @@ -47,12 +49,17 @@ wxWindowDC::wxWindowDC() wxWindowDC::wxWindowDC(wxWindow *the_canvas) { - WindowRef windowref ; - wxWindowMac* rootwindow ; + wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ; + WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; - // this time it is really the full window - - the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow ); + int x , y ; + x = y = 0 ; + the_canvas->MacWindowToRootWindow( &x , &y ) ; + m_macLocalOrigin.x = x ; + m_macLocalOrigin.y = y ; + CopyRgn( (RgnHandle) the_canvas->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; + CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; m_macPort = UMAGetWindowPort( windowref ) ; m_minY = m_minX = 0; wxSize size = the_canvas->GetSize() ; @@ -60,7 +67,7 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas) m_maxY = size.y ; m_ok = TRUE ; - SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID)); + SetBackground(the_canvas->MacGetBackgroundBrush()); } wxWindowDC::~wxWindowDC() @@ -77,17 +84,27 @@ wxClientDC::wxClientDC() wxClientDC::wxClientDC(wxWindow *window) { - WindowRef windowref ; - wxWindowMac* rootwindow ; - - window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow ); + wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; + WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; + wxPoint origin = window->GetClientAreaOrigin() ; + wxSize size = window->GetClientSize() ; + int x , y ; + x = origin.x ; + y = origin.y ; + window->MacWindowToRootWindow( &x , &y ) ; + m_macLocalOrigin.x = x ; + m_macLocalOrigin.y = y ; + SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; + SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; + CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ; m_macPort = UMAGetWindowPort( windowref ) ; m_minY = m_minX = 0; - wxSize size = window->GetSize() ; m_maxX = size.x ; m_maxY = size.y ; m_ok = TRUE ; - SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID)); + SetBackground(window->MacGetBackgroundBrush()); SetFont( window->GetFont() ) ; } @@ -105,24 +122,29 @@ wxPaintDC::wxPaintDC() wxPaintDC::wxPaintDC(wxWindow *window) { - WindowRef windowref ; - wxWindowMac* rootwindow ; - - window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow ); - + wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; + WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; + wxPoint origin = window->GetClientAreaOrigin() ; + wxSize size = window->GetClientSize() ; + int x , y ; + x = origin.x ; + y = origin.y ; + window->MacWindowToRootWindow( &x , &y ) ; + m_macLocalOrigin.x = x ; + m_macLocalOrigin.y = y ; + SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ; + SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ; + SectRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) window->GetUpdateRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; + OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; + CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; m_macPort = UMAGetWindowPort( windowref ) ; - m_ok = TRUE ; - /* - wxCoord x , y ,w , h ; - window->GetUpdateRegion().GetBox( x , y , w , h ) ; m_minY = m_minX = 0; - wxSize size = window->GetSize() ; m_maxX = size.x ; m_maxY = size.y ; - SetClippingRegion( x , y , w , h ) ; - */ - SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID)); - SetFont(window->GetFont() ) ; + m_ok = TRUE ; + SetBackground(window->MacGetBackgroundBrush()); + SetFont( window->GetFont() ) ; } wxPaintDC::~wxPaintDC()