diff --git a/checkin_notes b/checkin_notes index 4a6248e4be..8f6c1e3edd 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9668,3 +9668,11 @@ Charlie 18 Oct 2007 client/ hostinfo_unix.C + +Rom 18 Oct 2007 + - TRAY: Remove the icon resource from boinctray.exe + + clienttray/ + boinc_tray.h + boinc_tray.rc + tray_win.cpp diff --git a/clienttray/boinc_tray.h b/clienttray/boinc_tray.h index 05374dc872..b53c9079a1 100644 --- a/clienttray/boinc_tray.h +++ b/clienttray/boinc_tray.h @@ -2,7 +2,6 @@ // Microsoft Visual C++ generated include file. // Used by boinc_tray.rc // -#define IDI_MAIN_ICON 1 // Next default values for new objects // diff --git a/clienttray/boinc_tray.rc b/clienttray/boinc_tray.rc index 72f7784e88..fa9510e194 100644 --- a/clienttray/boinc_tray.rc +++ b/clienttray/boinc_tray.rc @@ -23,16 +23,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_MAIN_ICON ICON "res\\icon.ico" - - ///////////////////////////////////////////////////////////////////////////// // // Version diff --git a/clienttray/res/icon.ico b/clienttray/res/icon.ico deleted file mode 100644 index 2bc3437e09..0000000000 Binary files a/clienttray/res/icon.ico and /dev/null differ diff --git a/clienttray/tray_win.cpp b/clienttray/tray_win.cpp index 7b86221923..67d24c7e0a 100644 --- a/clienttray/tray_win.cpp +++ b/clienttray/tray_win.cpp @@ -48,8 +48,8 @@ INT CBOINCTray::Run( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi if (!hPrevInstance) { // Register an appropriate window class for the primary window WNDCLASS cls; - cls.hCursor = LoadCursor(NULL, IDC_ARROW); - cls.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN_ICON)); + cls.hCursor = NULL; + cls.hIcon = NULL; cls.lpszMenuName = NULL; cls.lpszClassName = _T("BOINCTrayWndClass"); cls.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);