Reinstated the cell border fix (wxMSW)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 542605fe2b0b039e26bad694308879f029102b8b..ffee96c8c02f9742ddbef2a813481132d8beb6ce 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -427,12 +427,18 @@ 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 - 1, y + m_PosY);
+            dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX + m_Width - subtractMe, 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 - 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);
         }
 
         if (m_Cells)