X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffba56edb7c5c66f772ea156038a6877ab321224..ff143598418fd629bb08e22d2f46bc8be6dddfc1:/src/mac/dcclient.cpp

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 7bb6d7a6a8..467bc66238 100644
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -17,6 +17,7 @@
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"
+#include "wx/toplevel.h"
 #include <math.h>
 
 //-----------------------------------------------------------------------------
@@ -47,13 +48,17 @@ wxWindowDC::wxWindowDC()
 
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
-	WindowRef windowref ;
-	wxWindowMac* rootwindow ;
+	wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ;
+	WindowRef windowref = rootwindow->MacGetWindowRef() ;
 	
-	// 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 ) ;
+	int x , y ;
+	x = y = 0 ;
+	the_canvas->MacWindowToRootWindow( &x , &y ) ;
+	m_macLocalOrigin.h = x ;
+	m_macLocalOrigin.v = y ;
+	CopyRgn( the_canvas->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
+	OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
+	CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
 	m_macPort = UMAGetWindowPort( windowref ) ;
 	m_minY = m_minX =  0;
 	wxSize size = the_canvas->GetSize() ;
@@ -61,7 +66,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()
@@ -78,19 +83,27 @@ wxClientDC::wxClientDC()
 
 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 ) ;
+	wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+	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.h = x ;
+	m_macLocalOrigin.v = y ;
+	SetRectRgn( m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
+	SectRgn( m_macBoundaryClipRgn , window->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
+	OffsetRgn( m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
+	OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
+	CopyRgn( m_macBoundaryClipRgn , 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() ) ;
 }
 
@@ -108,25 +121,29 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
-	WindowRef windowref ;
-	wxWindowMac* rootwindow ;
-	
-	Rect clipRect ;
-	window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
-  CopyRgn( window->GetUpdateRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
+	wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
+	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.h = x ;
+	m_macLocalOrigin.v = y ;
+	SetRectRgn( m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.y ) ;
+	SectRgn( m_macBoundaryClipRgn , window->MacGetVisibleRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
+	OffsetRgn( m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
+  SectRgn( m_macBoundaryClipRgn  , window->GetUpdateRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
+	OffsetRgn( m_macBoundaryClipRgn , m_macLocalOrigin.h , m_macLocalOrigin.v ) ;
+	CopyRgn( m_macBoundaryClipRgn , 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()