wxFont can now raelly use the native fonts

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 99ee68a0fbf7f0e5e730a669f64ef0c72e091b8d..efb55b34c026be5649b5bc2a1c09c0e4ff80c9be 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -39,7 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
  * wxWindowDC
  */
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 wxWindowDC::wxWindowDC() 
 {
@@ -51,8 +51,10 @@ wxWindowDC::wxWindowDC(wxWindow *the_canvas)
        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() ;
@@ -80,7 +82,10 @@ wxClientDC::wxClientDC(wxWindow *window)
        WindowRef windowref ;
        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() ;
@@ -108,8 +113,10 @@ wxPaintDC::wxPaintDC(wxWindow *window)
        WindowRef windowref ;
        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 ;
        /*