X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffba56edb7c5c66f772ea156038a6877ab321224..b635e17fef75d05881f5b5db85ec5f21d1cb3750:/src/mac/carbon/dcclient.cpp?ds=inline diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index 7bb6d7a6a8..f28c6dc576 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: dcclient.cpp // Purpose: wxClientDC class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -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 @@ -43,92 +45,131 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) wxWindowDC::wxWindowDC() { + m_window = NULL ; } -wxWindowDC::wxWindowDC(wxWindow *the_canvas) +wxWindowDC::wxWindowDC(wxWindow *window) { - WindowRef windowref ; - wxWindowMac* rootwindow ; - - // this time it is really the full window - Rect clipRect ; - the_canvas->MacGetPortParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow ); - SetRectRgn( m_macBoundaryClipRgn , clipRect.left , clipRect.top , clipRect.right , clipRect.bottom ) ; - m_macPort = UMAGetWindowPort( windowref ) ; - m_minY = m_minX = 0; - wxSize size = the_canvas->GetSize() ; - m_maxX = size.x ; - m_maxY = size.y ; - - m_ok = TRUE ; - SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID)); + m_window = window ; + wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; + WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ; + + int x , y ; + x = y = 0 ; + window->MacWindowToRootWindow( &x , &y ) ; + m_macLocalOrigin.x = x ; + m_macLocalOrigin.y = y ; + CopyRgn( (RgnHandle) window->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_ok = TRUE ; + SetBackground(window->MacGetBackgroundBrush()); } wxWindowDC::~wxWindowDC() { } +void wxWindowDC::DoGetSize( int* width, int* height ) const +{ + wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); + + m_window->GetSize(width, height); +} + /* * wxClientDC */ wxClientDC::wxClientDC() { + m_window = NULL ; } wxClientDC::wxClientDC(wxWindow *window) { - WindowRef windowref ; - wxWindowMac* rootwindow ; - - Rect clipRect ; - window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow ); - SetRectRgn( m_macBoundaryClipRgn , clipRect.left , clipRect.top , clipRect.right , clipRect.bottom ) ; - 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)); - SetFont( window->GetFont() ) ; + m_window = window ; + wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ; + if (!rootwindow) + return; + 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_ok = TRUE ; + SetBackground(window->MacGetBackgroundBrush()); + SetFont( window->GetFont() ) ; } wxClientDC::~wxClientDC() { } +void wxClientDC::DoGetSize(int *width, int *height) const +{ + wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); + + m_window->GetClientSize( width, height ); +} + + /* * wxPaintDC */ wxPaintDC::wxPaintDC() { + m_window = NULL ; } wxPaintDC::wxPaintDC(wxWindow *window) { - WindowRef windowref ; - wxWindowMac* rootwindow ; - - Rect clipRect ; - window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow ); - CopyRgn( window->GetUpdateRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ; - 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_window = window ; + 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 ; + SetBackground(window->MacGetBackgroundBrush()); + SetFont( window->GetFont() ) ; } wxPaintDC::~wxPaintDC() { } + +void wxPaintDC::DoGetSize(int *width, int *height) const +{ + wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") ); + + m_window->GetClientSize( width, height ); +} + +