From 9c736788ed9cded87c2e0ba2be1812baee8a8196 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Mon, 3 Sep 2012 20:47:39 -0700
Subject: [PATCH] win: Set window icon
---
dist/win/bundle.sh | 2 +-
dist/win/spek.rc | 2 +-
src/spek-artwork.cc | 8 ++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dist/win/bundle.sh b/dist/win/bundle.sh
index 0199546..ffe0a1f 100755
--- a/dist/win/bundle.sh
+++ b/dist/win/bundle.sh
@@ -28,7 +28,7 @@ LDFLAGS="dist/win/spek.res" ./configure \
--with-wx-config="$WX_CONFIG" \
--prefix=${PWD}/dist/win/build && \
"$MAKE" && \
- "$MAKE" install
+ "$MAKE" install || exit 1
"$STRIP" dist/win/build/bin/spek.exe
"$UPX" dist/win/build/bin/spek.exe
diff --git a/dist/win/spek.rc b/dist/win/spek.rc
index 5d82f60..3c9cf68 100644
--- a/dist/win/spek.rc
+++ b/dist/win/spek.rc
@@ -1 +1 @@
-0 ICON "spek.ico"
\ No newline at end of file
+aaaa ICON "spek.ico"
diff --git a/src/spek-artwork.cc b/src/spek-artwork.cc
index 4653dab..f72da48 100644
--- a/src/spek-artwork.cc
+++ b/src/spek-artwork.cc
@@ -47,6 +47,14 @@ wxIconBundle SpekArtProvider::CreateIconBundle(const wxArtID& id, const wxArtCli
if (id == ART_SPEK) {
#ifdef OS_UNIX
return wxArtProvider::GetIconBundle(wxT("spek"), client);
+#endif
+#ifdef OS_WIN
+ wxIconBundle bundle;
+ bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16));
+ bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24));
+ bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 32, 32));
+ bundle.AddIcon(wxIcon(wxT("aaaa"), wxBITMAP_TYPE_ICO_RESOURCE, 48, 48));
+ return bundle;
#endif
}
return wxNullIconBundle;