diff --git a/dist/win/close.ico b/dist/win/close.ico new file mode 100644 index 0000000..0922600 Binary files /dev/null and b/dist/win/close.ico differ diff --git a/dist/win/spek.rc b/dist/win/spek.rc index 574e44e..f8036d4 100644 --- a/dist/win/spek.rc +++ b/dist/win/spek.rc @@ -2,3 +2,4 @@ aaaa ICON "spek.ico" about ICON "about.ico" open ICON "open.ico" save ICON "save.ico" +close ICON "close.ico" diff --git a/src/spek-artwork.cc b/src/spek-artwork.cc index bfa4f84..31c7a50 100644 --- a/src/spek-artwork.cc +++ b/src/spek-artwork.cc @@ -60,6 +60,14 @@ wxBitmap SpekArtProvider::CreateBitmap( #endif #ifdef OS_WIN return wxIcon(wxT("save"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24); +#endif + } + if (id == ART_CLOSE) { +#ifdef OS_UNIX + return wxArtProvider::GetBitmap(wxT("gtk-close"), client, size); +#endif +#ifdef OS_WIN + return wxIcon(wxT("close"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16); #endif } return wxNullBitmap; diff --git a/src/spek-window.cc b/src/spek-window.cc index 0b84557..373dcbc 100644 --- a/src/spek-window.cc +++ b/src/spek-window.cc @@ -147,7 +147,7 @@ SpekWindow::SpekWindow(const wxString& path) : info_bar->Connect(wxEVT_LEFT_DOWN, wxCommandEventHandler(SpekWindow::on_visit)); info_sizer->Add(label, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); wxBitmapButton *button = new wxBitmapButton( - info_bar, -1, wxArtProvider::GetBitmap(wxT("gtk-close")), + info_bar, -1, wxArtProvider::GetBitmap(ART_CLOSE, wxART_BUTTON), wxDefaultPosition, wxDefaultSize, wxNO_BORDER); button->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SpekWindow::on_close)); info_sizer->Add(button, 0, wxALIGN_CENTER_VERTICAL);