X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4581c9136be3b3f5d722b69b104d1f95e29de733..9cb80f3fa331228864ebc13188a0168da36a4998:/src/common/dcbufcmn.cpp

diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index 6ae9f3ef82..2e3d792400 100644
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -115,16 +115,24 @@ void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
     }
 
     SelectObject(*m_buffer);
+
+    // now that the DC is valid we can inherit the attributes (fonts, colours,
+    // layout direction, ...) from the original DC
+    if ( m_dc && m_dc->IsOk() )
+        CopyAttributes(*m_dc);
 }
 
 void wxBufferedDC::UnMask()
 {
-    wxCHECK_RET( m_dc, _T("no underlying wxDC?") );
-    wxASSERT_MSG( m_buffer && m_buffer->IsOk(), _T("invalid backing store") );
+    wxCHECK_RET( m_dc, wxT("no underlying wxDC?") );
+    wxASSERT_MSG( m_buffer && m_buffer->IsOk(), wxT("invalid backing store") );
 
     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);