X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/osx/menuitem.h?ds=sidebyside diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h index 6171b124ee..e4f53c86e8 100644 --- a/include/wx/osx/menuitem.h +++ b/include/wx/osx/menuitem.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/menuitem.h +// Name: wx/osx/menuitem.h // Purpose: wxMenuItem class // Author: Vadim Zeitlin // Modified by: @@ -29,12 +29,12 @@ class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase { public: // ctor & dtor - wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL, + wxMenuItem(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 ~wxMenuItem(); // override base class virtuals @@ -74,8 +74,7 @@ private: bool m_isRadioGroupStart; wxBitmap m_bitmap; // Bitmap for menuitem, if any - void* m_menu ; // the appropriate menu , may also be a system menu - + wxMenuItemImpl* m_peer; DECLARE_DYNAMIC_CLASS(wxMenuItem)