From: Robin Dunn <robin@alldunn.com>
Date: Thu, 2 Feb 2006 20:59:24 +0000 (+0000)
Subject: Fix for bug #1422217.  Menu items with the checked bitmap set need to
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/84d08d87eb2b5b35881446f261faebeb0421e658

Fix for bug #1422217.  Menu items with the checked bitmap set need to
be owner drawn.  This also fixes submenu items that have a bitmap.


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

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 6924436460..4157d86fb0 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -408,7 +408,8 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         if ( pItem->GetBitmap().Ok() &&
                 !pItem->GetTextColour().Ok() &&
                     !pItem->GetBackgroundColour().Ok() &&
-                        !pItem->GetFont().Ok() )
+                        !pItem->GetFont().Ok() &&
+                            !pItem->GetBitmap(true).Ok() )
         {
             // try to use InsertMenuItem() as it's guaranteed to look correctly
             // while our owner-drawning code is not