X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9d1fd7088fb2d9f27da3d4c232029807c4eeb7..4241baae4472ef2736b8ac8c6a975b0ba398909b:/src/mac/carbon/dcclient.cpp

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 6312bc3c82..8e85da2cf5 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 <math.h>
+#include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -47,23 +49,24 @@ wxWindowDC::wxWindowDC()
 
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
-	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 ) ;
-	SectRgn( m_macBoundaryClipRgn , 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() ;
-	m_maxX = size.x  ;
-	m_maxY = size.y ; 
-
- 	m_ok = TRUE ;
+    wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ;
+    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
+    
+    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() ;
+    m_maxX = size.x  ;
+    m_maxY = size.y ; 
+
+     m_ok = TRUE ;
   SetBackground(the_canvas->MacGetBackgroundBrush());
 }
 
@@ -81,26 +84,30 @@ wxClientDC::wxClientDC()
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
-	WindowRef windowref ;
-	wxWindowMac* rootwindow ;
-	
-	Rect clipRect ;
-	wxPoint origin = window->GetClientAreaOrigin() ;
-	
-	window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
-	SetRectRgn( m_macBoundaryClipRgn , clipRect.left + origin.x , clipRect.top + origin.y , clipRect.right + origin.x , clipRect.bottom + origin.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(window->MacGetBackgroundBrush());
-	SetFont( window->GetFont() ) ;
+    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;
+    m_maxX = size.x  ;
+    m_maxY = size.y ; 
+    m_ok = TRUE ;
+    SetBackground(window->MacGetBackgroundBrush());
+    SetFont( window->GetFont() ) ;
 }
 
 wxClientDC::~wxClientDC()
@@ -117,32 +124,29 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
-	WindowRef windowref ;
-	wxWindowMac* rootwindow ;
-	
-	Rect clipRect ;
-	wxPoint origin = window->GetClientAreaOrigin() ;
-	
-	window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
-	SetRectRgn( m_macBoundaryClipRgn , clipRect.left + origin.x , clipRect.top + origin.y , clipRect.right + origin.x , clipRect.bottom + origin.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(window->MacGetBackgroundBrush());
-  SetFont(window->GetFont() ) ;
+    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_minY = m_minX =  0;
+    m_maxX = size.x  ;
+    m_maxY = size.y ; 
+    m_ok = TRUE ;
+    SetBackground(window->MacGetBackgroundBrush());
+    SetFont( window->GetFont() ) ;
 }
 
 wxPaintDC::~wxPaintDC()