wordpad: Refer to main menu using IDM_MAINMENU.

programs/wordpad/De.rc

@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Datei"
     BEGIN

programs/wordpad/En.rc

@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&File"
     BEGIN

programs/wordpad/Fr.rc

@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Fichier"
     BEGIN

programs/wordpad/Hu.rc

@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Fjl"
     BEGIN

programs/wordpad/Ko.rc

@@ -19,7 +19,8 @@
 
 
 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
-MAINMENU MENU DISCARDABLE  
+
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "파일(&F)"
     BEGIN

programs/wordpad/Nl.rc

@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Bestand"
     BEGIN

programs/wordpad/No.rc

@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Fil"
     BEGIN

programs/wordpad/Pl.rc

@@ -19,7 +19,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Plik"
     BEGIN

programs/wordpad/Ru.rc

@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&"
     BEGIN

programs/wordpad/Tr.rc

@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Dosya"
     BEGIN

programs/wordpad/resource.h

@@ -138,7 +138,8 @@
 #define IDD_TABSTOPS 2103
 #define IDD_FORMATOPTS 2104
 
-#define IDM_POPUP 2200
+#define IDM_MAINMENU 2200
+#define IDM_POPUP 2201
 
 #define IDB_TOOLBAR 100
 #define IDB_FORMATBAR 101

programs/wordpad/wordpad.c

@@ -52,7 +52,6 @@
 
 /* use LoadString */
 static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0};
-static const WCHAR xszMainMenu[] = {'M','A','I','N','M','E','N','U',0};
 
 static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0};
 static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0};
@@ -1528,7 +1527,7 @@ static void preview_bar_show(BOOL show)
 static void preview_exit(void)
 {
     HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE);
-    HMENU hMenu = LoadMenuW(hInstance, xszMainMenu);
+    HMENU hMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_MAINMENU));
 
     set_bar_states();
     preview.window.right = 0;
@@ -3261,7 +3260,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar
     wc.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD));
     wc.hCursor = LoadCursor(NULL, IDC_IBEAM);
     wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW);
-    wc.lpszMenuName = xszMainMenu;
+    wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MAINMENU);
     wc.lpszClassName = wszMainWndClass;
     RegisterClassW(&wc);