fixed Context_Current spelling

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

diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h
index 8b7c2c05546e77cccd2aeaf3fd2f8afe157b8c71..21ceed2f327685128c28df81e74c0348c8f5510e 100644 (file)
--- a/include/wx/cocoa/menu.h
+++ b/include/wx/cocoa/menu.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/09
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
 // Created:     2002/12/09
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_MENU_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __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)
 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); }
     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; }
 // ------------------------------------------------------------------------
 public:
     inline WX_NSMenu GetNSMenu() { return m_cocoaNSMenu; }

+    void SetCocoaDeletes(bool cocoaDeletes);
+    virtual void Cocoa_dealloc();

 protected:
     WX_NSMenu m_cocoaNSMenu;
 protected:
     WX_NSMenu m_cocoaNSMenu;

+    bool m_cocoaDeletes;

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------


@@ -73,6 +78,7 @@ class WXDLLEXPORT wxMenuBar : public wxMenuBarBase, public wxCocoaNSMenu
 public:
     // ctors and dtor
     wxMenuBar(long style = 0) { Create(style); }
 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();
 
     bool Create(long style = 0);
     virtual ~wxMenuBar();