don't try to refresh the menu bar before showing it, fixes crash on startup with...

[wxWidgets.git] / include / wx / mac / menuitem.h

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 97359a102ae962f99b7cac869c07a427bd4d53b1..cf7a2c57f26d8401ddcfab5ee4922cfab81b7e16 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -56,6 +56,9 @@ public:
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked() const;
 
+    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
+    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
+
 #if wxUSE_ACCEL
     virtual wxAcceleratorEntry *GetAccel() const;
 #endif // wxUSE_ACCEL
@@ -69,7 +72,11 @@ public:
     // menu handle depending on what we're
     int GetRealId() const;
 
+    static int MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemName , bool useShortcuts ) ;
+
 private:
+    wxBitmap  m_bitmap; // Bitmap for menuitem, if any
+
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };