From 61083f4871772b32b5b238342a0347e20522574b Mon Sep 17 00:00:00 2001
From: Pete Bannister <pete.bannister@gems.co.uk>
Date: Fri, 9 Sep 2016 23:39:20 +0200
Subject: [PATCH] Fix rendering of owner-drawn multi-column menus in wxMSW

Compute the item rectangle bounds correctly for the items in non-first column.

Closes #17072.
---
 src/msw/menuitem.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 8082ec2113..28f7c257ca 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -945,7 +945,8 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
         data->SeparatorMargin.ApplyTo(rcSeparator);
 
         RECT rcGutter = rcSelection;
-        rcGutter.right = data->ItemMargin.cxLeftWidth
+        rcGutter.right = rcGutter.left
+                       + data->ItemMargin.cxLeftWidth
                        + data->CheckBgMargin.cxLeftWidth
                        + data->CheckMargin.cxLeftWidth
                        + imgWidth