From b19f3d04eca5097205937fbc5ce372ce6897e508 Mon Sep 17 00:00:00 2001 From: qu1ck Date: Fri, 17 Aug 2018 02:14:45 -0700 Subject: [PATCH 3/4] Fix compilation errors for action plugin icon code Fixes compilation with actio menu option off. Fixes compilation error on non windows platforms. --- pcbnew/swig/pcbnew_action_plugins.cpp | 6 ++++++ pcbnew/tool_pcb_editor.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/pcbnew/swig/pcbnew_action_plugins.cpp b/pcbnew/swig/pcbnew_action_plugins.cpp index b3ecff0..27dc2f9 100644 --- a/pcbnew/swig/pcbnew_action_plugins.cpp +++ b/pcbnew/swig/pcbnew_action_plugins.cpp @@ -436,7 +436,13 @@ void PCB_EDIT_FRAME::RebuildActionPluginMenus() item = available_menus[ii]; item->SetItemLabel( ap->GetName() ); item->SetHelp( ap->GetDescription() ); + + // On windows we need to set "unchecked" bitmap + #if defined(__WXMSW__) item->SetBitmap( bitmap, false ); + #else + item->SetBitmap( bitmap ); + #endif } else { diff --git a/pcbnew/tool_pcb_editor.cpp b/pcbnew/tool_pcb_editor.cpp index 18926b8..fc7e533 100644 --- a/pcbnew/tool_pcb_editor.cpp +++ b/pcbnew/tool_pcb_editor.cpp @@ -322,7 +322,9 @@ void PCB_EDIT_FRAME::ReCreateHToolbar() KiScaledBitmap( py_script_xpm, this ), _( "Show/Hide the Python Scripting console" ), wxITEM_CHECK ); +#if defined(KICAD_SCRIPTING_ACTION_MENU) AddActionPluginTools(); +#endif } #endif -- 2.7.4