From b947276e6085a62e24c2dab826486317ed1ffcaf Mon Sep 17 00:00:00 2001 From: Blake-Madden Date: Mon, 25 Sep 2023 08:14:29 -0400 Subject: [PATCH] Fix shadowed variables --- src/base/shapes.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/base/shapes.cpp b/src/base/shapes.cpp index fe538a22..d77b4685 100644 --- a/src/base/shapes.cpp +++ b/src/base/shapes.cpp @@ -556,8 +556,8 @@ namespace Wisteria::GraphItems void ShapeRenderer::DrawBook(const wxRect rect, wxDC& dc) const { // just to reset when we are done - wxDCPenChanger pc(dc, *wxBLACK_PEN); - wxDCBrushChanger bc(dc, *wxBLACK_BRUSH); + wxDCPenChanger pcReset(dc, *wxBLACK_PEN); + wxDCBrushChanger bcReset(dc, *wxBLACK_BRUSH); const std::array bookCover = { @@ -621,9 +621,9 @@ namespace Wisteria::GraphItems pagesFront[2] }; - wxPen scaledPen(*wxRED, ScaleToScreenAndCanvas(1)); - scaledPen.SetCap(wxPenCap::wxCAP_BUTT); - DCPenChangerIfDifferent pcMain(dc, scaledPen); + wxPen scaledPenMain(*wxRED, ScaleToScreenAndCanvas(1)); + scaledPenMain.SetCap(wxPenCap::wxCAP_BUTT); + DCPenChangerIfDifferent pcMain(dc, scaledPenMain); // draw the bottom of the book {