From 058939fc084207e06d34a2c82f4c62a103516dd8 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 17 Feb 2000 22:44:07 +0000 Subject: [PATCH] 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 --- src/generic/sashwin.cpp | 4 ++-- src/msw/dc.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp index 87a02961b8..a443cc9f07 100644 --- 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 f339b4dafe..5729050ac6 100644 --- 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); -- 2.45.2