From e63c3db43d706dc74b33b4ad6a18708bcc708480 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Tue, 4 Sep 2012 22:53:00 -0700
Subject: [PATCH] win: Bundle the close icon, refs #21
---
dist/win/close.ico | Bin 0 -> 1150 bytes
dist/win/spek.rc | 1 +
src/spek-artwork.cc | 8 ++++++++
src/spek-window.cc | 2 +-
4 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 dist/win/close.ico
diff --git a/dist/win/close.ico b/dist/win/close.ico
new file mode 100644
index 0000000000000000000000000000000000000000..092260003d4cc9927216a34866f4a8c600dfca1b
GIT binary patch
literal 1150
zcmdr}%TB^j5WOZQE@kCbmr5yZ!T4PD7X&Kc54aM67RplyCVq@vXhahU5)~o~e?sFA
zxO8`%DY?Wb5VzW9I?c?SbI+VB#2meWfS~V+IGh(^NeHn@K_#k;>XiQdv%R|mE1iU@
zh4Fn^MGYaIvaqqW`J*Rit%DTW-CGo^WoQw7Jg4d!j-5Qb_9bFTYh0H&nH5!qQ!1kO
z^oUZuN*o5lgw5DFAA6L~BB%tX;+ZFG=x}Ql^q+^QwHm$_K9{kIrq0Al9U5`eTTRl@
z$4#$;yj%D+mN|6NeRA4Fcktl*;Z)p-p33vSX4cRCbqDt-H)^oS57wV8*u*hgKi^TV
z=-~RU1E=hQ_h9ccc6P);cd$0Yzu11lpJNWjN?nrU{OSUGR(xESeVL7D1c|gYaaSc2
s@_WX5bShr*{G|+dri{0tXTF|!=F5U-zAt*_$MPunpKILX89C4S6Ta)ubN~PV
literal 0
HcmV?d00001
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);