No longer use semi-static IDs for wxPropertyGrid embedded controls and tool bar tools.

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

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index 1d339f8ba0592833c42c46df54a83b732bd47645..2e3d79240096cad1da4fe03a8316cd8cff5ac7c4 100644 (file)
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -118,7 +118,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
-    if ( m_dc->IsOk() )
+    if ( m_dc && m_dc->IsOk() )
         CopyAttributes(*m_dc);
 }
 
@@ -130,6 +130,9 @@ void wxBufferedDC::UnMask()
     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);