From bfad2a5425cc1e97362081180c0a64b85daae3ff Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 21 Nov 2018 16:02:33 +0000 Subject: [PATCH] Fix menu first radio button state and synchronise state changes. --- src/qt/menu.cpp | 3 ++- src/qt/menuitem.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qt/menu.cpp b/src/qt/menu.cpp index e0f7d8c5fc..1b810cecd9 100644 --- a/src/qt/menu.cpp +++ b/src/qt/menu.cpp @@ -53,7 +53,7 @@ static wxMenuItem *GetMenuItemAt( const wxMenu *menu, size_t position ) static void InsertMenuItemAction( const wxMenu *menu, const wxMenuItem *previousItem, - const wxMenuItem *item, const wxMenuItem *successiveItem ) + wxMenuItem *item, const wxMenuItem *successiveItem ) { QMenu *qtMenu = menu->GetHandle(); QAction *itemAction = item->GetHandle(); @@ -74,6 +74,7 @@ static void InsertMenuItemAction( const wxMenu *menu, const wxMenuItem *previous { QActionGroup *actionGroup = new QActionGroup( qtMenu ); actionGroup->addAction( itemAction ); + item->Check(); wxASSERT_MSG( itemAction->actionGroup() == actionGroup, "Must be the same action group" ); } break; diff --git a/src/qt/menuitem.cpp b/src/qt/menuitem.cpp index 6ce89dc5be..328e65c892 100644 --- a/src/qt/menuitem.cpp +++ b/src/qt/menuitem.cpp @@ -165,5 +165,6 @@ void wxQtAction::onActionTriggered( bool checked ) { wxMenuItem *handler = GetHandler(); wxMenu *menu = handler->GetMenu(); + if(handler->IsCheckable()) handler->Check(checked); menu->SendEvent( handler->GetId(), handler->IsCheckable() ? checked : -1 ); }