Implemented Enable for wxMenuBar to avoid assert

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/menu.h b/include/wx/mac/carbon/menu.h
index 854a70d107e077a37dd73e69d9159caed9f7e649..db83838a94bef37639bbac7eabd5e0372f27b016 100644 (file)
--- 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 c7a1407ab4816e9a65842f77973694e722b10c2f..95a5f76ec217c2b901b40212764278f414ce574a 100644 (file)
--- 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") );