Move GetBitmapFromBundle() to wxMenuItemBase

This is just a refactoring to avoid duplicating this function code in
all ports and just have it once in the base class.

include/wx/gtk/menuitem.h

@@ -9,8 +9,6 @@
 #ifndef _WX_GTKMENUITEM_H_
 #define _WX_GTKMENUITEM_H_
 
-#include "wx/bmpbndl.h"
-
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------

include/wx/menuitem.h

@@ -21,6 +21,8 @@
 
 #include "wx/object.h"  // base class
 
+#include "wx/bmpbndl.h"
+
 #include "wx/windowid.h"
 
 #include "wx/vector.h"
@@ -164,6 +166,10 @@ public:
     }
 
 protected:
+    // Helper function returning the appropriate bitmap from the given bundle
+    // (which may be invalid, in which case invalid bitmap is returned).
+    wxBitmap GetBitmapFromBundle(const wxBitmapBundle& bundle) const;
+
     wxWindowIDRef m_id;             // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR
     wxMenu       *m_parentMenu,     // the menu we belong to
                  *m_subMenu;        // our sub menu or NULL

include/wx/msw/menuitem.h

@@ -15,8 +15,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/bmpbndl.h"
-
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 
@@ -134,8 +132,6 @@ private:
     // common part of all ctors
     void Init();
 
-    wxBitmap GetBitmapFromBundle(const wxBitmapBundle& bundle) const;
-
     // Return the item position in the menu containing it.
     //
     // Returns -1 if the item is not attached to a menu or if we can't find its

include/wx/osx/menuitem.h

@@ -16,7 +16,6 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
-#include "wx/bmpbndl.h"
 #include "wx/vector.h"
 
 // ----------------------------------------------------------------------------

src/common/menucmn.cpp

@@ -344,6 +344,23 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 }
 #endif
 
+wxBitmap wxMenuItemBase::GetBitmapFromBundle(const wxBitmapBundle& bundle) const
+{
+    wxBitmap bmp;
+    if ( bundle.IsOk() )
+    {
+        if ( m_parentMenu && m_parentMenu->GetWindow() )
+        {
+            bmp = bundle.GetBitmapFor(m_parentMenu->GetWindow());
+        }
+        else
+        {
+            bmp = bundle.GetBitmap(wxDefaultSize);
+        }
+    }
+    return bmp;
+}
+
 bool wxMenuBase::ms_locked = true;
 
 // ----------------------------------------------------------------------------

src/gtk/menu.cpp

@@ -768,19 +768,7 @@ void wxMenuItem::SetBitmap(const wxBitmapBundle& bitmap)
 
 wxBitmap wxMenuItem::GetBitmap() const
 {
-    wxBitmap bmp;
+    return GetBitmapFromBundle(m_bitmap);
-    if ( m_bitmap.IsOk() )
-    {
-        if ( m_parentMenu && m_parentMenu->GetWindow() )
-        {
-            bmp = m_bitmap.GetBitmapFor(m_parentMenu->GetWindow());
-        }
-        else
-        {
-            bmp = m_bitmap.GetBitmap(wxDefaultSize);
-        }
-    }
-    return bmp;
 }
 
 void wxMenuItem::SetupBitmaps(wxWindow *win)

src/msw/menuitem.cpp

@@ -688,22 +688,6 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
     }
 }
 
-wxBitmap wxMenuItem::GetBitmapFromBundle(const wxBitmapBundle& bundle) const
-{
-    if (bundle.IsOk())
-    {
-        if (m_parentMenu && m_parentMenu->GetWindow())
-        {
-            return bundle.GetBitmapFor(m_parentMenu->GetWindow());
-        }
-        else
-        {
-            return bundle.GetBitmap(wxDefaultSize);
-        }
-    }
-    return wxNullBitmap;
-}
-
 wxBitmap wxMenuItem::GetBitmap(bool bChecked) const
 {
     wxBitmap bmp = GetBitmapFromBundle(bChecked ? m_bmpChecked : m_bmpUnchecked);

src/osx/menuitem_osx.cpp

@@ -77,19 +77,7 @@ void wxMenuItem::SetBitmap(const wxBitmapBundle& bitmap)
 
 wxBitmap wxMenuItem::GetBitmap() const
 {
-    wxBitmap bmp;
+    return GetBitmapFromBundle(m_bitmap);
-    if ( m_bitmap.IsOk() )
-    {
-        if (m_parentMenu && m_parentMenu->GetWindow())
-        {
-            bmp = m_bitmap.GetBitmapFor(m_parentMenu->GetWindow());
-        }
-        else
-        {
-            bmp = m_bitmap.GetBitmap(wxDefaultSize);
-        }
-    }
-    return bmp;
 }
 
 void wxMenuItem::Enable(bool bDoEnable)