From 8ac4790370aa151ba52dd78f293df17b5441e06c Mon Sep 17 00:00:00 2001 From: Chris Pavlina Date: Sun, 15 Jan 2017 07:12:02 -0500 Subject: [PATCH] Remove icons from canvas selection menu in modedit No OS renders the combination of icon AND radio button properly. --- pcbnew/menubar_modedit.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp index 28101266c6..7ef3e38de7 100644 --- a/pcbnew/menubar_modedit.cpp +++ b/pcbnew/menubar_modedit.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck * Copyright (C) 2015 Wayne Stambaugh - * 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 * 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, HK_CANVAS_LEGACY ); - AddMenuItem( viewMenu, ID_MENU_CANVAS_LEGACY, - text, _( "Switch the canvas implementation to Legacy" ), - KiBitmap( tools_xpm ), wxITEM_RADIO ); + viewMenu->Append( + new wxMenuItem( viewMenu, ID_MENU_CANVAS_LEGACY, + text, _( "Switch the canvas implementation to Legacy" ), + wxITEM_RADIO ) ); text = AddHotkeyName( _( "Open&GL Canvas" ), m_hotkeysDescrList, HK_CANVAS_OPENGL ); - AddMenuItem( viewMenu, ID_MENU_CANVAS_OPENGL, - text, _( "Switch the canvas implementation to OpenGL" ), - KiBitmap( tools_xpm ), wxITEM_RADIO ); + viewMenu->Append( + new wxMenuItem( viewMenu, ID_MENU_CANVAS_OPENGL, + text, _( "Switch the canvas implementation to OpenGL" ), + wxITEM_RADIO ) ); text = AddHotkeyName( _( "&Cairo Canvas" ), m_hotkeysDescrList, HK_CANVAS_CAIRO ); - AddMenuItem( viewMenu, ID_MENU_CANVAS_CAIRO, - text, _( "Switch the canvas implementation to Cairo" ), - KiBitmap( tools_xpm ), wxITEM_RADIO ); + viewMenu->Append( + new wxMenuItem( viewMenu, ID_MENU_CANVAS_CAIRO, + text, _( "Switch the canvas implementation to Cairo" ), + wxITEM_RADIO ) ); //-------- Place menu -------------------- wxMenu* placeMenu = new wxMenu;