haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change to compile pcbnew, without png icon

This commit is contained in:
charras 2008-09-23 10:53:35 +00:00
parent 0f636a9879
commit 064fcf5491
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/menubar.cpp
View File

@ -18,7 +18,6 @@
#include "id.h" #include "id.h"
#include "hotkeys.h" #include "hotkeys.h"
#include "icons.h"
/************************************************/ /************************************************/
void WinEDA_SchematicFrame::ReCreateMenuBar() void WinEDA_SchematicFrame::ReCreateMenuBar()
@ -33,11 +32,6 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
if( menuBar == NULL ) if( menuBar == NULL )
{ {
wxImage::AddHandler( new wxPNGHandler ); /* Support PNG Images */
initialise_icons();
menuBar = new wxMenuBar(); menuBar = new wxMenuBar();
m_FilesMenu = new wxMenu; m_FilesMenu = new wxMenu;
@ -143,8 +137,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem( editMenu, ID_SCHEMATIC_REDO, item = new wxMenuItem( editMenu, ID_SCHEMATIC_REDO,
msg, _( "Redo the last undo command" ), msg, _( "Redo the last undo command" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
extern wxBitmap zoom_in_png; item->SetBitmap( redo_xpm );
item->SetBitmap( zoom_in_png );
editMenu->Append( item ); editMenu->Append( item );
editMenu->AppendSeparator(); editMenu->AppendSeparator();
@ -160,8 +153,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem( editMenu, ID_FIND_ITEMS, item = new wxMenuItem( editMenu, ID_FIND_ITEMS,
_( "Find" ), _( "Find components and texts" ), _( "Find" ), _( "Find components and texts" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
extern wxBitmap edit_find_png; item->SetBitmap( find_xpm );
item->SetBitmap( edit_find_png );
editMenu->Append( item ); editMenu->Append( item );
editMenu->AppendSeparator(); editMenu->AppendSeparator();
@ -179,7 +171,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem( viewMenu, ID_ZOOM_IN_BUTT, item = new wxMenuItem( viewMenu, ID_ZOOM_IN_BUTT,
msg, _( "Zoom in" ), msg, _( "Zoom in" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
item->SetBitmap( find_xpm ); item->SetBitmap( zoom_in_xpm );
viewMenu->Append( item ); viewMenu->Append( item );
msg = AddHotkeyName( _( "Zoom out" ), s_Schematic_Hokeys_Descr, msg = AddHotkeyName( _( "Zoom out" ), s_Schematic_Hokeys_Descr,