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 980db2b7b34a57ac6439a5cf2d45c5f69064f9d8..9fcea2c8581af2394a61bff97a4994018ece52f7 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/dc.h"
 #endif
 
 #include "wx/dc.h"

+#include "wx/dcbuffer.h" // for IMPLEMENT_DYNAMIC_CLASS

 
 #ifndef WX_PRECOMP
     #include "wx/math.h"
 
 #ifndef WX_PRECOMP
     #include "wx/math.h"


@@ -38,6 +39,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC)
+IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC)
+

 #if WXWIN_COMPATIBILITY_2_6
 void wxDCBase::BeginDrawing()
 {
 #if WXWIN_COMPATIBILITY_2_6
 void wxDCBase::BeginDrawing()
 {


@@ -1266,6 +1270,9 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
 
 void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
 {
 
 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 
     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 


@@ -1273,15 +1280,14 @@ void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
     // just to make sure :
     dc->m_macLocalOrigin.x = 0 ;
     dc->m_macLocalOrigin.y = 0 ;
     // 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)
 {
     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) 
 }
 
 void wxOverlayImpl::Clear(wxWindowDC* dc)