diff options
| author | Alexander Kojevnikov <alexander@kojevnikov.com> | 2012-09-04 22:53:00 -0700 |
|---|---|---|
| committer | Alexander Kojevnikov <alexander@kojevnikov.com> | 2012-09-04 22:53:00 -0700 |
| commit | e63c3db43d706dc74b33b4ad6a18708bcc708480 (patch) | |
| tree | 0f38ce8c6ab413b939622d6fd45fdd52e5425ab3 /src | |
| parent | 76d0109dc847bdcc3d808783903c9b0cab2d945e (diff) | |
| download | spek-e63c3db43d706dc74b33b4ad6a18708bcc708480.zip spek-e63c3db43d706dc74b33b4ad6a18708bcc708480.tar.gz spek-e63c3db43d706dc74b33b4ad6a18708bcc708480.tar.bz2 | |
win: Bundle the close icon, refs #21
Diffstat (limited to 'src')
| -rw-r--r-- | src/spek-artwork.cc | 8 | ||||
| -rw-r--r-- | src/spek-window.cc | 2 |
2 files changed, 9 insertions, 1 deletions
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 @@ -62,6 +62,14 @@ wxBitmap SpekArtProvider::CreateBitmap( 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); |