merge of wxMac into main repository

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/menuitem.h

@@ -69,6 +69,8 @@ public:
     // menu handle depending on what we're
     int GetRealId() const;
 
+	static MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemName , bool useShortcuts ) ;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };