Reverted change to DrawLine so it doesn't draw the last point (sorry!)

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

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 87a02961b803c240eda359182d9beaf2d87febb4..a443cc9f07456f1f2ba4bd5b7ebbce0c83025134 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -513,14 +513,14 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
                 // Draw a light grey line on the bottom to indicate that the
                 // sash is raised
                 dc.SetPen(lightShadowPen);
-                dc.DrawLine(0, h - GetEdgeMargin(edge), w-1, h - GetEdgeMargin(edge));
+                dc.DrawLine(0, h - GetEdgeMargin(edge), w, h - GetEdgeMargin(edge));
             }
             else
             {
                 // Draw a drak grey line on the top to indicate that the
                 // sash is raised
                 dc.SetPen(mediumShadowPen);
-                dc.DrawLine(1, GetEdgeMargin(edge), w-1, GetEdgeMargin(edge));
+                dc.DrawLine(1, GetEdgeMargin(edge), w, GetEdgeMargin(edge));
             }
         }
     }

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index f339b4dafe12aab7a8b210d7885d80808b4a8c42..5729050ac64eb08a65acb1586291abd9bc4f9056 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -360,8 +360,9 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
     (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL);
     (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2));
 
-    // Normalization: Windows doesn't draw the last point of the line
-    (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));
+    // Normalization: Windows doesn't draw the last point of the line.
+    // But apparently neither does GTK+, so we take it out again.
+//    (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));
 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);