Compilation/warning fixes.

[wxWidgets.git] / src / html / htmlcell.cpp

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 02e2a4c8532c783540fe492b5737fc113cc8a6cc..7881b478f0c0a572077309342880b6d440b458d2 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -68,7 +68,7 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
 
 
 
-bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const
+bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const
 {
     if ((!m_CanLiveOnPagebreak) &&
                 m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
@@ -215,10 +215,10 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const
 
 
 
-bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
+bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int* known_pagebreaks, int number_of_pages) const
 {
     if (!m_CanLiveOnPagebreak)
-        return wxHtmlCell::AdjustPagebreak(pagebreak);
+        return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, number_of_pages);
 
     else
     {
@@ -228,7 +228,7 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
 
         while (c)
         {
-            if (c->AdjustPagebreak(&pbrk))
+            if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages))
                 rt = TRUE;
             c = c->GetNext();
         }
@@ -407,24 +407,9 @@ void wxHtmlContainerCell::Layout(int w)
 
 void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {
-    int y1 = y + m_PosY;
-    int y2 = y + m_PosY + m_Height;
-
-    // If the container is visible, draw it.
-    // This calculation checks for:
-    // (1) the cell is wholly within the view, OR
-    // (2) the cell overlaps, above the view, OR
-    // (3) the cell overlaps, below the view, OR
-    // (4) the cell overlaps, above and below the view.
-    if ((y1 <= view_y2 && y1 >= view_y1) ||
-        (y2 <= view_y2 && y2 >= view_y1) ||
-        (y1 <= view_y2 && y1 >= view_y1) ||
-        (y1 <= view_y1 && y2 >= view_y2))
-
-    // Old calculation, which I believe is wrong (JACS).
-//    if ((y + m_PosY < view_y2) && (y + m_PosY + m_Height > view_y1))
+    // container visible, draw it:
+    if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1))
     {
-
         if (m_UseBkColour)
         {
             wxBrush myb = wxBrush(m_BkColour, wxSOLID);
@@ -442,18 +427,12 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
             wxPen mypen1(m_BorderColour1, 1, wxSOLID);
             wxPen mypen2(m_BorderColour2, 1, wxSOLID);
 
-            int subtractMe = 1;
-            // Check on other platforms whether we should be subtracting
-            // 1. On wxMSW, we get a notch if we do.
-#ifdef __WXMSW__
-            subtractMe = 0;
-#endif
             dc.SetPen(mypen1);
             dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX, y + m_PosY + m_Height - 1);
-            dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX + m_Width - subtractMe, y + m_PosY);
+            dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX + m_Width, y + m_PosY);
             dc.SetPen(mypen2);
             dc.DrawLine(x + m_PosX + m_Width - 1, y + m_PosY, x + m_PosX +  m_Width - 1, y + m_PosY + m_Height - 1);
-            dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width - subtractMe, y + m_PosY + m_Height - 1);
+            dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width, y + m_PosY + m_Height - 1);
         }
 
         if (m_Cells)