realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove Help menu hacks which appear to no longer be necessary.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/10124
This commit is contained in:
Jeff Young 2025-04-14 11:11:22 +01:00
parent 2a2a73a1e9
commit 8827323361
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/eda_base_frame.cpp
View File

@ -639,22 +639,6 @@ void EDA_BASE_FRAME::ReCreateMenuBar()
} }
void EDA_BASE_FRAME::SetMenuBar( wxMenuBar* menu_bar )
{
wxFrame::SetMenuBar( menu_bar );
// Move Help menu back to end of menubar
int pos = GetMenuBar()->FindMenu( _( "&Help" ) + wxS( " " ) );
if( pos != wxNOT_FOUND )
{
wxMenu* helpMenu = GetMenuBar()->Remove( pos );
GetMenuBar()->Append( helpMenu, _( "&Help" ) + wxS( " " ) );
}
}
void EDA_BASE_FRAME::AddStandardHelpMenu( wxMenuBar* aMenuBar ) void EDA_BASE_FRAME::AddStandardHelpMenu( wxMenuBar* aMenuBar )
{ {
COMMON_CONTROL* commonControl = m_toolManager->GetTool<COMMON_CONTROL>(); COMMON_CONTROL* commonControl = m_toolManager->GetTool<COMMON_CONTROL>();
@ -670,13 +654,7 @@ void EDA_BASE_FRAME::AddStandardHelpMenu( wxMenuBar* aMenuBar )
helpMenu->AppendSeparator(); helpMenu->AppendSeparator();
helpMenu->Add( ACTIONS::about ); helpMenu->Add( ACTIONS::about );
// Trailing space keeps OSX from hijacking our menu (and disabling everything in it). aMenuBar->Append( helpMenu, _( "&Help" ) );
aMenuBar->Append( helpMenu, _( "&Help" ) + wxS( " " ) );
// This change is only needed on macOS, and creates a bug on Windows
#ifdef __WXMAC__
helpMenu->wxMenu::SetTitle( _( "&Help" ) + wxS( " " ) );
#endif
} }

2
include/eda_base_frame.h
View File

@ -472,8 +472,6 @@ public:
*/ */
void ReCreateMenuBar(); void ReCreateMenuBar();
void SetMenuBar( wxMenuBar *menu_bar ) override;
/** /**
* Add the standard KiCad help menu to the menubar. * Add the standard KiCad help menu to the menubar.
*/ */