From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 9 Jan 2007 21:19:09 +0000 (+0000)
Subject: Fix for missing separator if any previous items were ownerdrawn
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3633deedb4eb6245fb5c963b1cd4ef0adbcdeedd

Fix for missing separator if any previous items were ownerdrawn


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 316f1a9ce9..78c4822c0e 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -400,14 +400,14 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         pos += 2; // for the title itself and its separator
 
     BOOL ok = false;
-    
+
 #if wxUSE_OWNER_DRAWN
     // Currently, mixing owner-drawn and non-owner-drawn items results in
     // inconsistent margins, so we force this to be owner-drawn if any other
     // items already are. Later we might want to use a boolean in the wxMenu
     // to avoid search. Also we might make this fix unnecessary by getting the correct
     // margin using NONCLIENTMETRICS.
-    if ( !pItem->IsOwnerDrawn() )
+    if ( !pItem->IsOwnerDrawn() && !pItem->IsSeparator() )
     {
         // Check if any other items are ownerdrawn, and make ownerdrawn if so
         wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();