X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe4a107dda9021ed2cdbeda0fcb2d7c02bbfa963..478cde3220641d49cfbd492e799107d13ccdfeb3:/include/wx/cocoa/menu.h diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h index 6a834fa9a3..21ceed2f32 100644 --- a/include/wx/cocoa/menu.h +++ b/include/wx/cocoa/menu.h @@ -27,7 +27,9 @@ class WXDLLEXPORT wxMenu : public wxMenuBase, public wxCocoaNSMenu public: // ctors and dtor wxMenu(const wxString& title, long style = 0) - : wxMenuBase(title, style) { Create(title,style); } + : wxMenuBase(title, style) + , m_cocoaDeletes(false) + { Create(title,style); } bool Create(const wxString& title, long style = 0); wxMenu(long style = 0) : wxMenuBase(style) { Create(wxEmptyString, style); } @@ -39,8 +41,11 @@ public: // ------------------------------------------------------------------------ public: inline WX_NSMenu GetNSMenu() { return m_cocoaNSMenu; } + void SetCocoaDeletes(bool cocoaDeletes); + virtual void Cocoa_dealloc(); protected: WX_NSMenu m_cocoaNSMenu; + bool m_cocoaDeletes; // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ @@ -73,6 +78,7 @@ class WXDLLEXPORT wxMenuBar : public wxMenuBarBase, public wxCocoaNSMenu public: // ctors and dtor wxMenuBar(long style = 0) { Create(style); } + wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); bool Create(long style = 0); virtual ~wxMenuBar(); @@ -87,8 +93,6 @@ protected: // Implementation // ------------------------------------------------------------------------ public: - wxMenuItemList m_items; // the list of menu items - // implement base class virtuals virtual bool Append(wxMenu *menu, const wxString &title); virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);