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.
2016-09-09 23:39:20 +02:00 · 2016-09-09 23:39:20 +02:00 · 61083f4871
commit 61083f4871
parent f68dad69cc
1 changed files with 2 additions and 1 deletions
--- 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