From 29b69c54b0ddf7469b1046f0ea94983ff4a42620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Nicolaysen=20S=C3=B8rnes?= Date: Sat, 25 Aug 2007 18:26:15 +0200 Subject: [PATCH] notepad: Add program icon. --- programs/notepad/dialog.c | 3 ++- programs/notepad/main.c | 2 +- programs/notepad/notepad.ico | Bin 0 -> 2238 bytes programs/notepad/notepad_res.h | 2 ++ programs/notepad/rsrc.rc | 3 +++ 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 programs/notepad/notepad.ico diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ad1e9a4e6c6..0a62c5e5097 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -791,9 +791,10 @@ VOID DIALOG_HelpAboutWine(VOID) { static const WCHAR notepadW[] = { 'N','o','t','e','p','a','d','\n',0 }; WCHAR szNotepad[MAX_STRING_LEN]; + HICON icon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); - ShellAbout(Globals.hMainWnd, szNotepad, notepadW, 0); + ShellAbout(Globals.hMainWnd, szNotepad, notepadW, icon); } diff --git a/programs/notepad/main.c b/programs/notepad/main.c index c7b961f43e6..18500df06f9 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -647,7 +647,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) class.cbSize = sizeof(class); class.lpfnWndProc = NOTEPAD_WndProc; class.hInstance = Globals.hInstance; - class.hIcon = LoadIcon(0, IDI_APPLICATION); + class.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); class.hCursor = LoadCursor(0, IDC_ARROW); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); diff --git a/programs/notepad/notepad.ico b/programs/notepad/notepad.ico new file mode 100644 index 0000000000000000000000000000000000000000..002bbbac111433f6873c45cd163bae353f53db63 GIT binary patch literal 2238 zcmZQzU<5)11qL9=!LWjZfkBLcfk6X^fkF%pKnxPc1^)m450*M`fPo<*B7y=X zlC76qJ4f|l4|81cJt{sL0wje1BX$5cgE28FIVCkMJtH$KJ0~|Uzo4+FxTKU3A@Aes z=N}Ll6dV#779J596&({B7oUJ6Z*E~}Wo=_?XYb(XKd9__~eyURMqgwD<~>qm1ct4FDoaHS6)h52CFD@g3k!n-1Eyb42vwR1O`cx>O&%JQF#WuI_~p5I!1Byc0E-Byb_PaHF0A_D z@*G&Dp`iz?yx0lIv!PfIb_K`{aPwIS=x4zy57W-T2$6<)4@iT3h>(YQ7?q~6JR`z< qJb44232`%k_2>Tv1_pG@4-~_N<$-e8usu*58?Fb6W5Xb;{{sN)^qe37 literal 0 HcmV?d00001 diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index 16f5c14bed7..d95239afbd0 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -23,6 +23,8 @@ #define DIALOG_PAGESETUP 0x202 #define ID_ACCEL 0x203 +#define IDI_NOTEPAD 0x300 + /* Commands */ #define CMD_NEW 0x100 #define CMD_OPEN 0x101 diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc index 51ce7a9a609..119ede1abed 100644 --- a/programs/notepad/rsrc.rc +++ b/programs/notepad/rsrc.rc @@ -44,6 +44,9 @@ ID_ACCEL ACCELERATORS VK_INSERT, CMD_PASTE, VIRTKEY, SHIFT } +/* @makedep: notepad.ico */ +IDI_NOTEPAD ICON "notepad.ico" + #include "Bg.rc" #include "Cs.rc" #include "Da.rc"