X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1ed79a980600debf172879d72b25f77f747c000..d8dd214c1bccfd7a7defdbbedd69aef706a8816b:/include/wx/dcbuffer.h

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 4c0b1e954a..1b12cc6f05 100644
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -43,36 +43,28 @@ public:
     // Default ctor, must subsequently call Init for two stage construction.
     wxBufferedDC()
         : m_dc(NULL),
-          m_buffer(NULL),
           m_style(0)
     {
     }
 
     // Construct a wxBufferedDC using a user supplied buffer.
     wxBufferedDC(wxDC *dc,
-                 const wxBitmap &buffer = wxNullBitmap,
+                 const wxBitmap& buffer = wxNullBitmap,
                  int style = wxBUFFER_CLIENT_AREA)
-        : m_dc(dc),
-          m_buffer(&buffer),
-          m_style(style)
+        : m_dc(NULL)
     {
-        UseBuffer();
+        Init(dc, buffer, style);
     }
 
     // Construct a wxBufferedDC with an internal buffer of 'area'
     // (where area is usually something like the size of the window
     // being buffered)
-    wxBufferedDC(wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA)
-        : m_dc(dc),
-          m_buffer(NULL),
-          m_style(style)
-
+    wxBufferedDC(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA)
+        : m_dc(NULL)
     {
-        UseBuffer(area.x, area.y);
+        Init(dc, area, style);
     }
 
-    // default copy ctor ok.
-
     // The usually desired  action in the dtor is to blit the buffer.
     virtual ~wxBufferedDC()
     {
@@ -80,15 +72,14 @@ public:
             UnMask();
     }
 
-    // These reimplement the actions of the ctors for two stage creation, but
-    // are not used by the ctors themselves to save a few cpu cycles.
+    // These reimplement the actions of the ctors for two stage creation
     void Init(wxDC *dc,
               const wxBitmap& buffer = wxNullBitmap,
               int style = wxBUFFER_CLIENT_AREA)
     {
         InitCommon(dc, style);
 
-        m_buffer = &buffer;
+        m_buffer = buffer;
 
         UseBuffer();
     }
@@ -108,7 +99,8 @@ public:
     // blitting to) is destroyed.
     void UnMask()
     {
-        wxCHECK_RET( m_dc, _T("No underlying DC in wxBufferedDC") );
+        wxCHECK_RET( m_dc, _T("no underlying wxDC?") );
+        wxASSERT_MSG( m_buffer.IsOk(), _T("invalid backing store") );
 
         wxCoord x = 0,
                 y = 0;
@@ -116,7 +108,7 @@ public:
         if ( m_style & wxBUFFER_CLIENT_AREA )
             GetDeviceOrigin(&x, &y);
 
-        m_dc->Blit(0, 0, m_buffer->GetWidth(), m_buffer->GetHeight(),
+        m_dc->Blit(0, 0, m_buffer.GetWidth(), m_buffer.GetHeight(),
                    this, -x, -y );
         m_dc = NULL;
     }
@@ -129,14 +121,14 @@ private:
     // common part of Init()s
     void InitCommon(wxDC *dc, int style)
     {
-        wxASSERT_MSG( !m_dc && !m_buffer, _T("wxBufferedDC already initialised") );
-        wxCHECK_RET( dc, _T("can't associate NULL DC with wxBufferedDC") );
+        wxASSERT_MSG( !m_dc, _T("wxBufferedDC already initialised") );
 
         m_dc = dc;
         m_style = style;
 
         // inherit the same layout direction as the original DC
-        SetLayoutDirection(dc->GetLayoutDirection());
+        if (dc && dc->IsOk())
+            SetLayoutDirection(dc->GetLayoutDirection());
     }
 
     // check that the bitmap is valid and use it
@@ -149,8 +141,8 @@ private:
     //     could probably be a reference.
     wxDC *m_dc;
 
-    // the buffer (selected in this DC)
-    const wxBitmap *m_buffer;
+    // the buffer (selected in this DC), initially invalid
+    wxBitmap m_buffer;
 
     // the buffering style
     int m_style;
@@ -270,6 +262,5 @@ inline wxDC* wxAutoBufferedPaintDCFactory(wxWindow* window)
     else
         return new wxBufferedPaintDC(window);
 }
-            
 
 #endif  // _WX_DCBUFFER_H_