From 3ee9771b36607412f780f668961d59bb229c84e6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Oct 2012 22:39:20 +0000
Subject: [PATCH] No real changes, just don't use brush styles for background
 mode in wxHTML.

Use just wxTRANSPARENT and wxSOLID instead of wxBRUSHSTYLE_TRANSPARENT and
wxBRUSHSTYLE_SOLID when changing the background mode.

See #14599.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/html/htmlcell.cpp | 2 +-
 src/html/htmlwin.cpp  | 2 +-
 src/html/htmprint.cpp | 2 +-
 src/html/winpars.cpp  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 9966a16c09..53699fc856 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -496,7 +496,7 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
 
     if ( toSelection )
     {
-        dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
+        dc.SetBackgroundMode(wxSOLID);
         dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
         dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
         dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg),
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 22ac09f009..52ba2a51c4 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -1167,7 +1167,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     // draw the HTML window contents
     dc->SetMapMode(wxMM_TEXT);
-    dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    dc->SetBackgroundMode(wxTRANSPARENT);
     dc->SetLayoutDirection(GetLayoutDirection());
 
     wxHtmlRenderingInfo rinfo;
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index b91f4b1d08..96d32d97c3 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -534,7 +534,7 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
                       (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
                       (double)ppiPrinterY / (double)ppiScreenY);
 
-    dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    dc->SetBackgroundMode(wxTRANSPARENT);
 
     m_Renderer->Render((int) (ppmm_h * m_MarginLeft),
                          (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), m_PageBreaks,
diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 09bd92284a..2043afea64 100644
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -219,7 +219,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
     m_ActualBackgroundColor = m_windowInterface
                             ? m_windowInterface->GetHTMLBackgroundColour()
                             : windowColour;
-    m_ActualBackgroundMode = wxBRUSHSTYLE_TRANSPARENT;
+    m_ActualBackgroundMode = wxTRANSPARENT;
     m_Align = wxHTML_ALIGN_LEFT;
     m_ScriptMode = wxHTML_SCRIPT_NORMAL;
     m_ScriptBaseline = 0;
@@ -250,7 +250,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
                    new wxHtmlColourCell
                        (
                          m_ActualBackgroundColor,
-                         m_ActualBackgroundMode == wxBRUSHSTYLE_TRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND
+                         m_ActualBackgroundMode == wxTRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND
                        )
                   );
 
-- 
2.45.2