X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d04995b3a6d56d610d0eb7af9c07ba91eaf4884d..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/cocoa/menuitem.h diff --git a/include/wx/cocoa/menuitem.h b/include/wx/cocoa/menuitem.h index 3596f68cc0..01e3f51336 100644 --- a/include/wx/cocoa/menuitem.h +++ b/include/wx/cocoa/menuitem.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2002/12/13 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -25,18 +25,18 @@ class wxMenuItemCocoa; WX_DECLARE_HASH_MAP(WX_NSMenuItem,wxMenuItem*,wxPointerHash,wxPointerEqual,wxMenuItemCocoaHash); -class WXDLLEXPORT wxMenuItemCocoa : public wxMenuItemBase +class WXDLLIMPEXP_CORE wxMenuItemCocoa : public wxMenuItemBase { public: // ------------------------------------------------------------------------ // initialization // ------------------------------------------------------------------------ - wxMenuItemCocoa(wxMenu *parentMenu = (wxMenu *)NULL, + wxMenuItemCocoa(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& name = wxEmptyString, const wxString& help = wxEmptyString, wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = (wxMenu *)NULL); + wxMenu *subMenu = NULL); virtual ~wxMenuItemCocoa(); // ------------------------------------------------------------------------ @@ -54,6 +54,7 @@ public: void CocoaItemSelected(); bool Cocoa_validateMenuItem(); protected: + void CocoaSetKeyEquivalent(); WX_NSMenuItem m_cocoaNSMenuItem; static wxMenuItemCocoaHash sm_cocoaHash; static wxObjcAutoRefFromAlloc sm_cocoaTarget; @@ -62,7 +63,7 @@ protected: // ------------------------------------------------------------------------ public: // override base class virtuals to update the item appearance on screen - virtual void SetText(const wxString& text); + virtual void SetItemLabel(const wxString& text); virtual void SetCheckable(bool checkable); virtual void Enable(bool enable = TRUE);