Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented Enable for wxMenuBar to avoid assert

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-04-01 19:28:13 +00:00
parent 70e45c91bb
commit c393c74021
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/mac/carbon/menu.h
View File

@@ -124,6 +124,7 @@ public:
virtual void EnableTop( size_t pos, bool flag ); virtual void EnableTop( size_t pos, bool flag );
virtual void SetLabelTop( size_t pos, const wxString& label ); virtual void SetLabelTop( size_t pos, const wxString& label );
virtual wxString GetLabelTop( size_t pos ) const; virtual wxString GetLabelTop( size_t pos ) const;
virtual bool Enable( bool enable = TRUE );
// implementation from now on // implementation from now on
WXHMENU Create(); WXHMENU Create();

11
src/mac/carbon/menu.cpp
View File

@@ -617,6 +617,17 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
Refresh(); 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) void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
{ {
wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") ); wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );