better ownership handling

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

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index 1d339f8ba0592833c42c46df54a83b732bd47645..2a8314d43e3a5495d803e03479fac09595b2b4e0 100644 (file)
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -105,6 +105,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
 
 void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
 {
 
 void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
 {

+    wxCHECK_RET( w >= -1 && h >= -1, "Invalid buffer size" );
+

     if ( !m_buffer || !m_buffer->IsOk() )
     {
         if ( w == -1 || h == -1 )
     if ( !m_buffer || !m_buffer->IsOk() )
     {
         if ( w == -1 || h == -1 )


@@ -118,7 +120,7 @@ void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
 
     // now that the DC is valid we can inherit the attributes (fonts, colours,
     // layout direction, ...) from the original DC
 
     // now that the DC is valid we can inherit the attributes (fonts, colours,
     // layout direction, ...) from the original DC

-    if ( m_dc->IsOk() )
+    if ( m_dc && m_dc->IsOk() )

         CopyAttributes(*m_dc);
 }
 
         CopyAttributes(*m_dc);
 }
 


@@ -130,6 +132,9 @@ void wxBufferedDC::UnMask()
     wxCoord x = 0,
             y = 0;
 
     wxCoord x = 0,
             y = 0;
 

+    // Ensure the scale matches the device
+    SetUserScale(1.0, 1.0);
+

     if ( m_style & wxBUFFER_CLIENT_AREA )
         GetDeviceOrigin(&x, &y);
 
     if ( m_style & wxBUFFER_CLIENT_AREA )
         GetDeviceOrigin(&x, &y);