avoiding nesting dcs on the same window concurrently

[wxWidgets.git] / src / dfb / dcmemory.cpp

diff --git a/src/dfb/dcmemory.cpp b/src/dfb/dcmemory.cpp
index 435667e3cd9794bf7ea4ef89b4cffd5a6254351e..036fcb81e108287e965a9c9f3fcdf4877386c071 100644 (file)
--- a/src/dfb/dcmemory.cpp
+++ b/src/dfb/dcmemory.cpp
@@ -39,8 +39,10 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
-wxMemoryDC::wxMemoryDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc))
@@ -49,6 +51,8 @@ wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc))
 
 void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 {
+    m_bmp = bitmap;
+
     if ( !bitmap.Ok() )
     {
         // select the bitmap out of the DC