AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the position calculating of insert a radio menu item

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-09-23 17:40:46 +00:00
parent 2e2ff9e8b0
commit 66ed21d69b
2 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/univ/menuitem.h
View File

@ -52,6 +52,8 @@ public:
void SetAsRadioGroupStart();
void SetRadioGroupStart(int start);
void SetRadioGroupEnd(int end);
int GetRadioGroupStart();
int GetRadioGroupEnd();
// wxUniv-specific methods for implementation only starting from here

67
src/univ/menu.cpp
View File

@ -1160,8 +1160,61 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
if ( !wxMenuBase::DoInsert(pos, item) )
return NULL;
if ( item->GetKind() == wxITEM_RADIO )
{
unsigned int start, end;
wxMenuItemIter firstRadio;
if ( m_startRadioGroup == -1 )
{
// start a new radio group
m_startRadioGroup = pos;
// set this element as the first of radio group
item->SetAsRadioGroupStart();
item->SetRadioGroupEnd(m_startRadioGroup);
wxMenuBase::DoInsert(pos, item);
item->Check(true);
}
else // extend the current radio group
{
// get current first radio item in radio group
firstRadio = GetMenuItems().Item(m_startRadioGroup);
// get current radio group range
start = firstRadio->GetData()->GetRadioGroupStart();
end = firstRadio->GetData()->GetRadioGroupEnd();
if ( pos <= start )
{
// Item is inserted in the begining of the range
// we need to update its end item
m_startRadioGroup = pos;
item->SetAsRadioGroupStart();
item->SetRadioGroupEnd(end + 1);
}
else if ( (pos >= start) && (pos <= end) )
{
// we need to update its end item
item->SetRadioGroupStart(m_startRadioGroup);
// Item is inserted in the middle of this range or immediately
// after it in which case it extends this range so make it span
// one more item in any case.
if ( firstRadio )
{
firstRadio->GetData()->SetRadioGroupEnd(end + 1);
}
else
{
wxFAIL_MSG( wxT("where is the radio group start item?") );
}
}
wxMenuBase::DoInsert(pos, item);
}
}
else
wxMenuBase::DoInsert(pos, item);
OnItemAdded(item);
@ -1605,6 +1658,16 @@ void wxMenuItem::SetRadioGroupEnd(int end)
m_radioGroup.end = end;
}
int wxMenuItem::GetRadioGroupStart()
{
return m_radioGroup.start;
}
int wxMenuItem::GetRadioGroupEnd()
{
return m_radioGroup.end;
}
// ----------------------------------------------------------------------------
// wxMenuBar creation
// ----------------------------------------------------------------------------