avoiding nesting dcs on the same window concurrently

[wxWidgets.git] / src / common / dcbase.cpp

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index e5063b5ed844a34657443fc7d2ac99efb4790ea0..9fcea2c8581af2394a61bff97a4994018ece52f7 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/dc.h"
+#include "wx/dcbuffer.h" // for IMPLEMENT_DYNAMIC_CLASS
 
 #ifndef WX_PRECOMP
     #include "wx/math.h"
@@ -38,6 +39,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 // implementation
 // ============================================================================
 
+IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC)
+IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC)
+
 #if WXWIN_COMPATIBILITY_2_6
 void wxDCBase::BeginDrawing()
 {
@@ -1256,8 +1260,9 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
     
     OSStatus err = CreateOverlayWindow();
     wxASSERT_MSG(  err == noErr , _("Couldn't create the overlay window") );
-
+#ifndef __LP64__
     err = QDBeginCGContext(GetWindowPort(m_overlayWindow), &m_overlayContext);
+#endif
     CGContextTranslateCTM( m_overlayContext, 0, m_height+m_y );
     CGContextScaleCTM( m_overlayContext, 1, -1 );
     wxASSERT_MSG(  err == noErr , _("Couldn't init the context on the overlay window") );
@@ -1265,6 +1270,9 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
 
 void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
 {
+// TODO CS
+       dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) );
+/*
     delete dc->m_graphicContext ;
     dc->m_graphicContext = new wxMacCGContext( m_overlayContext );
     // we are right now startin at 0,0 not at the wxWindow's origin, so most of the calculations 
@@ -1272,15 +1280,14 @@ void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
     // just to make sure :
     dc->m_macLocalOrigin.x = 0 ;
     dc->m_macLocalOrigin.y = 0 ;
+       */
     wxSize size = m_window->GetSize() ;
     dc->SetClippingRegion( 0 , 0 , size.x , size.y ) ;
 }
 
 void wxOverlayImpl::EndDrawing( wxWindowDC* dc)
 {
-    delete dc->m_graphicContext ;
-    dc->m_graphicContext = NULL ;
-
+       dc->SetGraphicsContext(NULL);
 }
 
 void wxOverlayImpl::Clear(wxWindowDC* dc) 
@@ -1294,9 +1301,10 @@ void wxOverlayImpl::Reset()
 {
     if ( m_overlayContext )
     {
+#ifndef __LP64__
         OSStatus err = QDEndCGContext(GetWindowPort(m_overlayWindow), &m_overlayContext);
         wxASSERT_MSG(  err == noErr , _("Couldn't end the context on the overlay window") );
-
+#endif
         m_overlayContext = NULL ;
     }