* Move m_cocoaNSMenu out of wxCocoaNSMenu and into wxMenu and wxMenuBar

* Comment out wxPoserNSMenu (it's not needed for now, may never be)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-09-05 14:00:53 +00:00
parent da02681123
commit 605c7e7ed8
4 changed files with 36 additions and 66 deletions

View File

@@ -34,6 +34,16 @@ public:
virtual ~wxMenu();
// ------------------------------------------------------------------------
// Cocoa specifics
// ------------------------------------------------------------------------
public:
inline WX_NSMenu GetNSMenu() { return m_cocoaNSMenu; }
protected:
WX_NSMenu m_cocoaNSMenu;
// ------------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------------
protected:
// implement base class virtuals
virtual bool DoAppend(wxMenuItem *item);
@@ -66,6 +76,17 @@ public:
bool Create(long style = 0);
virtual ~wxMenuBar();
// ------------------------------------------------------------------------
// Cocoa specifics
// ------------------------------------------------------------------------
public:
inline WX_NSMenu GetNSMenu() { return m_cocoaNSMenu; }
protected:
WX_NSMenu m_cocoaNSMenu;
// ------------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------------
public:
wxMenuItemList m_items; // the list of menu items
// implement base class virtuals