untangling dc and gc

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index e0450205976d25ec1754817814180a1b553733b2..73d0d4d301c058a9fe96fcc60c3be923f48412ff 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -17,20 +17,19 @@
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"

+    #include "wx/settings.h"
+    #include "wx/toplevel.h"
+    #include "wx/math.h"
+    #include "wx/region.h"

 #endif
 
 #endif
 

-#include "wx/region.h"
-#include "wx/toplevel.h"
-#include "wx/settings.h"
-#include "wx/math.h"
+#include "wx/graphics.h"

 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

-#define RAD2DEG 57.2957795131
-

 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------


@@ -78,7 +77,7 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
             if ( parent->IsKindOf( CLASSINFO( wxNotebook ) )
 #if wxUSE_TAB_DIALOG
                  || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )
             if ( parent->IsKindOf( CLASSINFO( wxNotebook ) )
 #if wxUSE_TAB_DIALOG
                  || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )

-#endif // wxUSE_TAB_DIALOG 
+#endif // wxUSE_TAB_DIALOG

                 )
             {
                 Rect extent = { 0 , 0 , 0 , 0 } ;
                 )
             {
                 Rect extent = { 0 , 0 , 0 , 0 } ;


@@ -121,39 +120,39 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     if (!rootwindow)
         return;
 
     if (!rootwindow)
         return;
 

-    WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;

     int x , y ;
     x = y = 0 ;
     int x , y ;
     x = y = 0 ;

-    wxSize size = window->GetSize() ;

     window->MacWindowToRootWindow( &x , &y ) ;
     window->MacWindowToRootWindow( &x , &y ) ;

-    m_macPort = UMAGetWindowPort( windowref ) ;

     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS
     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS

-    m_macLocalOriginInPort.x = x ;
-    m_macLocalOriginInPort.y = y ;
-
-    if ( window->MacGetCGContextRef() )
+    m_window->GetSize( &m_width , &m_height);
+    CGContextRef cg = (CGContextRef) window->MacGetCGContextRef();
+    m_release = false;
+    if ( cg == NULL )

     {
     {

-        m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
+        SetGraphicsContext( wxGraphicsContext::Create( window ) ) ;
+        SetDeviceOrigin( x, y );

     }
     else
     {
     }
     else
     {

-        // as out of order redraw is not supported under CQ, we have to create a qd port for these
-        // situations
-        m_macLocalOrigin.x = x ;
-        m_macLocalOrigin.y = y ;
-
-        m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
+        CGContextSaveGState( cg );
+        m_release = true ;
+        // make sure the context is having its origin at the wx-window coordinates of the 
+        // view (read at the top of window.cpp about the differences)
+        if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 )
+            CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
+
+        SetGraphicsContext( wxGraphicsContext::CreateFromNative( cg ) );

     }
     }

-    // there is no out-of-order drawing on OSX
+    m_graphicContext->SetPen( m_pen ) ;
+    m_graphicContext->SetBrush( m_brush ) ;
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;

 #else
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
 #else
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;

+    m_macPort = UMAGetWindowPort( (WindowRef) rootwindow->MacGetWindowRef() ) ;
+

     CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;


@@ -165,13 +164,27 @@ wxWindowDC::wxWindowDC(wxWindow *window)
 
 wxWindowDC::~wxWindowDC()
 {
 
 wxWindowDC::~wxWindowDC()
 {

+#if wxMAC_USE_CORE_GRAPHICS
+    if ( m_release && m_graphicContext )
+    {
+        CGContextRef cg = (CGContextRef) m_window->MacGetCGContextRef();
+        CGContextRestoreGState(cg);
+        //CGContextRef cg = (CGContextRef) m_graphicContext->GetNativeContext() ;
+    }
+#endif

 }
 
 void wxWindowDC::DoGetSize( int* width, int* height ) const
 {
 }
 
 void wxWindowDC::DoGetSize( int* width, int* height ) const
 {

+#if wxMAC_USE_CORE_GRAPHICS
+    if ( width )
+        *width = m_width;
+    if ( height )
+        *height = m_height;
+#else

     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );

-

     m_window->GetSize(width, height);
     m_window->GetSize(width, height);

+#endif

 }
 
 /*
 }
 
 /*


@@ -183,6 +196,21 @@ wxClientDC::wxClientDC()
     m_window = NULL ;
 }
 
     m_window = NULL ;
 }
 

+#if wxMAC_USE_CORE_GRAPHICS
+wxClientDC::wxClientDC(wxWindow *window) :
+    wxWindowDC( window )
+{
+    wxPoint origin = window->GetClientAreaOrigin() ;
+    wxSize size = window->GetClientSize() ;
+    int x , y ;
+    x = origin.x ;
+    y = origin.y ;
+    window->MacWindowToRootWindow( &x , &y ) ;
+    m_window->GetClientSize( &m_width , &m_height);
+    SetDeviceOrigin( origin.x, origin.y );
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;
+}
+#else

 wxClientDC::wxClientDC(wxWindow *window)
 {
     m_window = window ;
 wxClientDC::wxClientDC(wxWindow *window)
 {
     m_window = window ;


@@ -200,27 +228,6 @@ wxClientDC::wxClientDC(wxWindow *window)
     m_macPort = UMAGetWindowPort( windowref ) ;
     m_ok = true ;
 
     m_macPort = UMAGetWindowPort( windowref ) ;
     m_ok = true ;
 

-#if wxMAC_USE_CORE_GRAPHICS
-    m_macLocalOriginInPort.x = x ;
-    m_macLocalOriginInPort.y = y ;
-    if ( window->MacGetCGContextRef() )
-    {
-        m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
-        SetClippingRegion( 0 , 0 , size.x , size.y ) ;
-    }
-    else
-    {
-        // as out of order redraw is not supported under CQ,
-        // we have to create a QD port for these situations
-        m_macLocalOrigin.x = x ;
-        m_macLocalOrigin.y = y ;
-        m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
-        m_graphicContext->SetPen( m_pen ) ;
-        m_graphicContext->SetBrush( m_brush ) ;
-     }
-#else

     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , origin.x , origin.y , origin.x + size.x , origin.y + size.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 ) ;


@@ -228,31 +235,24 @@ wxClientDC::wxClientDC(wxWindow *window)
     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 ) ;
     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 ) ;

-#endif

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

+#endif

 
 wxClientDC::~wxClientDC()
 {
 
 wxClientDC::~wxClientDC()
 {

-#if wxMAC_USE_CORE_GRAPHICS
-/*
-    if ( m_window->MacGetCGContextRef() == 0)
-    {
-        CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ;
-        CGContextFlush( cgContext ) ;
-    }
-*/
-#endif

 }
 
 }
 

+#if !wxMAC_USE_CORE_GRAPHICS

 void wxClientDC::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
 
     m_window->GetClientSize( width, height );
 }
 void wxClientDC::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
 
     m_window->GetClientSize( width, height );
 }

+#endif

 
 /*
  * wxPaintDC
 
 /*
  * wxPaintDC


@@ -263,6 +263,21 @@ wxPaintDC::wxPaintDC()
     m_window = NULL ;
 }
 
     m_window = NULL ;
 }
 

+#if wxMAC_USE_CORE_GRAPHICS
+wxPaintDC::wxPaintDC(wxWindow *window) :
+    wxWindowDC( window )
+{
+    wxPoint origin = window->GetClientAreaOrigin() ;
+    wxSize size = window->GetClientSize() ;
+    int x , y ;
+    x = origin.x ;
+    y = origin.y ;
+    window->MacWindowToRootWindow( &x , &y ) ;
+    m_window->GetClientSize( &m_width , &m_height);
+    SetDeviceOrigin( origin.x, origin.y );
+    SetClippingRegion( 0 , 0 , m_width , m_height ) ;
+}
+#else

 wxPaintDC::wxPaintDC(wxWindow *window)
 {
     m_window = window ;
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
     m_window = window ;


@@ -278,8 +293,6 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS
     m_ok = true ;
 
 #if wxMAC_USE_CORE_GRAPHICS

-    m_macLocalOriginInPort.x = x ;
-    m_macLocalOriginInPort.y = y ;

     if ( window->MacGetCGContextRef() )
     {
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
     if ( window->MacGetCGContextRef() )
     {
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;


@@ -308,14 +321,17 @@ wxPaintDC::wxPaintDC(wxWindow *window)
 
     SetFont( window->GetFont() ) ;
 }
 
     SetFont( window->GetFont() ) ;
 }

+#endif

 
 wxPaintDC::~wxPaintDC()
 {
 }
 
 
 wxPaintDC::~wxPaintDC()
 {
 }
 

+#if !wxMAC_USE_CORE_GRAPHICS

 void wxPaintDC::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
 
     m_window->GetClientSize( width, height );
 }
 void wxPaintDC::DoGetSize(int *width, int *height) const
 {
     wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
 
     m_window->GetClientSize( width, height );
 }

+#endif