Mercurial > DynamicMail

changeset 13:fbd6ed36e1f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stupid merge... need to figure out how to stop these branches.
author Brian Smith <brian@dbsoft.org>
date Tue, 15 Mar 2011 18:05:25 -0500
parents 1f0a811c5b07 (current diff) a010ee800601 (diff)
children 0e5ad8816cd7
files
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dmail.c	Sun Mar 13 00:05:58 2011 -0600
+++ b/dmail.c	Tue Mar 15 18:05:25 2011 -0500
@@ -22,7 +22,7 @@
 HWND in_about = 0, hwndNBK;
 HWND stext1, stext2, stext3;
 
-ULONG fileicon, foldericon, linkicon;
+HICN fileicon, foldericon, linkicon;
 
 /* Used for popup menus */
 char *contexttext = NULL;
@@ -966,7 +966,7 @@
 
 	window = dw_window_new(HWND_DESKTOP, mp ? (mp->topic ? mp->topic : "") : "New Message", flStyle);
 
-	dw_window_set_icon(window, MAIN_FRAME);
+	dw_window_set_icon(window, (HICN)MAIN_FRAME);
 
 	if(readonly)
 		dw_window_set_data(window, "readonly", (void *)1);
@@ -1374,7 +1374,7 @@
 
 	hwndFrame = dw_window_new(HWND_DESKTOP, "DynamicMail", flStyle);
 
-	dw_window_set_icon(hwndFrame, MAIN_FRAME);
+	dw_window_set_icon(hwndFrame, (HICN)MAIN_FRAME);
 
 	mainbox = dw_box_new(BOXVERT, 0);
 
@@ -1627,7 +1627,7 @@
 
 	if(hwndFrame)
 	{
-		dw_window_set_icon(hwndFrame, MAIN_FRAME);
+		dw_window_set_icon(hwndFrame, (HICN)MAIN_FRAME);
 
 		dw_signal_connect(hwndFrame, DW_SIGNAL_DELETE, DW_SIGNAL_FUNC(exitfunc), NULL);