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

Fix null pointer check from 198d7c6c (r40919)

Browse Source 
operator '?:' has lower precedence than '+'

(cherry picked from commit 845444f35f)
This commit is contained in:
Paul Cornett
2015-09-06 20:56:59 -07:00
parent a0b56a2675
commit de402edc09
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/html/m_layout.cpp
View File

@@ -406,7 +406,7 @@ TAG_HANDLER_BEGIN(SUBSUP, "SUB,SUP")
m_WParser->SetScriptMode(issub ? wxHTML_SCRIPT_SUB : wxHTML_SCRIPT_SUP); m_WParser->SetScriptMode(issub ? wxHTML_SCRIPT_SUB : wxHTML_SCRIPT_SUP);
m_WParser->SetScriptBaseline( m_WParser->SetScriptBaseline(
oldbase + c ? c->GetScriptBaseline() : 0); oldbase + (c ? c->GetScriptBaseline() : 0));
// select smaller font // select smaller font
m_WParser->SetFontSize(m_WParser->GetFontSize()-2); m_WParser->SetFontSize(m_WParser->GetFontSize()-2);