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

Avoid -Wdouble-promotion warnings

Browse Source
This commit is contained in:
Paul Cornett
2020-10-14 11:07:55 -07:00
parent 97655e5b21
commit b5a554b9a6
44 changed files with 208 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/html/m_tables.cpp
View File

@@ -556,7 +556,7 @@ void wxHtmlTableCell::Layout(int w)
{
// Assign with, make sure not to drop below minWidth
if (maxWidth)
m_ColsInfo[i].pixwidth = (int)(wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5);
m_ColsInfo[i].pixwidth = (int)(wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5f);
else
m_ColsInfo[i].pixwidth = wpix / j;
@@ -568,13 +568,14 @@ void wxHtmlTableCell::Layout(int w)
if (!m_ColsInfo[r].width)
minRequired += m_ColsInfo[r].minWidth;
}
const int pixwidthPrev = m_ColsInfo[i].pixwidth;
m_ColsInfo[i].pixwidth = wxMax(wxMin(wpix - minRequired, m_ColsInfo[i].pixwidth), m_ColsInfo[i].minWidth);
if (maxWidth)
{
if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5))
if (m_ColsInfo[i].pixwidth > pixwidthPrev)
{
int diff = (int)(m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5));
int diff = m_ColsInfo[i].pixwidth - pixwidthPrev;
maxWidth += diff - m_ColsInfo[i].maxWidth;
}
else