name also QueueEvent

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

diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h
index 8b7c2c05546e77cccd2aeaf3fd2f8afe157b8c71..6903d190bc4757dfc7da68a287ff27737d2bd139 100644 (file)
--- a/include/wx/cocoa/menu.h
+++ b/include/wx/cocoa/menu.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/09

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id:

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_MENU_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_MENU_H__


@@ -22,12 +22,14 @@
 // wxMenu
 // ========================================================================
 
 // wxMenu
 // ========================================================================
 

-class WXDLLEXPORT wxMenu : public wxMenuBase, public wxCocoaNSMenu
+class WXDLLIMPEXP_CORE 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
 // ------------------------------------------------------------------------


@@ -68,11 +73,12 @@ private:
 // ========================================================================
 // wxMenuBar
 // ========================================================================
 // ========================================================================
 // wxMenuBar
 // ========================================================================

-class WXDLLEXPORT wxMenuBar : public wxMenuBarBase, public wxCocoaNSMenu
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase

 {
 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();
 


@@ -96,8 +102,8 @@ public:
     virtual void EnableTop(size_t pos, bool enable);
     virtual bool IsEnabledTop(size_t pos) const;
 
     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();
 
     virtual void Attach(wxFrame *frame);
     virtual void Detach();