Mercurial > dwindows

comparison win/dw.c @ 975:52cd98b7e45c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed to using HANDLE as the base type for HICN on Windows. This may cause ABI issues in Win64 but should be fine for Win32.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 06 May 2011 01:46:27 +0000
parents b00943f21392
children 87dc0f5f96d0
comparison
equal deleted inserted replaced
974:e506776e7fd3 975:52cd98b7e45c
5734 * handle: Handle to the window. 5734 * handle: Handle to the window.
5735 * id: An ID to be used to specify the icon. 5735 * id: An ID to be used to specify the icon.
5736 */ 5736 */
5737 void API dw_window_set_icon(HWND handle, HICN icon) 5737 void API dw_window_set_icon(HWND handle, HICN icon)
5738 { 5738 {
5739 HICON hicon = icon < 65536 ? LoadIcon(DWInstance, MAKEINTRESOURCE(icon)) : (HICON)icon; 5739 int iicon = (int)icon;
5740 HICON hicon = iicon < 65536 ? LoadIcon(DWInstance, MAKEINTRESOURCE(iicon)) : (HICON)icon;
5740 5741
5741 SendMessage(handle, WM_SETICON, 5742 SendMessage(handle, WM_SETICON,
5742 (WPARAM) IMAGE_ICON, 5743 (WPARAM) IMAGE_ICON,
5743 (LPARAM) hicon); 5744 (LPARAM) hicon);
5744 } 5745 }
8310 { 8311 {
8311 NOTIFYICONDATA tnid; 8312 NOTIFYICONDATA tnid;
8312 8313
8313 tnid.cbSize = sizeof(NOTIFYICONDATA); 8314 tnid.cbSize = sizeof(NOTIFYICONDATA);
8314 tnid.hWnd = handle; 8315 tnid.hWnd = handle;
8315 tnid.uID = icon; 8316 tnid.uID = (UINT)icon;
8316 tnid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP; 8317 tnid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
8317 tnid.uCallbackMessage = WM_USER+2; 8318 tnid.uCallbackMessage = WM_USER+2;
8318 tnid.hIcon = (HICON)icon; 8319 tnid.hIcon = (HICON)icon;
8319 if(bubbletext) 8320 if(bubbletext)
8320 strncpy(tnid.szTip, bubbletext, sizeof(tnid.szTip)); 8321 strncpy(tnid.szTip, bubbletext, sizeof(tnid.szTip));
8334 { 8335 {
8335 NOTIFYICONDATA tnid; 8336 NOTIFYICONDATA tnid;
8336 8337
8337 tnid.cbSize = sizeof(NOTIFYICONDATA); 8338 tnid.cbSize = sizeof(NOTIFYICONDATA);
8338 tnid.hWnd = handle; 8339 tnid.hWnd = handle;
8339 tnid.uID = icon; 8340 tnid.uID = (UINT)icon;
8340 8341
8341 Shell_NotifyIcon(NIM_DELETE, &tnid); 8342 Shell_NotifyIcon(NIM_DELETE, &tnid);
8342 } 8343 }
8343 8344
8344 /* 8345 /*