set m_encoding in wxCSConv ctor from name

[wxWidgets.git] / include / wx / cocoa / menu.h

diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h
index 6a834fa9a3cd920bdf291c078030233c7d3ffce2..21ceed2f327685128c28df81e74c0348c8f5510e 100644 (file)
--- 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);