Index: programs/notepad/Bg.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Bg.rc,v
retrieving revision 1.1
diff -u -p -r1.1 Bg.rc
--- programs/notepad/Bg.rc	19 Sep 2005 17:00:58 -0000	1.1
+++ programs/notepad/Bg.rc	4 Oct 2005 14:05:28 -0000
@@ -87,9 +87,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "��&��:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "������",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&�����",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "������",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&�����",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Cs.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Cs.rc,v
retrieving revision 1.1
diff -u -p -r1.1 Cs.rc
--- programs/notepad/Cs.rc	18 Oct 2004 19:42:43 -0000	1.1
+++ programs/notepad/Cs.rc	4 Oct 2005 14:05:28 -0000
@@ -90,9 +90,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Doln�:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Storno",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&N�pov�da",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Storno",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&N�pov�da",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Da.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Da.rc,v
retrieving revision 1.12
diff -u -p -r1.12 Da.rc
--- programs/notepad/Da.rc	24 Aug 2004 18:33:02 -0000	1.12
+++ programs/notepad/Da.rc	4 Oct 2005 14:05:29 -0000
@@ -86,9 +86,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Bund:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Annuller",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Hj�lp",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Annuller",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Hj�lp",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/De.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/De.rc,v
retrieving revision 1.16
diff -u -p -r1.16 De.rc
--- programs/notepad/De.rc	9 May 2005 09:23:29 -0000	1.16
+++ programs/notepad/De.rc	4 Oct 2005 14:05:29 -0000
@@ -89,9 +89,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Unten:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Abbrechen",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Hilfe",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Abbrechen",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Hilfe",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/En.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/En.rc,v
retrieving revision 1.17
diff -u -p -r1.17 En.rc
--- programs/notepad/En.rc	7 May 2005 12:13:51 -0000	1.17
+++ programs/notepad/En.rc	4 Oct 2005 14:05:30 -0000
@@ -89,9 +89,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Bottom:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Cancel",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Help",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Cancel",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Help",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Es.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Es.rc,v
retrieving revision 1.14
diff -u -p -r1.14 Es.rc
--- programs/notepad/Es.rc	16 Feb 2005 21:11:00 -0000	1.14
+++ programs/notepad/Es.rc	4 Oct 2005 14:05:30 -0000
@@ -91,9 +91,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "Aba&jo:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "Aceptar",      0x151,                 180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Cancelar",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Ayuda",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "Aceptar",      IDOK,                 180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Cancelar",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Ayuda",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Fi.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Fi.rc,v
retrieving revision 1.10
diff -u -p -r1.10 Fi.rc
--- programs/notepad/Fi.rc	24 Aug 2004 18:33:02 -0000	1.10
+++ programs/notepad/Fi.rc	4 Oct 2005 14:05:31 -0000
@@ -86,9 +86,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Ala:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Peruuta",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Apua",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Peruuta",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Apua",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Fr.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Fr.rc,v
retrieving revision 1.15
diff -u -p -r1.15 Fr.rc
--- programs/notepad/Fr.rc	24 Aug 2004 18:33:02 -0000	1.15
+++ programs/notepad/Fr.rc	4 Oct 2005 14:05:31 -0000
@@ -89,9 +89,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Bas :",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Annuler",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Aide",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Annuler",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Aide",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Hu.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Hu.rc,v
retrieving revision 1.2
diff -u -p -r1.2 Hu.rc
--- programs/notepad/Hu.rc	24 Aug 2004 18:33:02 -0000	1.2
+++ programs/notepad/Hu.rc	4 Oct 2005 14:05:31 -0000
@@ -88,9 +88,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Als�:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "M�gse",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&S�g�",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "M�gse",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&S�g�",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
Index: programs/notepad/It.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/It.rc,v
retrieving revision 1.7
diff -u -p -r1.7 It.rc
--- programs/notepad/It.rc	24 Aug 2004 18:33:02 -0000	1.7
+++ programs/notepad/It.rc	4 Oct 2005 14:05:32 -0000
@@ -91,9 +91,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Inferiore:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Cancella",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Aiuto",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Cancella",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Aiuto",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Ja.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Ja.rc,v
retrieving revision 1.1
diff -u -p -r1.1 Ja.rc
--- programs/notepad/Ja.rc	28 Jun 2004 23:50:22 -0000	1.1
+++ programs/notepad/Ja.rc	4 Oct 2005 14:05:32 -0000
@@ -89,9 +89,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "��(&B):",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "�L�����Z��",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "�w���v(&H)",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "�L�����Z��",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "�w���v(&H)",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Nl.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Nl.rc,v
retrieving revision 1.4
diff -u -p -r1.4 Nl.rc
--- programs/notepad/Nl.rc	26 Jan 2005 19:42:40 -0000	1.4
+++ programs/notepad/Nl.rc	4 Oct 2005 14:05:33 -0000
@@ -87,9 +87,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Onder:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",        0x151,               180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Annuleren", 0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Help",     0x153,               180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",        IDOK,               180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Annuleren", IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Help",     IDHELP,               180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/No.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/No.rc,v
retrieving revision 1.1
diff -u -p -r1.1 No.rc
--- programs/notepad/No.rc	17 Sep 2005 14:30:33 -0000	1.1
+++ programs/notepad/No.rc	4 Oct 2005 14:05:33 -0000
@@ -87,9 +87,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Bunn:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Avbryt",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Hjelp",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Avbryt",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Hjelp",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Pl.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Pl.rc,v
retrieving revision 1.2
diff -u -p -r1.2 Pl.rc
--- programs/notepad/Pl.rc	24 Aug 2004 18:33:02 -0000	1.2
+++ programs/notepad/Pl.rc	4 Oct 2005 14:05:33 -0000
@@ -90,9 +90,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Dolny:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Anuluj",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Pomoc",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Anuluj",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Pomoc",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Pt.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Pt.rc,v
retrieving revision 1.13
diff -u -p -r1.13 Pt.rc
--- programs/notepad/Pt.rc	10 Feb 2005 17:14:15 -0000	1.13
+++ programs/notepad/Pt.rc	4 Oct 2005 14:05:34 -0000
@@ -141,9 +141,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Inferior:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Cancelar",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Ajuda",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Cancelar",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Ajuda",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 
Index: programs/notepad/Ru.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Ru.rc,v
retrieving revision 1.2
diff -u -p -r1.2 Ru.rc
--- programs/notepad/Ru.rc	24 Aug 2004 18:33:02 -0000	1.2
+++ programs/notepad/Ru.rc	4 Oct 2005 14:05:34 -0000
@@ -85,9 +85,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&������:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "������",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&�������",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "������",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&�������",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
Index: programs/notepad/Si.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Si.rc,v
retrieving revision 1.6
diff -u -p -r1.6 Si.rc
--- programs/notepad/Si.rc	24 Aug 2004 18:33:02 -0000	1.6
+++ programs/notepad/Si.rc	4 Oct 2005 14:05:35 -0000
@@ -86,9 +86,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Spodaj:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "V redu",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Prekli�i",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Pomo�",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "V redu",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Prekli�i",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Pomo�",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Sk.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Sk.rc,v
retrieving revision 1.9
diff -u -p -r1.9 Sk.rc
--- programs/notepad/Sk.rc	24 Aug 2004 18:33:02 -0000	1.9
+++ programs/notepad/Sk.rc	4 Oct 2005 14:05:35 -0000
@@ -87,9 +87,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Bottom:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Cancel",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Help",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Cancel",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Help",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Sw.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Sw.rc,v
retrieving revision 1.11
diff -u -p -r1.11 Sw.rc
--- programs/notepad/Sw.rc	24 Aug 2004 18:33:02 -0000	1.11
+++ programs/notepad/Sw.rc	4 Oct 2005 14:05:36 -0000
@@ -87,9 +87,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Under:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "OK",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Avbryt",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Hj�lp",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Avbryt",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Hj�lp",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Th.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Th.rc,v
retrieving revision 1.2
diff -u -p -r1.2 Th.rc
--- programs/notepad/Th.rc	24 Aug 2004 18:33:02 -0000	1.2
+++ programs/notepad/Th.rc	4 Oct 2005 14:05:36 -0000
@@ -87,9 +87,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "��ҧ:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "��ŧ",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "¡��ԡ",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "���������",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "��ŧ",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "¡��ԡ",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "���������",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Wa.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Wa.rc,v
retrieving revision 1.11
diff -u -p -r1.11 Wa.rc
--- programs/notepad/Wa.rc	24 Aug 2004 18:33:02 -0000	1.11
+++ programs/notepad/Wa.rc	4 Oct 2005 14:05:36 -0000
@@ -89,9 +89,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "&Bas:",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "I Va",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Rinonc�",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "&Aide",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "I Va",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "Rinonc�",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "&Aide",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE
Index: programs/notepad/Zh.rc
===================================================================
RCS file: /home/wine/wine/programs/notepad/Zh.rc,v
retrieving revision 1.2
diff -u -p -r1.2 Zh.rc
--- programs/notepad/Zh.rc	24 Aug 2004 18:33:02 -0000	1.2
+++ programs/notepad/Zh.rc	4 Oct 2005 14:05:37 -0000
@@ -84,9 +84,9 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*
 LTEXT    "�£�&B����",      0x14E,100, 73, 30, 10, WS_CHILD
 EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
 
-DEFPUSHBUTTON "ȷ��",         0x151,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "ȡ��",     0x152,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "������&��",       0x153,                180, 39, 40, 15, WS_TABSTOP
+DEFPUSHBUTTON "ȷ��",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
+PUSHBUTTON    "ȡ��",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON    "������&��",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
 }
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
