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

Get rid of wxMenu::m_startRadioGroup in wxOSX.

Browse Source 
This code was probably copied from wxUniv but was wrong as we can't rely on
the items being always inserted in order. This commit on its own fixes
removing the first radio group menu item but it also makes possible to
properly implement the insertion of new items in the middle of an existing
radio group which couldn't be done with m_startRadioGroup approach at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-16 14:10:26 +00:00
parent f86a4930f2
commit 3b28ca6503
4 changed files with 71 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/osx/menu_osx.cpp
View File

@@ -57,7 +57,6 @@ static const int idMenuTitle = -3;
void wxMenu::Init()
{
m_doBreak = false;
m_startRadioGroup = -1;
m_allowRearrange = true;
m_noEventsMode = false;
@@ -89,13 +88,6 @@ void wxMenu::Break()
// not available on the mac platform
}
void wxMenu::Attach(wxMenuBarBase *menubar)
{
wxMenuBase::Attach(menubar);
EndRadioGroup();
}
void wxMenu::SetAllowRearrange( bool allow )
{
m_allowRearrange = allow;
@@ -141,30 +133,21 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
return true ;
}
void wxMenu::EndRadioGroup()
{
// we're not inside a radio group any longer
m_startRadioGroup = -1;
}
wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
{
wxCHECK_MSG( item, NULL, wxT("NULL item in wxMenu::DoAppend") );
bool check = false;
if ( item->GetKind() == wxITEM_RADIO )
if ( item->IsRadio() )
{
int count = GetMenuItemCount();
if ( m_startRadioGroup == -1 )
if ( !count || !(*GetMenuItems().rbegin())->IsRadio() )
{
// start a new radio group
m_startRadioGroup = count;
// for now it has just one element
item->SetAsRadioGroupStart();
item->SetRadioGroupEnd(m_startRadioGroup);
item->SetRadioGroupEnd(count);
// ensure that we have a checked item in the radio group
check = true;
@@ -172,8 +155,13 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
else // extend the current radio group
{
// we need to update its end item
item->SetRadioGroupStart(m_startRadioGroup);
wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
wxMenuItem* const last = *GetMenuItems().rbegin();
const int groupStart = last->IsRadioGroupStart()
? count
: last->GetRadioGroupStart();
item->SetRadioGroupStart(groupStart);
wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(groupStart);
if ( node )
{
@@ -185,10 +173,6 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
}
}
}
else // not a radio item
{
EndRadioGroup();
}
if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
return NULL;
@@ -210,14 +194,33 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{
if ( m_startRadioGroup != -1 )
if ( item->IsRadio() )
{
// Check if we're removing the item starting the radio group
if ( GetMenuItems().Item(m_startRadioGroup)->GetData() == item )
if ( item->IsRadioGroupStart() )
{
// Yes, we do, so reset its index as the next item added shouldn't
// count as part of the same radio group anyhow.
m_startRadioGroup = -1;
// Yes, we do, update the next radio group item, if any, to be the
// start one now.
const int endGroup = item->GetRadioGroupEnd();
wxMenuItemList::compatibility_iterator
node = GetMenuItems().Item(endGroup);
wxASSERT_MSG( node, wxS("Should have valid radio group end") );
while ( node->GetData() != item )
{
const wxMenuItemList::compatibility_iterator
prevNode = node->GetPrevious();
wxMenuItem* const prevItem = prevNode->GetData();
if ( prevItem == item )
{
prevItem->SetAsRadioGroupStart();
prevItem->SetRadioGroupEnd(endGroup);
break;
}
node = prevNode;
}
}
}