fix for unicode crashes by Dimitri

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

diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp
index 19d325a772483446f72f586ba7b61d7b0fd521f8..efb55b34c026be5649b5bc2a1c09c0e4ff80c9be 100644 (file)
--- a/src/mac/dcclient.cpp
+++ b/src/mac/dcclient.cpp
@@ -39,7 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
  * wxWindowDC
  */
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 wxWindowDC::wxWindowDC() 
 {
@@ -48,11 +48,13 @@ wxWindowDC::wxWindowDC()
 wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
 {
        WindowRef windowref ;
-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;
        
        // this time it is really the full window
-       
-       the_canvas->MacGetPortParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
+       Rect clipRect ;
+       the_canvas->MacGetPortParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
+       SetRectRgn( m_macBoundaryClipRgn , clipRect.left , clipRect.top , clipRect.right , clipRect.bottom ) ;
+       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_minY = m_minX =  0;
        wxSize size = the_canvas->GetSize() ;
@@ -78,9 +80,12 @@ wxClientDC::wxClientDC()
 wxClientDC::wxClientDC(wxWindow *window)
 {
        WindowRef windowref ;
-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;
        
-       window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
+       Rect clipRect ;
+       window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
+       SetRectRgn( m_macBoundaryClipRgn , clipRect.left , clipRect.top , clipRect.right , clipRect.bottom ) ;
+       CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
        m_macPort = UMAGetWindowPort( windowref ) ;
        m_minY = m_minX =  0;
        wxSize size = window->GetSize() ;
@@ -106,12 +111,15 @@ wxPaintDC::wxPaintDC()
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
        WindowRef windowref ;
-       wxWindow* rootwindow ;
+       wxWindowMac* rootwindow ;
        
-       window->MacGetPortClientParams(&m_macLocalOrigin, &m_macClipRect , &windowref , &rootwindow );
-
+       Rect clipRect ;
+       window->MacGetPortClientParams(&m_macLocalOrigin, &clipRect , &windowref , &rootwindow );
+  CopyRgn( window->GetUpdateRegion().GetWXHRGN() , m_macBoundaryClipRgn ) ;
+       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;
@@ -119,6 +127,7 @@ wxPaintDC::wxPaintDC(wxWindow *window)
        m_maxX = size.x  ;
        m_maxY = size.y ; 
        SetClippingRegion( x , y , w , h ) ;
+       */
        SetBackground(wxBrush(window->GetBackgroundColour(), wxSOLID));
        SetFont(window->GetFont() ) ;
 }