Mercurial > hg > bitcoin

changeset 160:9fe8b1ceeb3b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix system tray icon on windows
author s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
date Mon, 21 Jun 2010 18:41:34 +0000
parents ba8e3b05b2c3
children 7426340eca58
files ui.cpp ui.rc
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ui.cpp
+++ b/ui.cpp
@@ -2437,7 +2437,9 @@
         {
             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
--- a/ui.rc
+++ b/ui.rc
@@ -12,3 +12,4 @@
 addressbook16mask     BITMAP  "rc/addressbook16mask.bmp"
 addressbook20         BITMAP  "rc/addressbook20.bmp"
 addressbook20mask     BITMAP  "rc/addressbook20mask.bmp"
+favicon               ICON    "rc/favicon.ico"