From 43d4c8d80186e9a75b75362702d806e0df37101a Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Wed, 1 May 2024 02:48:19 +0000 Subject: [PATCH] Point BEGIN_EVENT_TABLE at the correct base class, fix current lang indication Fixes https://gitlab.com/kicad/code/kicad/-/issues/17825 (cherry picked from commit aaf776db9e99e85baebf14c0bb4d242fe66bdef5) Co-authored-by: Marek Roszko --- bitmap2component/bitmap2cmp_frame.cpp | 3 ++- pcb_calculator/pcb_calculator_frame.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bitmap2component/bitmap2cmp_frame.cpp b/bitmap2component/bitmap2cmp_frame.cpp index 9e8d54d28a..6291b43fed 100644 --- a/bitmap2component/bitmap2cmp_frame.cpp +++ b/bitmap2component/bitmap2cmp_frame.cpp @@ -138,7 +138,7 @@ void IMAGE_SIZE::SetUnit( EDA_UNITS aUnit ) } -BEGIN_EVENT_TABLE( BITMAP2CMP_FRAME, EDA_BASE_FRAME ) +BEGIN_EVENT_TABLE( BITMAP2CMP_FRAME, KIWAY_PLAYER ) EVT_MENU( wxID_CLOSE, BITMAP2CMP_FRAME::OnExit ) EVT_MENU( wxID_EXIT, BITMAP2CMP_FRAME::OnExit ) @@ -193,6 +193,7 @@ BITMAP2CMP_FRAME::BITMAP2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) : m_toolManager->InitTools(); ReCreateMenuBar(); + setupUIConditions(); GetSizer()->SetSizeHints( this ); diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp index 8af0adbdaf..589cffd751 100644 --- a/pcb_calculator/pcb_calculator_frame.cpp +++ b/pcb_calculator/pcb_calculator_frame.cpp @@ -53,7 +53,7 @@ #include "widgets/wx_menubar.h" -BEGIN_EVENT_TABLE( PCB_CALCULATOR_FRAME, EDA_BASE_FRAME ) +BEGIN_EVENT_TABLE( PCB_CALCULATOR_FRAME, KIWAY_PLAYER ) EVT_MENU( wxID_CLOSE, PCB_CALCULATOR_FRAME::OnExit ) EVT_MENU( wxID_EXIT, PCB_CALCULATOR_FRAME::OnExit ) END_EVENT_TABLE() @@ -113,6 +113,7 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) : m_toolManager->InitTools(); ReCreateMenuBar(); + setupUIConditions(); GetSizer()->SetSizeHints( this );