X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/653752be8a1d2a2e14da6aa225f0ce3e393909ad..56c6aab7e6fe6dccd753fd94d07a44ded2ba70d1:/include/wx/dcbuffer.h diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h index 85f5f6cef4..ef5383bbdf 100644 --- a/include/wx/dcbuffer.h +++ b/include/wx/dcbuffer.h @@ -18,7 +18,7 @@ // Split platforms into two groups - those which have well-working // double-buffering by default, and those which do not. -#if defined(__WXMAC__) || defined(__WXGTK20__) +#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__) #define wxALWAYS_NATIVE_DOUBLE_BUFFER 1 #else #define wxALWAYS_NATIVE_DOUBLE_BUFFER 0 @@ -41,58 +41,55 @@ class WXDLLEXPORT wxBufferedDC : public wxMemoryDC { public: // Default ctor, must subsequently call Init for two stage construction. - wxBufferedDC() : m_dc( 0 ), m_style(0) + 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, + wxBitmap& buffer = wxNullBitmap, int style = wxBUFFER_CLIENT_AREA) - : m_dc( dc ), - m_buffer( buffer ), - m_style(style) + : m_dc(NULL), m_buffer(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( area.GetWidth(), area.GetHeight() ), - m_style(style) - + wxBufferedDC(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) + : m_dc(NULL), m_buffer(NULL) { - UseBuffer(); + Init(dc, area, style); } - // default copy ctor ok. - // The usually desired action in the dtor is to blit the buffer. virtual ~wxBufferedDC() { - if ( m_dc ) UnMask(); + if ( m_dc ) + 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, + wxBitmap& buffer = wxNullBitmap, int style = wxBUFFER_CLIENT_AREA) { - wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap, - _T("wxBufferedDC already initialised") ); - m_dc = dc; - m_buffer = buffer; - m_style = style; + InitCommon(dc, style); + + m_buffer = &buffer; + UseBuffer(); } void Init(wxDC *dc, const wxSize &area, int style = wxBUFFER_CLIENT_AREA) { - Init(dc, wxBitmap(area.GetWidth(), area.GetHeight()), style); + InitCommon(dc, style); + + UseBuffer(area.x, area.y); } // Blits the buffer to the dc, and detaches the dc from the buffer (so it @@ -103,17 +100,17 @@ public: // blitting to) is destroyed. void UnMask() { - wxASSERT_MSG( m_dc != 0, - _T("No underlying DC associated with wxBufferedDC (anymore)") ); + wxCHECK_RET( m_dc, _T("no underlying wxDC?") ); + wxASSERT_MSG( m_buffer && m_buffer->IsOk(), _T("invalid backing store") ); - wxCoord x=0, y=0; + wxCoord x = 0, + y = 0; - if (m_style & wxBUFFER_CLIENT_AREA) + if ( m_style & wxBUFFER_CLIENT_AREA ) GetDeviceOrigin(&x, &y); - m_dc->Blit( 0, 0, - m_buffer.GetWidth(), m_buffer.GetHeight(), this, - -x, -y ); + m_dc->Blit(0, 0, m_buffer->GetWidth(), m_buffer->GetHeight(), + this, -x, -y ); m_dc = NULL; } @@ -122,19 +119,22 @@ public: int GetStyle() const { return m_style; } private: - // check that the bitmap is valid and use it - void UseBuffer() + // common part of Init()s + void InitCommon(wxDC *dc, int style) { - if (!m_buffer.Ok()) - { - wxCoord w, h; - m_dc->GetSize(&w, &h); - m_buffer = wxBitmap(w, h); - } - - SelectObject(m_buffer); + wxASSERT_MSG( !m_dc, _T("wxBufferedDC already initialised") ); + + m_dc = dc; + m_style = style; + + // inherit the same layout direction as the original DC + if (dc && dc->IsOk()) + SetLayoutDirection(dc->GetLayoutDirection()); } + // check that the bitmap is valid and use it + void UseBuffer(wxCoord w = -1, wxCoord h = -1); + // the underlying DC to which we copy everything drawn on this one in // UnMask() // @@ -142,8 +142,8 @@ private: // could probably be a reference. wxDC *m_dc; - // the buffer (selected in this DC) - wxBitmap m_buffer; + // the buffer (selected in this DC), initially invalid + wxBitmap *m_buffer; // the buffering style int m_style; @@ -163,14 +163,14 @@ class WXDLLEXPORT wxBufferedPaintDC : public wxBufferedDC { 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 ); - if( buffer != wxNullBitmap ) + if( buffer.IsOk() ) Init(&m_paintdc, buffer, style); else Init(&m_paintdc, window->GetClientSize(), style); @@ -238,7 +238,7 @@ private: { // Help the user to get the double-buffering working properly. wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_CUSTOM, - wxT("In constructor, you need to call GetBackgroundStyle(wxBG_STYLE_CUSTOM), ") + wxT("In constructor, you need to call SetBackgroundStyle(wxBG_STYLE_CUSTOM), ") wxT("and also, if needed, paint the background manually in the paint event handler.")); } @@ -263,6 +263,5 @@ inline wxDC* wxAutoBufferedPaintDCFactory(wxWindow* window) else return new wxBufferedPaintDC(window); } - #endif // _WX_DCBUFFER_H_