From 453999737f127c58cd3c3948adeb1c2b4a67c417 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 25 Aug 2019 21:03:21 -0700
Subject: [PATCH] Simplification to avoid unreachable code

---
 src/propgrid/propgrid.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index a54a8788ac..7102b85170 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -2203,18 +2203,18 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
         bool suppressMarginEdge = (GetWindowStyle() & wxPG_HIDE_MARGIN) &&
             (((GetWindowStyle() & wxBORDER_MASK) == wxBORDER_THEME) ||
             (((GetWindowStyle() & wxBORDER_MASK) == wxBORDER_NONE) && ((GetParent()->GetWindowStyle() & wxBORDER_MASK) == wxBORDER_THEME)));
-#else
-        bool suppressMarginEdge = false;
-#endif
-        if (!suppressMarginEdge)
-            dc.DrawLine( greyDepth, y, greyDepth, y2 );
-        else
+        if (suppressMarginEdge)
         {
             // Blank out the margin edge
             dc.SetPen(wxPen(GetBackgroundColour()));
             dc.DrawLine( greyDepth, y, greyDepth, y2 );
             dc.SetPen( linepen );
         }
+        else
+#endif // __WXMSW__
+        {
+            dc.DrawLine(greyDepth, y, greyDepth, y2);
+        }
 
         // Splitters
         for (unsigned int i = firstCol; i <= lastCol; i++)