wrong directory

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

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 99ee68a0fbf7f0e5e730a669f64ef0c72e091b8d..467bc66238fe0a1fa96212e22c3b0365a0a061a2 100644 (file)
--- 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>
 
 //-----------------------------------------------------------------------------
@@ -39,7 +40,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
  * wxWindowDC
  */
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 wxWindowDC::wxWindowDC() 
 {
@@ -47,12 +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
-       
-       the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
+       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() ;
@@ -60,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()
@@ -77,17 +83,27 @@ wxClientDC::wxClientDC()
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
-       WindowRef windowref ;
-       wxWindowMac* rootwindow ;
-       
-       window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
+       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() ) ;
 }
 
@@ -105,24 +121,29 @@ wxPaintDC::wxPaintDC()
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
-       WindowRef windowref ;
-       wxWindowMac* rootwindow ;
-       
-       window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
-
+       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()