X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffba56edb7c5c66f772ea156038a6877ab321224..bd996abe63a8ed6aa07b26856a0d7935002e3e81:/src/mac/dcclient.cpp?ds=sidebyside

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 7bb6d7a6a8..bc1a0827a4 100644
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -17,7 +17,9 @@
 #include "wx/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"
+#include "wx/toplevel.h"
 #include <math.h>
+#include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -47,13 +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
-	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.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() ;
@@ -61,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()
@@ -78,19 +84,29 @@ 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() ;
+        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_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 +124,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 = (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()