wxBUFFER_DC_DEFAULT should be wxBUFFER_DC_OVERWRITE_BG, not PRESERVE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 7cf03a4a66d969b38d8f1b2e2863f2cf9702d63c..8385aa6d2b043a5cab8d42ab5831e6b37083727f 100644 (file)
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -30,7 +30,7 @@ enum
 
 
     // flags used by default
 
 
     // flags used by default

-    wxBUFFER_DC_DEFAULT = wxBUFFER_DC_PRESERVE_BG
+    wxBUFFER_DC_DEFAULT = wxBUFFER_DC_OVERWRITE_BG

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -89,11 +89,15 @@ private:
         }
     }
 
         }
     }
 

-    // Without the existence of a wxNullDC, this must be
-    // a pointer, else it could probably be a reference.
-    wxDC       *m_dc;
+    // the underlying DC to which we copy everything drawn on this one in
+    // UnMask()
+    //
+    // NB: Without the existence of a wxNullDC, this must be a pointer, else it
+    //     could probably be a reference.
+    wxDC *m_dc;

 
 

-    wxBitmap    m_buffer;
+    // the buffer (selected in this DC)
+    wxBitmap m_buffer;

 
     DECLARE_NO_COPY_CLASS(wxBufferedDC)
 };
 
     DECLARE_NO_COPY_CLASS(wxBufferedDC)
 };


@@ -112,18 +116,18 @@ public:
     wxBufferedPaintDC(wxWindow *window, int flags = wxBUFFER_DC_DEFAULT)
         : m_paintdc(window)
     {
     wxBufferedPaintDC(wxWindow *window, int flags = wxBUFFER_DC_DEFAULT)
         : m_paintdc(window)
     {

-        Prepare(window);
-

         Init(&m_paintdc, window->GetClientSize(), flags);
         Init(&m_paintdc, window->GetClientSize(), flags);

+
+        Prepare(window);

     }
 
     // the bitmap must be valid here
     wxBufferedPaintDC(wxWindow *window, const wxBitmap& buffer)
         : m_paintdc(window)
     {
     }
 
     // the bitmap must be valid here
     wxBufferedPaintDC(wxWindow *window, const wxBitmap& buffer)
         : m_paintdc(window)
     {

-        Prepare(window);
-

         Init(&m_paintdc, buffer);
         Init(&m_paintdc, buffer);

+
+        Prepare(window);

     }
 
     // default copy ctor ok.
     }
 
     // default copy ctor ok.