Noone is using the tests dir either.

[wxWidgets.git] / src / mac / dcclient.cpp

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 7bb6d7a6a867862469ba7dcc9977f8d406017fce..eb9d6e467be9e033484a5089a8b8a46e2f262042 100644 (file)
--- 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/dcmemory.h"
 #include "wx/region.h"
 #include "wx/window.h"

+#include "wx/toplevel.h"

 #include <math.h>
 #include <math.h>

+#include "wx/mac/private.h"

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -47,13 +49,17 @@ wxWindowDC::wxWindowDC()
 
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
 
 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() ;
        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 ;
        m_maxY = size.y ; 
 
        m_ok = TRUE ;

-  SetBackground(wxBrush(the_canvas->GetBackgroundColour(), wxSOLID));
+  SetBackground(the_canvas->MacGetBackgroundBrush());

 }
 
 wxWindowDC::~wxWindowDC()
 }
 
 wxWindowDC::~wxWindowDC()


@@ -78,19 +84,27 @@ wxClientDC::wxClientDC()
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
 
 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 = (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_macPort = UMAGetWindowPort( windowref ) ;
        m_minY = m_minX =  0;

-       wxSize size = window->GetSize() ;

        m_maxX = size.x  ;
        m_maxY = size.y ; 
        m_ok = TRUE ;
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        m_ok = TRUE ;

-       SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
+  SetBackground(window->MacGetBackgroundBrush());

        SetFont( window->GetFont() ) ;
 }
 
        SetFont( window->GetFont() ) ;
 }
 


@@ -108,25 +122,29 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
 
 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_macPort = UMAGetWindowPort( windowref ) ;

-       m_ok = TRUE ;
-       /*
-       wxCoord x , y ,w , h ;
-       window->GetUpdateRegion().GetBox( x , y , w , h ) ;

        m_minY = m_minX =  0;
        m_minY = m_minX =  0;

-       wxSize size = window->GetSize() ;

        m_maxX = size.x  ;
        m_maxY = size.y ; 
        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()
 }
 
 wxPaintDC::~wxPaintDC()