PNG fixes

CMakeLists.txt

@@ -12,6 +12,8 @@ endif(WIN32)
 # Path to local CMake modules.
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
 
+option(USE_PNG_BITMAPS "use PNG bitmaps instead of XPM (default ON)" ON)
+
 # Russian GOST patch
 option(wxUSE_UNICODE "enable/disable building unicode (default OFF)")
 option(KICAD_GOST "enable/disable building using GOST notation for multiple gates per package (default OFF)")

eeschema/menubar.cpp

@@ -372,7 +372,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     // Graphic image
     AddMenuItem( placeMenu, ID_ADD_IMAGE_BUTT, _("Image"),
                  HELP_PLACE_GRAPHICIMAGES,
-                 image_xpm );
+                 KiBitmap( image_xpm ) );
 
     // Menu Preferences:
     wxMenu* preferencesMenu = new wxMenu;

pcbnew/menubar_pcbframe.cpp

@@ -577,7 +577,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     AddMenuItem( configmenu, macrosMenu,
                  -1, _( "Macros" ),
                  _( "Macros save/read operations" ),
-                 add_dimension_xpm );
+                 KiBitmap( add_dimension_xpm ) );
 
     configmenu->AppendSeparator();