X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d062e17fca1a1fc0b82b269da4a7ad271075ba2b..e81a301cbdc8729b0a71fa5dfd7124bf59368673:/include/wx/mac/menuitem.h diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h index cf7a2c57f2..1557980892 100644 --- a/include/wx/mac/menuitem.h +++ b/include/wx/mac/menuitem.h @@ -43,7 +43,7 @@ public: int id = wxID_SEPARATOR, const wxString& name = wxEmptyString, const wxString& help = wxEmptyString, - bool isCheckable = FALSE, + wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); virtual ~wxMenuItem(); @@ -72,10 +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 ) ; + static int MacBuildMenuString(unsigned char* outMacItemText, wxInt16 *outMacShortcutChar , wxUint8 *outMacModifiers , const char *inItemName , bool useShortcuts ) ; private: wxBitmap m_bitmap; // Bitmap for menuitem, if any + void* m_menu ; // the appropriate menu , may also be a system menu DECLARE_DYNAMIC_CLASS(wxMenuItem) };