Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No real changes, just don't use brush styles for background mode in wxHTML.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-10-07 22:39:20 +00:00
parent 0d7acfb995
commit 3ee9771b36
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/html/htmlcell.cpp
View File

@@ -496,7 +496,7 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
if ( toSelection ) if ( toSelection )
{ {
dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID); dc.SetBackgroundMode(wxSOLID);
dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg)); dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg)); dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg), dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg),

2
src/html/htmlwin.cpp
View File

@@ -1167,7 +1167,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
// draw the HTML window contents // draw the HTML window contents
dc->SetMapMode(wxMM_TEXT); dc->SetMapMode(wxMM_TEXT);
dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); dc->SetBackgroundMode(wxTRANSPARENT);
dc->SetLayoutDirection(GetLayoutDirection()); dc->SetLayoutDirection(GetLayoutDirection());
wxHtmlRenderingInfo rinfo; wxHtmlRenderingInfo rinfo;

2
src/html/htmprint.cpp
View File

@@ -534,7 +534,7 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
(double)ppiPrinterY / TYPICAL_SCREEN_DPI, (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
(double)ppiPrinterY / (double)ppiScreenY); (double)ppiPrinterY / (double)ppiScreenY);
dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); dc->SetBackgroundMode(wxTRANSPARENT);
m_Renderer->Render((int) (ppmm_h * m_MarginLeft), m_Renderer->Render((int) (ppmm_h * m_MarginLeft),
(int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), m_PageBreaks, (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), m_PageBreaks,

4
src/html/winpars.cpp
View File

@@ -219,7 +219,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
m_ActualBackgroundColor = m_windowInterface m_ActualBackgroundColor = m_windowInterface
? m_windowInterface->GetHTMLBackgroundColour() ? m_windowInterface->GetHTMLBackgroundColour()
: windowColour; : windowColour;
m_ActualBackgroundMode = wxBRUSHSTYLE_TRANSPARENT; m_ActualBackgroundMode = wxTRANSPARENT;
m_Align = wxHTML_ALIGN_LEFT; m_Align = wxHTML_ALIGN_LEFT;
m_ScriptMode = wxHTML_SCRIPT_NORMAL; m_ScriptMode = wxHTML_SCRIPT_NORMAL;
m_ScriptBaseline = 0; m_ScriptBaseline = 0;
@@ -250,7 +250,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
new wxHtmlColourCell new wxHtmlColourCell
( (
m_ActualBackgroundColor, m_ActualBackgroundColor,
m_ActualBackgroundMode == wxBRUSHSTYLE_TRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND m_ActualBackgroundMode == wxTRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND
) )
); );