ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

notepad: Use the more specific MAKEINTRESOURCEW macro.

This commit is contained in:
Michael Stefaniuc 2009-05-18 21:07:49 +02:00 committed by Alexandre Julliard
parent 69365793b1
commit f706c68cf9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/notepad/dialog.c
View File

@ -798,7 +798,7 @@ VOID DIALOG_HelpAboutNotepad(VOID)
{ {
static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 }; static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 };
WCHAR szNotepad[MAX_STRING_LEN]; WCHAR szNotepad[MAX_STRING_LEN];
HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD), HICON icon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD),
IMAGE_ICON, 48, 48, LR_SHARED); IMAGE_ICON, 48, 48, LR_SHARED);
LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad));
@ -812,7 +812,7 @@ VOID DIALOG_HelpAboutNotepad(VOID)
*/ */
VOID DIALOG_FilePageSetup(void) VOID DIALOG_FilePageSetup(void)
{ {
DialogBox(Globals.hInstance, MAKEINTRESOURCE(DIALOG_PAGESETUP), DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(DIALOG_PAGESETUP),
Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc);
} }

8
programs/notepad/main.c
View File

@ -736,10 +736,10 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
class.cbSize = sizeof(class); class.cbSize = sizeof(class);
class.lpfnWndProc = NOTEPAD_WndProc; class.lpfnWndProc = NOTEPAD_WndProc;
class.hInstance = Globals.hInstance; class.hInstance = Globals.hInstance;
class.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); class.hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD));
class.hCursor = LoadCursor(0, IDC_ARROW); class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW);
class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); class.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU);
class.lpszClassName = className; class.lpszClassName = className;
if (!RegisterClassEx(&class)) return FALSE; if (!RegisterClassEx(&class)) return FALSE;
@ -777,7 +777,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
HandleCommandLine(GetCommandLine()); HandleCommandLine(GetCommandLine());
hAccel = LoadAccelerators( hInstance, MAKEINTRESOURCE(ID_ACCEL) ); hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(ID_ACCEL));
while (GetMessage(&msg, 0, 0, 0)) while (GetMessage(&msg, 0, 0, 0))
{ {