Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for missing separator if any previous items were ownerdrawn

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-01-09 21:19:09 +00:00
parent a3c8c017cf
commit 3633deedb4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/menu.cpp
View File

@@ -400,14 +400,14 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
pos += 2; // for the title itself and its separator pos += 2; // for the title itself and its separator
BOOL ok = false; BOOL ok = false;
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN
// Currently, mixing owner-drawn and non-owner-drawn items results in // Currently, mixing owner-drawn and non-owner-drawn items results in
// inconsistent margins, so we force this to be owner-drawn if any other // 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 // 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 // to avoid search. Also we might make this fix unnecessary by getting the correct
// margin using NONCLIENTMETRICS. // margin using NONCLIENTMETRICS.
if ( !pItem->IsOwnerDrawn() ) if ( !pItem->IsOwnerDrawn() && !pItem->IsSeparator() )
{ {
// Check if any other items are ownerdrawn, and make ownerdrawn if so // Check if any other items are ownerdrawn, and make ownerdrawn if so
wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();