Mercurial > dwindows

changeset 336:a2f72b5d5d0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor change to dw_window_set_icon() on OS/2 and Windows.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 10 Apr 2003 12:05:36 +0000
parents 97029f1f29de
children e9a424e641ff
files dwtest.c os2/dw.c win/dw.c
diffstat 3 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dwtest.c	Thu Apr 10 07:33:44 2003 +0000
+++ b/dwtest.c	Thu Apr 10 12:05:36 2003 +0000
@@ -660,6 +660,7 @@
 
 	dw_signal_connect(mainwindow, DW_SIGNAL_DELETE, DW_SIGNAL_FUNC(exit_callback), (void *)mainwindow);
 	timerid = dw_timer_connect(1000, DW_SIGNAL_FUNC(timer_callback), 0);
+	dw_window_set_icon(mainwindow, fileicon);
 	dw_window_set_usize(mainwindow, 640, 480);
 	dw_window_show(mainwindow);
 
--- a/os2/dw.c	Thu Apr 10 07:33:44 2003 +0000
+++ b/os2/dw.c	Thu Apr 10 12:05:36 2003 +0000
@@ -4484,9 +4484,7 @@
  */
 void API dw_window_set_icon(HWND handle, ULONG id)
 {
-	HPOINTER icon;
-
-	icon = WinLoadPointer(HWND_DESKTOP,NULLHANDLE,id);
+	HPOINTER icon = id < 65536 ? WinLoadPointer(HWND_DESKTOP,NULLHANDLE,id) : (HPOINTER)id;
 	WinSendMsg(handle, WM_SETICON, (MPARAM)icon, 0);
 }
 
--- a/win/dw.c	Thu Apr 10 07:33:44 2003 +0000
+++ b/win/dw.c	Thu Apr 10 12:05:36 2003 +0000
@@ -4504,7 +4504,7 @@
  */
 void API dw_window_set_icon(HWND handle, ULONG id)
 {
-	HICON hicon = LoadIcon(DWInstance, MAKEINTRESOURCE(id));
+	HICON hicon = id < 65536 ? LoadIcon(DWInstance, MAKEINTRESOURCE(id)) : (HICON)id;
 
 	SendMessage(handle, WM_SETICON,
 				(WPARAM) IMAGE_ICON,