diff --git a/dist/win/about.ico b/dist/win/about.ico new file mode 100644 index 0000000..48f2c18 Binary files /dev/null and b/dist/win/about.ico differ diff --git a/dist/win/bundle.sh b/dist/win/bundle.sh index ffe0a1f..6b80784 100755 --- a/dist/win/bundle.sh +++ b/dist/win/bundle.sh @@ -19,6 +19,7 @@ cd $(dirname $0)/../.. rm -fr dist/win/build && mkdir dist/win/build # Compile the resource file +rm -f dist/win/spek.res "$WINDRES" dist/win/spek.rc -O coff -o dist/win/spek.res mkdir -p src/dist/win && cp dist/win/spek.res src/dist/win/ diff --git a/dist/win/open.ico b/dist/win/open.ico new file mode 100644 index 0000000..ec70e8d Binary files /dev/null and b/dist/win/open.ico differ diff --git a/dist/win/save.ico b/dist/win/save.ico new file mode 100644 index 0000000..bc46843 Binary files /dev/null and b/dist/win/save.ico differ diff --git a/dist/win/spek.rc b/dist/win/spek.rc index 3c9cf68..574e44e 100644 --- a/dist/win/spek.rc +++ b/dist/win/spek.rc @@ -1 +1,4 @@ aaaa ICON "spek.ico" +about ICON "about.ico" +open ICON "open.ico" +save ICON "save.ico" diff --git a/src/spek-artwork.cc b/src/spek-artwork.cc index d4907c6..bfa4f84 100644 --- a/src/spek-artwork.cc +++ b/src/spek-artwork.cc @@ -36,21 +36,30 @@ wxBitmap SpekArtProvider::CreateBitmap( if (id == ART_SPEK) { #ifdef OS_UNIX return wxArtProvider::GetBitmap(wxT("spek"), client, size); +#endif + } + if (id == ART_ABOUT) { +#ifdef OS_UNIX + return wxArtProvider::GetBitmap(wxT("gtk-about"), client, size); +#endif +#ifdef OS_WIN + return wxIcon(wxT("about"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24); #endif } if (id == ART_OPEN) { #ifdef OS_UNIX return wxArtProvider::GetBitmap(wxT("gtk-open"), client, size); +#endif +#ifdef OS_WIN + return wxIcon(wxT("open"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24); #endif } if (id == ART_SAVE) { #ifdef OS_UNIX return wxArtProvider::GetBitmap(wxT("gtk-save"), client, size); #endif - } - if (id == ART_ABOUT) { -#ifdef OS_UNIX - return wxArtProvider::GetBitmap(wxT("gtk-about"), client, size); +#ifdef OS_WIN + return wxIcon(wxT("save"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24); #endif } return wxNullBitmap;