git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4023
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
{
if ((!m_CanLiveOnPagebreak) &&
{
if ((!m_CanLiveOnPagebreak) &&
- m_PosY < *pagebreak && m_PosY + m_Height >= *pagebreak) {
+ m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) {
*pagebreak = m_PosY;
if (m_Next != NULL) m_Next -> AdjustPagebreak(pagebreak);
return TRUE;
*pagebreak = m_PosY;
if (m_Next != NULL) m_Next -> AdjustPagebreak(pagebreak);
return TRUE;
{
if (!m_CanLiveOnPagebreak)
return wxHtmlCell::AdjustPagebreak(pagebreak);
{
if (!m_CanLiveOnPagebreak)
return wxHtmlCell::AdjustPagebreak(pagebreak);
else {
wxHtmlCell *c = GetFirstCell();
bool rt = FALSE;
else {
wxHtmlCell *c = GetFirstCell();
bool rt = FALSE;
+ int pbrk = *pagebreak - m_PosY;
- if (c -> AdjustPagebreak(pagebreak)) rt = TRUE;
+ if (c -> AdjustPagebreak(&pbrk)) rt = TRUE;
+ if (rt) *pagebreak = pbrk + m_PosY;