From a03ae1721d0252b603b61c76840b6c0a2abac66b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 9 Feb 2005 18:33:00 +0000 Subject: [PATCH] don't erase the background of wxHtmlWindow unconditionally git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/htmlwin.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 6acacdb8f6..089483b2da 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -867,9 +867,16 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) if ( !m_backBuffer ) m_backBuffer = new wxBitmap(sz.x, sz.y); dcm.SelectObject(*m_backBuffer); - dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); - dcm.Clear(); PrepareDC(dcm); + + // preserve the existing background, otherwise we'd erase anything the user + // code had drawn in its EVT_ERASE_BACKGROUND handler when we do the Blit + // back below + dcm.Blit(0, rect.GetTop(), + sz.x, rect.GetBottom() - rect.GetTop() + 1, + &dc, + 0, rect.GetTop()); + dcm.SetMapMode(wxMM_TEXT); dcm.SetBackgroundMode(wxTRANSPARENT);