Add calculator icon

svn path=/trunk/; revision=20857

diff --git a/reactos/subsys/system/calc/calculator.ico b/reactos/subsys/system/calc/calculator.ico
new file mode 100644 (file)
index 0000000..93c4994
Binary files /dev/null and b/reactos/subsys/system/calc/calculator.ico differ

diff --git a/reactos/subsys/system/calc/resource.h b/reactos/subsys/system/calc/resource.h
index 9938d36..bb690ac 100644 (file)
--- a/reactos/subsys/system/calc/resource.h
+++ b/reactos/subsys/system/calc/resource.h
@@ -32,6 +32,8 @@
 #define IDM_SEPARATOR3         1010
 #define IDM_WHATS_THIS         1011
 
+#define IDI_CALCICON           1050 
+
 /* strings */
 
 #define IDS_APPNAME            1100

diff --git a/reactos/subsys/system/calc/rsrc.rc b/reactos/subsys/system/calc/rsrc.rc
index 11a00c1..3838c8e 100644 (file)
--- a/reactos/subsys/system/calc/rsrc.rc
+++ b/reactos/subsys/system/calc/rsrc.rc
@@ -21,6 +21,8 @@
 #include <windows.h>
 #include "resource.h"
 
+IDI_CALCICON ICON "calculator.ico"
+
 #include "En.rc"
 #include "Cz.rc"
 #include "De.rc"

diff --git a/reactos/subsys/system/calc/winecalc.c b/reactos/subsys/system/calc/winecalc.c
index 0b79875..5f2b4d6 100644 (file)
--- a/reactos/subsys/system/calc/winecalc.c
+++ b/reactos/subsys/system/calc/winecalc.c
@@ -172,7 +172,7 @@ int WINAPI WinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmd
     wc.cbClsExtra    = 0;
     wc.cbWndExtra    = 0;
     wc.hInstance     = hInst;
-    wc.hIcon         = LoadIcon( hInst, appname );
+    wc.hIcon         = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CALCICON));
     wc.hCursor       = LoadCursor( NULL, IDI_APPLICATION );
     wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
     wc.lpszMenuName  = NULL;