X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/950432e40723ab8fabdff72a98e304c8cff4b20b..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/cocoa/menu.h diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h index e05cd49d70..fbcbc08a59 100644 --- a/include/wx/cocoa/menu.h +++ b/include/wx/cocoa/menu.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2002/12/09 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -22,7 +22,7 @@ // wxMenu // ======================================================================== -class WXDLLEXPORT wxMenu : public wxMenuBase, public wxCocoaNSMenu +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase, public wxCocoaNSMenu { public: // ctors and dtor @@ -73,11 +73,12 @@ private: // ======================================================================== // wxMenuBar // ======================================================================== -class WXDLLEXPORT wxMenuBar : public wxMenuBarBase, public wxCocoaNSMenu +class WXDLLIMPEXP_CORE 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(); @@ -101,8 +102,8 @@ public: 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();