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

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));
}
}