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

Replace wxDeprecatedGUIConstants enum values

Browse Source
This commit is contained in:
Maarten Bent
2018-11-25 20:22:35 +01:00
parent 86c49283f5
commit 39ff5b90e5
81 changed files with 257 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/html/htmlcell.cpp
View File

@@ -400,7 +400,7 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
if ( toSelection )
{
dc.SetBackgroundMode(wxSOLID);
dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
dc.SetBackground(info.GetStyle().GetSelectedTextBgColour(bg));
@@ -411,7 +411,7 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
dc.SetBackgroundMode(mode);
dc.SetTextForeground(fg);
dc.SetTextBackground(bg);
if ( mode != wxTRANSPARENT )
if ( mode != wxBRUSHSTYLE_TRANSPARENT )
dc.SetBackground(bg);
}
}
@@ -1469,23 +1469,23 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc,
if (m_Flags & wxHTML_CLR_BACKGROUND)
{
state.SetBgColour(m_Colour);
state.SetBgMode(wxSOLID);
state.SetBgMode(wxBRUSHSTYLE_SOLID);
const wxColour c = state.GetSelectionState() == wxHTML_SEL_IN
? info.GetStyle().GetSelectedTextBgColour(m_Colour)
: m_Colour;
dc.SetTextBackground(c);
dc.SetBackground(c);
dc.SetBackgroundMode(wxSOLID);
dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
}
if (m_Flags & wxHTML_CLR_TRANSPARENT_BACKGROUND)
{
state.SetBgColour(m_Colour);
state.SetBgMode(wxTRANSPARENT);
state.SetBgMode(wxBRUSHSTYLE_TRANSPARENT);
const wxColour c = state.GetSelectionState() == wxHTML_SEL_IN
? info.GetStyle().GetSelectedTextBgColour(m_Colour)
: m_Colour;
dc.SetTextBackground(c);
dc.SetBackgroundMode(wxTRANSPARENT);
dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
}
}

2
src/html/htmlwin.cpp
View File

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

2
src/html/htmprint.cpp
View File

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

2
src/html/m_fonts.cpp
View File

@@ -140,7 +140,7 @@ TAG_HANDLER_BEGIN(FONT, "FONT" )
m_WParser->SetActualBackgroundMode(oldbackmode);
m_WParser->SetActualBackgroundColor(oldbackclr);
m_WParser->GetContainer()->InsertCell(
new wxHtmlColourCell(oldbackclr, oldbackmode == wxTRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND));
new wxHtmlColourCell(oldbackclr, oldbackmode == wxBRUSHSTYLE_TRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND));
}
return true;

2
src/html/m_links.cpp
View File

@@ -110,7 +110,7 @@ TAG_HANDLER_BEGIN(A, "A")
m_WParser->SetActualBackgroundMode(oldbackmode);
m_WParser->SetActualBackgroundColor(oldbackclr);
m_WParser->GetContainer()->InsertCell(
new wxHtmlColourCell(oldbackclr, oldbackmode == wxTRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND));
new wxHtmlColourCell(oldbackclr, oldbackmode == wxBRUSHSTYLE_TRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND));
}
return true;

2
src/html/m_span.cpp
View File

@@ -69,7 +69,7 @@ TAG_HANDLER_BEGIN(SPAN, "SPAN" )
m_WParser->SetActualBackgroundMode(oldbackmode);
m_WParser->SetActualBackgroundColor(oldbackclr);
m_WParser->GetContainer()->InsertCell(
new wxHtmlColourCell(oldbackclr, oldbackmode == wxTRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND));
new wxHtmlColourCell(oldbackclr, oldbackmode == wxBRUSHSTYLE_TRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND));
}
return true;

6
src/html/winpars.cpp
View File

@@ -217,7 +217,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
m_ActualBackgroundColor = m_windowInterface
? m_windowInterface->GetHTMLBackgroundColour()
: windowColour;
m_ActualBackgroundMode = wxTRANSPARENT;
m_ActualBackgroundMode = wxBRUSHSTYLE_TRANSPARENT;
m_Align = wxHTML_ALIGN_LEFT;
m_ScriptMode = wxHTML_SCRIPT_NORMAL;
m_ScriptBaseline = 0;
@@ -248,7 +248,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
new wxHtmlColourCell
(
m_ActualBackgroundColor,
m_ActualBackgroundMode == wxTRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND
m_ActualBackgroundMode == wxBRUSHSTYLE_TRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND
)
);
@@ -766,7 +766,7 @@ void wxHtmlWinTagHandler::ApplyStyle(const wxHtmlStyleParams &styleParams)
if ( wxHtmlTag::ParseAsColour(str, &clr) )
{
m_WParser->SetActualBackgroundColor(clr);
m_WParser->SetActualBackgroundMode(wxSOLID);
m_WParser->SetActualBackgroundMode(wxBRUSHSTYLE_SOLID);
m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
}
}