From 0aa10b6287c833863675728a98cd8c8c86a60c6f Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 19 Jul 2007 14:57:21 +0000 Subject: [PATCH] finish changing from xpm to png --- wx/xmission.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/wx/xmission.cc b/wx/xmission.cc index 08a8c8e29..ff5dfc17b 100755 --- a/wx/xmission.cc +++ b/wx/xmission.cc @@ -103,11 +103,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size): myConfig( new wxConfig( _T("xmission") ) ) { wxImage::AddHandler( new wxPNGHandler ); - wxImage transmission_logo ( _T("xpm/transmission.png"), wxBITMAP_TYPE_PNG ); + wxImage transmission_logo ( _T("images/transmission.png"), wxBITMAP_TYPE_PNG ); wxIcon ico; ico.CopyFromBitmap( wxBitmap( transmission_logo ) ); SetIcon( ico ); - //SetIcon( wxImage( _T("xpm/transmission.png"), wxBITMAP_TYPE_PNG ) ); /** *** Menu @@ -145,11 +144,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size): *** Toolbar **/ - wxImage open_image( _T("xpm/fileopen.png"), wxBITMAP_TYPE_PNG ); - wxImage exec_image( _T("xpm/exec.png"), wxBITMAP_TYPE_PNG ); - wxImage stop_image( _T("xpm/stop.png"), wxBITMAP_TYPE_PNG ); - wxImage drop_image( _T("xpm/gtk-remove.png"), wxBITMAP_TYPE_PNG ); - wxImage info_image( _T("xpm/gtk-properties.png"), wxBITMAP_TYPE_PNG ); + wxImage open_image( _T("images/fileopen.png"), wxBITMAP_TYPE_PNG ); + wxImage exec_image( _T("images/exec.png"), wxBITMAP_TYPE_PNG ); + wxImage stop_image( _T("images/stop.png"), wxBITMAP_TYPE_PNG ); + wxImage drop_image( _T("images/gtk-remove.png"), wxBITMAP_TYPE_PNG ); + wxImage info_image( _T("images/gtk-properties.png"), wxBITMAP_TYPE_PNG ); wxToolBar* toolbar = CreateToolBar( wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT | wxTB_TEXT ); toolbar->SetToolBitmapSize( wxSize( 16, 16 ) ); @@ -176,7 +175,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxImage transmission_logo ( _T("xpm/transmission.png"), wxBITMAP_TYPE_PNG ); + wxImage transmission_logo ( _T("images/transmission.png"), wxBITMAP_TYPE_PNG ); wxIcon ico; ico.CopyFromBitmap( wxBitmap( transmission_logo ) );