fix extra comma at the end of wxStretch enum introduced by last commit

[wxWidgets.git] / include / wx / dcbuffer.h

diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 1b12cc6f055f47b01df3bb03cd50c75a2a850fcd..0f4e896d9fe8aa4c3609ed11dabc7eb6e0afcfc3 100644 (file)
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -43,15 +43,16 @@ public:
     // Default ctor, must subsequently call Init for two stage construction.
     wxBufferedDC()
         : m_dc(NULL),
     // 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,
           m_style(0)
     {
     }
 
     // Construct a wxBufferedDC using a user supplied buffer.
     wxBufferedDC(wxDC *dc,

-                 const wxBitmap& buffer = wxNullBitmap,
+                 wxBitmap& buffer = wxNullBitmap,

                  int style = wxBUFFER_CLIENT_AREA)
                  int style = wxBUFFER_CLIENT_AREA)

-        : m_dc(NULL)
+        : m_dc(NULL), m_buffer(NULL)

     {
         Init(dc, buffer, style);
     }
     {
         Init(dc, buffer, style);
     }


@@ -60,7 +61,7 @@ public:
     // (where area is usually something like the size of the window
     // being buffered)
     wxBufferedDC(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_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(NULL)
+        : m_dc(NULL), m_buffer(NULL)

     {
         Init(dc, area, style);
     }
     {
         Init(dc, area, style);
     }


@@ -74,12 +75,12 @@ public:
 
     // These reimplement the actions of the ctors for two stage creation
     void Init(wxDC *dc,
 
     // These reimplement the actions of the ctors for two stage creation
     void Init(wxDC *dc,

-              const wxBitmap& buffer = wxNullBitmap,
+              wxBitmap& buffer = wxNullBitmap,

               int style = wxBUFFER_CLIENT_AREA)
     {
         InitCommon(dc, style);
 
               int style = wxBUFFER_CLIENT_AREA)
     {
         InitCommon(dc, style);
 

-        m_buffer = buffer;
+        m_buffer = &buffer;

 
         UseBuffer();
     }
 
         UseBuffer();
     }


@@ -100,7 +101,7 @@ public:
     void UnMask()
     {
         wxCHECK_RET( m_dc, _T("no underlying wxDC?") );
     void UnMask()
     {
         wxCHECK_RET( m_dc, _T("no underlying wxDC?") );

-        wxASSERT_MSG( m_buffer.IsOk(), _T("invalid backing store") );
+        wxASSERT_MSG( m_buffer && m_buffer->IsOk(), _T("invalid backing store") );

 
         wxCoord x = 0,
                 y = 0;
 
         wxCoord x = 0,
                 y = 0;


@@ -108,7 +109,7 @@ public:
         if ( m_style & wxBUFFER_CLIENT_AREA )
             GetDeviceOrigin(&x, &y);
 
         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;
     }
                    this, -x, -y );
         m_dc = NULL;
     }


@@ -142,7 +143,7 @@ private:
     wxDC *m_dc;
 
     // the buffer (selected in this DC), initially invalid
     wxDC *m_dc;
 
     // the buffer (selected in this DC), initially invalid

-    wxBitmap m_buffer;
+    wxBitmap *m_buffer;

 
     // the buffering style
     int m_style;
 
     // the buffering style
     int m_style;


@@ -162,17 +163,17 @@ class WXDLLEXPORT wxBufferedPaintDC : public wxBufferedDC
 {
 public:
     // If no bitmap is supplied by the user, a temporary one will be created.
 {
 public:
     // If no bitmap is supplied by the user, a temporary one will be created.

-    wxBufferedPaintDC(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA)
+    wxBufferedPaintDC(wxWindow *window, wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA)

         : m_paintdc(window)
     {
         // If we're buffering the virtual window, scale the paint DC as well
         if (style & wxBUFFER_VIRTUAL_AREA)
             window->PrepareDC( m_paintdc );
 
         : m_paintdc(window)
     {
         // If we're buffering the virtual window, scale the paint DC as well
         if (style & wxBUFFER_VIRTUAL_AREA)
             window->PrepareDC( m_paintdc );
 

-        if( buffer != wxNullBitmap )
+        if( buffer.IsOk() )

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

-            Init(&m_paintdc, window->GetClientSize(), style);
+            Init(&m_paintdc, GetBufferedSize(window, style), style);

     }
 
     // If no bitmap is supplied by the user, a temporary one will be created.
     }
 
     // If no bitmap is supplied by the user, a temporary one will be created.


@@ -183,7 +184,7 @@ public:
         if (style & wxBUFFER_VIRTUAL_AREA)
             window->PrepareDC( m_paintdc );
 
         if (style & wxBUFFER_VIRTUAL_AREA)
             window->PrepareDC( m_paintdc );
 

-        Init(&m_paintdc, window->GetClientSize(), style);
+        Init(&m_paintdc, GetBufferedSize(window, style), style);

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


@@ -195,6 +196,15 @@ public:
         UnMask();
     }
 
         UnMask();
     }
 

+protected:
+    // return the size needed by the buffer: this depends on whether we're
+    // buffering just the currently shown part or the total (scrolled) window
+    static wxSize GetBufferedSize(wxWindow *window, int style)
+    {
+        return style & wxBUFFER_VIRTUAL_AREA ? window->GetVirtualSize()
+                                             : window->GetClientSize();
+    }
+

 private:
     wxPaintDC m_paintdc;
 
 private:
     wxPaintDC m_paintdc;