From c393c7402138d8d146f58932e3bcce169fc4fd0d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 1 Apr 2004 19:28:13 +0000 Subject: [PATCH] Implemented Enable for wxMenuBar to avoid assert git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/menu.h | 1 + src/mac/carbon/menu.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/wx/mac/carbon/menu.h b/include/wx/mac/carbon/menu.h index 854a70d107..db83838a94 100644 --- a/include/wx/mac/carbon/menu.h +++ b/include/wx/mac/carbon/menu.h @@ -124,6 +124,7 @@ public: virtual void EnableTop( size_t pos, bool flag ); virtual void SetLabelTop( size_t pos, const wxString& label ); virtual wxString GetLabelTop( size_t pos ) const; + virtual bool Enable( bool enable = TRUE ); // implementation from now on WXHMENU Create(); diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp index c7a1407ab4..95a5f76ec2 100644 --- a/src/mac/carbon/menu.cpp +++ b/src/mac/carbon/menu.cpp @@ -617,6 +617,17 @@ void wxMenuBar::EnableTop(size_t pos, bool enable) Refresh(); } +bool wxMenuBar::Enable( bool enable) +{ + wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") ); + size_t i; + for (i = 0; i < GetMenuCount(); i++) + { + EnableTop(i, enable); + } + return true; +} + void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) { wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); -- 2.45.2