wxBitmapBundle for wxMenuItem on Mac

include/wx/osx/menu.h

@@ -66,6 +66,12 @@ public:
     // containing this position.
     bool OSXGetRadioGroupRange(int pos, int *start, int *end) const;
 
+#if wxUSE_MENUBAR
+    virtual void Attach(wxMenuBarBase *menubar) wxOVERRIDE;
+#endif
+
+    void SetupBitmaps();
+
 protected:
     // hide special menu items like exit, preferences etc
     // that are expected in the app menu
@@ -163,6 +169,9 @@ public:
     static void MacSetCommonMenuBar(wxMenuBar* menubar) { s_macCommonMenuBar=menubar; }
     static wxMenuBar* MacGetCommonMenuBar() { return s_macCommonMenuBar; }
 
+    virtual void Attach(wxFrame *frame) wxOVERRIDE;
+    void SetupBitmaps();
+
 
     static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }
 

include/wx/osx/menuitem.h

@@ -16,7 +16,7 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
-#include "wx/bitmap.h"
+#include "wx/bmpbndl.h"
 #include "wx/vector.h"
 
 // ----------------------------------------------------------------------------
@@ -49,8 +49,8 @@ public:
     void RemoveHiddenItems();
 #endif // wxUSE_ACCEL
 
-    virtual void SetBitmap(const wxBitmap& bitmap) ;
-    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
+    virtual void SetBitmap(const wxBitmapBundle& bitmap) ;
+    virtual wxBitmap GetBitmap() const;
 
 
     // Implementation only from now on.
@@ -64,7 +64,7 @@ public:
 private:
     void UncheckRadio() ;
 
-    wxBitmap  m_bitmap; // Bitmap for menuitem, if any
+    wxBitmapBundle m_bitmap; // Bitmap for menuitem, if any
 
     wxMenuItemImpl* m_peer;