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

Remove duplicated code.

Browse Source
This commit is contained in:
Richard Smith
2018-11-22 10:35:40 +00:00
parent 82f8fad240
commit 902ce48189
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/qt/menu.cpp
View File

@@ -51,6 +51,13 @@ static wxMenuItem *GetMenuItemAt( const wxMenu *menu, size_t position )
return NULL; return NULL;
} }
static void AddItemActionToGroup( const wxMenuItem *groupItem, QAction *itemAction )
{
QAction *groupItemAction = groupItem->GetHandle();
QActionGroup *itemActionGroup = groupItemAction->actionGroup();
wxASSERT_MSG( itemActionGroup != NULL, "An action group should have been setup" );
itemActionGroup->addAction( itemAction );
}
static void InsertMenuItemAction( const wxMenu *menu, const wxMenuItem *previousItem, static void InsertMenuItemAction( const wxMenu *menu, const wxMenuItem *previousItem,
wxMenuItem *item, const wxMenuItem *successiveItem ) wxMenuItem *item, const wxMenuItem *successiveItem )
@@ -60,22 +67,16 @@ static void InsertMenuItemAction( const wxMenu *menu, const wxMenuItem *previous
switch ( item->GetKind() ) switch ( item->GetKind() )
{ {
case wxITEM_RADIO: case wxITEM_RADIO:
// If the previous menu item is a radio item then add this item to the // If a neighbouring menu item is a radio item then add this item to the
// same action group, otherwise start a new group: // same action group, otherwise start a new group:
if ( previousItem != NULL && previousItem->GetKind() == wxITEM_RADIO ) if ( previousItem != NULL && previousItem->GetKind() == wxITEM_RADIO )
{ {
QAction *previousItemAction = previousItem->GetHandle(); AddItemActionToGroup( previousItem, itemAction );
QActionGroup *previousItemActionGroup = previousItemAction->actionGroup();
wxASSERT_MSG( previousItemActionGroup != NULL, "An action group should have been setup" );
previousItemActionGroup->addAction( itemAction );
} }
else if( successiveItem != NULL && successiveItem->GetKind() == wxITEM_RADIO ) else if( successiveItem != NULL && successiveItem->GetKind() == wxITEM_RADIO )
{ {
QAction *successiveItemAction = successiveItem->GetHandle(); AddItemActionToGroup( successiveItem, itemAction );
QActionGroup *successiveItemActionGroup = successiveItemAction->actionGroup();
wxASSERT_MSG( successiveItemActionGroup != NULL, "An action group should have been setup" );
successiveItemActionGroup->addAction( itemAction );
} }
else else
{ {