X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/884898a79a6bd2e2f8b936781f670e98fbda7e9a..77fe7204b5fa4d7f703a3d0bc2f1a4f0363f538d:/src/html/m_tables.cpp diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 0209b50ded..f50de26c79 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -576,6 +576,10 @@ void wxHtmlTableCell::Layout(int w) m_ColsInfo[i].leftpos = wpos; wpos += m_ColsInfo[i].pixwidth + m_Spacing; } + + // add the remaining space to the last column + if (m_NumCols > 0 && wpos < m_Width) + m_ColsInfo[m_NumCols-1].pixwidth += m_Width - wpos; } /* 3. sub-layout all cells: */ @@ -677,7 +681,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") oldcont = c = m_WParser->OpenContainer(); - m_Table = new wxHtmlTableCell(c, tag); + m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale()); // width: {