// Author: David Elliott
// Modified by:
// Created: 2002/12/09
-// RCS-ID: $Id:
+// RCS-ID: $Id:
// Copyright: (c) 2002 David Elliott
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
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); }
// ------------------------------------------------------------------------
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
// ------------------------------------------------------------------------
// ========================================================================
// wxMenuBar
// ========================================================================
-class WXDLLEXPORT wxMenuBar : public wxMenuBarBase, public wxCocoaNSMenu
+class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
{
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();
// 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);
virtual void EnableTop(size_t pos, bool enable);
virtual bool IsEnabledTop(size_t pos) const;
- virtual void SetLabelTop(size_t pos, const wxString& label);
- virtual wxString GetLabelTop(size_t pos) const;
+ virtual void SetMenuLabel(size_t pos, const wxString& label);
+ virtual wxString GetMenuLabel(size_t pos) const;
virtual void Attach(wxFrame *frame);
virtual void Detach();