From 0f84eca7c6aeff72afff6b82df52a0cb2132b05e Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Fri, 27 Jun 2014 05:38:11 +0000
Subject: [PATCH] Fix wxMenuItem::SetBitmap infinite recursion differently.

Don't call SetBitmap from GetHBitmapForMenu but instead handle possibly
needed bitmap modifications earlier on during SetBitmap. Allows for
GetHBitmapForMenu to be const and gets rid of the clumsy re-entry check
introduced in r76754.
Also check the bitmap for alpha presence instead of needlessly converting
the bitmap to an image and checking the latter for alpha.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/menuitem.h |  2 +-
 src/msw/menuitem.cpp      | 47 ++++++++++++---------------------------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index a7e532cb67..2e8257dfb6 100644
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -125,7 +125,7 @@ private:
     };
 
     // helper function to get a handle for bitmap associated with item
-    WXHBITMAP GetHBitmapForMenu(BitmapKind kind);
+    WXHBITMAP GetHBitmapForMenu(BitmapKind kind) const;
 
     // helper function to set/change the bitmap
     void DoSetBitmap(const wxBitmap& bmp, bool bChecked);
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 1feeb8ce20..7142c0b896 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -730,37 +730,26 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
     }
 }
 
-void wxMenuItem::DoSetBitmap(const wxBitmap& bmp, bool bChecked)
+void wxMenuItem::DoSetBitmap(const wxBitmap& bmpNew, bool bChecked)
 {
-    static bool s_insideSetBitmap = false;
+    wxBitmap& bmp = bChecked ? m_bmpChecked : m_bmpUnchecked;
+    if ( bmp.IsSameAs(bmpNew) )
+        return;
 
-    if ( bChecked )
+#if wxUSE_IMAGE
+    if ( !bmpNew.HasAlpha() && wxGetWinVersion() >= wxWinVersion_Vista)
     {
-        if ( m_bmpChecked.IsSameAs(bmp) )
-            return;
-
-        m_bmpChecked = bmp;
+        // we must use PARGB DIB for the menu bitmaps so ensure that we do
+        wxImage img(bmpNew.ConvertToImage());
+        img.InitAlpha();
+        bmp = wxBitmap(img);
     }
     else
+#endif // wxUSE_IMAGE
     {
-        if ( m_bmpUnchecked.IsSameAs(bmp) )
-            return;
-
-        m_bmpUnchecked = bmp;
+        bmp = bmpNew;
     }
 
-    if (s_insideSetBitmap)
-    {
-        // We can arrive here because of calling GetHBitmapForMenu
-        // further down below, which itself can call [Do]SetBitmap
-        // resulting in infinite recursion. After having set the
-        // bitmap just return instead.
-        return;
-    }
-
-    wxON_BLOCK_EXIT_SET(s_insideSetBitmap, false);
-    s_insideSetBitmap = true;
-
 #if wxUSE_OWNER_DRAWN
     // already marked as owner-drawn, cannot be reverted
     if ( IsOwnerDrawn() )
@@ -1377,7 +1366,7 @@ bool wxMenuItem::MSWMustUseOwnerDrawn()
 #endif // wxUSE_OWNER_DRAWN
 
 // returns the HBITMAP to use in MENUITEMINFO
-HBITMAP wxMenuItem::GetHBitmapForMenu(BitmapKind kind)
+HBITMAP wxMenuItem::GetHBitmapForMenu(BitmapKind kind) const
 {
     // Under versions of Windows older than Vista we can't pass HBITMAP
     // directly as hbmpItem for 2 reasons:
@@ -1401,15 +1390,7 @@ HBITMAP wxMenuItem::GetHBitmapForMenu(BitmapKind kind)
         wxBitmap bmp = GetBitmap(checked);
         if ( bmp.IsOk() )
         {
-            // we must use PARGB DIB for the menu bitmaps so ensure that we do
-            wxImage img(bmp.ConvertToImage());
-            if ( !img.HasAlpha() )
-            {
-                img.InitAlpha();
-                SetBitmap(img, checked);
-            }
-
-            return GetHbitmapOf(GetBitmap(checked));
+            return GetHbitmapOf(bmp);
         }
         //else: bitmap is not set
         return NULL;