Alexandre Julliard : wordpad: Merge accelerators into the main resource file.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Dec 19 20:14:23 2011 +0100

wordpad: Merge accelerators into the main resource file.

---

 programs/wordpad/En.rc       |   45 ------------------------------------------
 programs/wordpad/Makefile.in |    5 +---
 programs/wordpad/wordpad.rc  |   24 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc
deleted file mode 100644
index 8ce359b..0000000
--- a/programs/wordpad/En.rc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2004 by Krzysztof Foltman
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "wordpad.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-MAINACCELTABLE ACCELERATORS
-BEGIN
-    "1",          ID_BACK_1,          VIRTKEY, CONTROL
-    "2",          ID_BACK_2,          VIRTKEY, CONTROL
-    "L",          ID_ALIGN_LEFT,      VIRTKEY, CONTROL
-    "E",          ID_ALIGN_CENTER,    VIRTKEY, CONTROL
-    "R",          ID_ALIGN_RIGHT,     VIRTKEY, CONTROL
-    "F",          ID_FIND,            VIRTKEY, CONTROL
-    VK_F3,        ID_FIND_NEXT,       VIRTKEY
-    "H",          ID_REPLACE,         VIRTKEY, CONTROL
-    "A",          ID_EDIT_SELECTALL,  VIRTKEY, CONTROL
-    "X",          ID_EDIT_CUT,        VIRTKEY, CONTROL
-    "C",          ID_EDIT_COPY,       VIRTKEY, CONTROL
-    "Z",          ID_EDIT_UNDO,       VIRTKEY, CONTROL
-    "Y",          ID_EDIT_REDO,       VIRTKEY, CONTROL
-    "B",          ID_FORMAT_BOLD,     VIRTKEY, CONTROL
-    "I",          ID_FORMAT_ITALIC,   VIRTKEY, CONTROL
-    "U",          ID_FORMAT_UNDERLINE,VIRTKEY, CONTROL
-    "N",          ID_FILE_NEW,        VIRTKEY, CONTROL
-    "O",          ID_FILE_OPEN,       VIRTKEY, CONTROL
-    "S",          ID_FILE_SAVE,       VIRTKEY, CONTROL
-    "P",          ID_PRINT,           VIRTKEY, CONTROL
-END
diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in
index aef445c..07e2328 100644
--- a/programs/wordpad/Makefile.in
+++ b/programs/wordpad/Makefile.in
@@ -11,10 +11,7 @@ C_SRCS = \
 	registry.c \
 	wordpad.c
 
-RC_SRCS = \
-	En.rc \
-	wordpad.rc
-
+RC_SRCS = wordpad.rc
 PO_SRCS = wordpad.rc
 
 SVG_SRCS = \
diff --git a/programs/wordpad/wordpad.rc b/programs/wordpad/wordpad.rc
index 67e0562..7e0460a 100644
--- a/programs/wordpad/wordpad.rc
+++ b/programs/wordpad/wordpad.rc
@@ -265,6 +265,30 @@ BEGIN
     LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
 END
 
+MAINACCELTABLE ACCELERATORS
+BEGIN
+    "1",          ID_BACK_1,          VIRTKEY, CONTROL
+    "2",          ID_BACK_2,          VIRTKEY, CONTROL
+    "L",          ID_ALIGN_LEFT,      VIRTKEY, CONTROL
+    "E",          ID_ALIGN_CENTER,    VIRTKEY, CONTROL
+    "R",          ID_ALIGN_RIGHT,     VIRTKEY, CONTROL
+    "F",          ID_FIND,            VIRTKEY, CONTROL
+    VK_F3,        ID_FIND_NEXT,       VIRTKEY
+    "H",          ID_REPLACE,         VIRTKEY, CONTROL
+    "A",          ID_EDIT_SELECTALL,  VIRTKEY, CONTROL
+    "X",          ID_EDIT_CUT,        VIRTKEY, CONTROL
+    "C",          ID_EDIT_COPY,       VIRTKEY, CONTROL
+    "Z",          ID_EDIT_UNDO,       VIRTKEY, CONTROL
+    "Y",          ID_EDIT_REDO,       VIRTKEY, CONTROL
+    "B",          ID_FORMAT_BOLD,     VIRTKEY, CONTROL
+    "I",          ID_FORMAT_ITALIC,   VIRTKEY, CONTROL
+    "U",          ID_FORMAT_UNDERLINE,VIRTKEY, CONTROL
+    "N",          ID_FILE_NEW,        VIRTKEY, CONTROL
+    "O",          ID_FILE_OPEN,       VIRTKEY, CONTROL
+    "S",          ID_FILE_SAVE,       VIRTKEY, CONTROL
+    "P",          ID_PRINT,           VIRTKEY, CONTROL
+END
+
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* @makedep: toolbar.bmp */