aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-06-21 18:41:34 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-06-21 18:41:34 +0000
commit36bb88e1b9825f84c49c04643461dce823f70455 (patch)
treee622f7a8a920dec9b627c918faed8762b24af9ec
parent161c38ba6025fba019e84dd4b799addc544ea1b3 (diff)
fix system tray icon on windows
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@88 1a98c847-1fd6-4fd8-948a-caf3550aa51b
-rw-r--r--ui.cpp4
-rw-r--r--ui.rc1
2 files changed, 4 insertions, 1 deletions
diff --git a/ui.cpp b/ui.cpp
index 54cfa2a2a0..e51c1e2e5d 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -2437,7 +2437,9 @@ void CMyTaskBarIcon::Show(bool fShow)
{
strlcpy(pszPrevTip, strTooltip.c_str(), sizeof(pszPrevTip));
#ifdef __WXMSW__
- SetIcon(wxICON(bitcoin), strTooltip);
+ // somehow it'll choose the wrong icon and scale it down if
+ // we use the main icon, so we hand it one with only 16x16
+ SetIcon(wxICON(favicon), strTooltip);
#else
SetIcon(bitcoin80_xpm, strTooltip);
#endif
diff --git a/ui.rc b/ui.rc
index 95258c7d59..0e0122de2b 100644
--- a/ui.rc
+++ b/ui.rc
@@ -12,3 +12,4 @@ addressbook16 BITMAP "rc/addressbook16.bmp"
addressbook16mask BITMAP "rc/addressbook16mask.bmp"
addressbook20 BITMAP "rc/addressbook20.bmp"
addressbook20mask BITMAP "rc/addressbook20mask.bmp"
+favicon ICON "rc/favicon.ico"