Remove icons from canvas selection menu in modedit

No OS renders the combination of icon AND radio button properly.
This commit is contained in:
Chris Pavlina 2017-01-15 07:12:02 -05:00
parent d442009e84
commit 8ac4790370
1 changed files with 13 additions and 10 deletions

View File

@ -4,7 +4,7 @@
* Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2015 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2015 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -242,23 +242,26 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
text = AddHotkeyName( _( "Legacy Canva&s" ), m_hotkeysDescrList, text = AddHotkeyName( _( "Legacy Canva&s" ), m_hotkeysDescrList,
HK_CANVAS_LEGACY ); HK_CANVAS_LEGACY );
AddMenuItem( viewMenu, ID_MENU_CANVAS_LEGACY, viewMenu->Append(
text, _( "Switch the canvas implementation to Legacy" ), new wxMenuItem( viewMenu, ID_MENU_CANVAS_LEGACY,
KiBitmap( tools_xpm ), wxITEM_RADIO ); text, _( "Switch the canvas implementation to Legacy" ),
wxITEM_RADIO ) );
text = AddHotkeyName( _( "Open&GL Canvas" ), m_hotkeysDescrList, text = AddHotkeyName( _( "Open&GL Canvas" ), m_hotkeysDescrList,
HK_CANVAS_OPENGL ); HK_CANVAS_OPENGL );
AddMenuItem( viewMenu, ID_MENU_CANVAS_OPENGL, viewMenu->Append(
text, _( "Switch the canvas implementation to OpenGL" ), new wxMenuItem( viewMenu, ID_MENU_CANVAS_OPENGL,
KiBitmap( tools_xpm ), wxITEM_RADIO ); text, _( "Switch the canvas implementation to OpenGL" ),
wxITEM_RADIO ) );
text = AddHotkeyName( _( "&Cairo Canvas" ), m_hotkeysDescrList, text = AddHotkeyName( _( "&Cairo Canvas" ), m_hotkeysDescrList,
HK_CANVAS_CAIRO ); HK_CANVAS_CAIRO );
AddMenuItem( viewMenu, ID_MENU_CANVAS_CAIRO, viewMenu->Append(
text, _( "Switch the canvas implementation to Cairo" ), new wxMenuItem( viewMenu, ID_MENU_CANVAS_CAIRO,
KiBitmap( tools_xpm ), wxITEM_RADIO ); text, _( "Switch the canvas implementation to Cairo" ),
wxITEM_RADIO ) );
//-------- Place menu -------------------- //-------- Place menu --------------------
wxMenu* placeMenu = new wxMenu; wxMenu* placeMenu = new wxMenu;