spek

commit 9c736788ed9cded87c2e0ba2be1812baee8a8196
parent a318529ecd77a4375cd02d093a4e7afac4ff0337
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date:   Mon,  3 Sep 2012 20:47:39 -0700

win: Set window icon

Diffstat:
M
dist/win/bundle.sh
 | 
2
+-
M
dist/win/spek.rc
 | 
3
+--
M
src/spek-artwork.cc
 | 
8
++++++++

3 files changed, 10 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -48,6 +48,14 @@ wxIconBundle SpekArtProvider::CreateIconBundle(const wxArtID& id, const wxArtCli
 #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;
 }