Alexander Nicolaysen Sørnes : notepad: Add program icon.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Aug 28 07:50:17 CDT 2007
Module: wine
Branch: master
Commit: 29b69c54b0ddf7469b1046f0ea94983ff4a42620
URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b69c54b0ddf7469b1046f0ea94983ff4a42620
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Sat Aug 25 18:26:15 2007 +0200
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(-)
diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index ad1e9a4..0a62c5e 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 c7b961f..18500df 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 0000000..002bbba
Binary files /dev/null and b/programs/notepad/notepad.ico differ
diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h
index 16f5c14..d95239a 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 51ce7a9..119ede1 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"
More information about the wine-cvs
mailing list