Alexander Nicolaysen Sørnes : wordpad: Refer to main menu using IDM_MAINMENU.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 04aefe8647e6683b7f656ea61fa2e4f99aea0764
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=04aefe8647e6683b7f656ea61fa2e4f99aea0764

Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date:   Sun Nov  4 12:34:03 2007 +0100

wordpad: Refer to main menu using IDM_MAINMENU.

---

 programs/wordpad/De.rc      |    2 +-
 programs/wordpad/En.rc      |    2 +-
 programs/wordpad/Fr.rc      |    2 +-
 programs/wordpad/Hu.rc      |    2 +-
 programs/wordpad/Ko.rc      |    3 ++-
 programs/wordpad/Nl.rc      |    2 +-
 programs/wordpad/No.rc      |    2 +-
 programs/wordpad/Pl.rc      |    2 +-
 programs/wordpad/Ru.rc      |    2 +-
 programs/wordpad/Tr.rc      |    2 +-
 programs/wordpad/resource.h |    3 ++-
 programs/wordpad/wordpad.c  |    5 ++---
 12 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc
index 7175fa7..079d63d 100644
--- a/programs/wordpad/De.rc
+++ b/programs/wordpad/De.rc
@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Datei"
     BEGIN
diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc
index a14ec7f..a2b26f6 100644
--- a/programs/wordpad/En.rc
+++ b/programs/wordpad/En.rc
@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&File"
     BEGIN
diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc
index 1902a0a..46928f6 100644
--- a/programs/wordpad/Fr.rc
+++ b/programs/wordpad/Fr.rc
@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Fichier"
     BEGIN
diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc
index 7b72a7f..0070d86 100644
--- a/programs/wordpad/Hu.rc
+++ b/programs/wordpad/Hu.rc
@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Fájl"
     BEGIN
diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc
index 5e6633e..9ef5d59 100644
--- a/programs/wordpad/Ko.rc
+++ b/programs/wordpad/Ko.rc
@@ -19,7 +19,8 @@
 
 
 LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
-MAINMENU MENU DISCARDABLE  
+
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "ÆÄÀÏ(&F)"
     BEGIN
diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc
index 04042d8..52f826e 100644
--- a/programs/wordpad/Nl.rc
+++ b/programs/wordpad/Nl.rc
@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Bestand"
     BEGIN
diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc
index 0c203ed..5907e44 100644
--- a/programs/wordpad/No.rc
+++ b/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
diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc
index 3ed7e81..5438433 100644
--- a/programs/wordpad/Pl.rc
+++ b/programs/wordpad/Pl.rc
@@ -19,7 +19,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Plik"
     BEGIN
diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc
index 3eaf438..5c813e9 100644
--- a/programs/wordpad/Ru.rc
+++ b/programs/wordpad/Ru.rc
@@ -18,7 +18,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Ôàéë"
     BEGIN
diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc
index b3463f0..60cf300 100644
--- a/programs/wordpad/Tr.rc
+++ b/programs/wordpad/Tr.rc
@@ -20,7 +20,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-MAINMENU MENU DISCARDABLE 
+IDM_MAINMENU MENU DISCARDABLE
 BEGIN
     POPUP "&Dosya"
     BEGIN
diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h
index 130eb94..f1c277d 100644
--- a/programs/wordpad/resource.h
+++ b/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
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index a117a75..2f6af3c 100644
--- a/programs/wordpad/wordpad.c
+++ b/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);