From 2a0f86afc5e343896f650f8dbbc93a2e7db8572c Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Fri, 16 Jan 2009 13:51:18 +0000 Subject: [PATCH] comdlg32: We need to be able to type the decimal separator into the margin edit controls so ES_NUMBER is no use. Subclass them and filter WM_CHAR instead. --- dlls/comdlg32/cdlg_Bg.rc | 8 ++++---- dlls/comdlg32/cdlg_Cs.rc | 8 ++++---- dlls/comdlg32/cdlg_Da.rc | 8 ++++---- dlls/comdlg32/cdlg_De.rc | 8 ++++---- dlls/comdlg32/cdlg_El.rc | 8 ++++---- dlls/comdlg32/cdlg_En.rc | 8 ++++---- dlls/comdlg32/cdlg_Eo.rc | 8 ++++---- dlls/comdlg32/cdlg_Es.rc | 8 ++++---- dlls/comdlg32/cdlg_Fi.rc | 8 ++++---- dlls/comdlg32/cdlg_Fr.rc | 8 ++++---- dlls/comdlg32/cdlg_It.rc | 8 ++++---- dlls/comdlg32/cdlg_Ja.rc | 8 ++++---- dlls/comdlg32/cdlg_Ko.rc | 8 ++++---- dlls/comdlg32/cdlg_Nl.rc | 8 ++++---- dlls/comdlg32/cdlg_No.rc | 8 ++++---- dlls/comdlg32/cdlg_Pl.rc | 8 ++++---- dlls/comdlg32/cdlg_Pt.rc | 16 ++++++++-------- dlls/comdlg32/cdlg_Ro.rc | 8 ++++---- dlls/comdlg32/cdlg_Ru.rc | 8 ++++---- dlls/comdlg32/cdlg_Si.rc | 8 ++++---- dlls/comdlg32/cdlg_Sv.rc | 8 ++++---- dlls/comdlg32/cdlg_Th.rc | 8 ++++---- dlls/comdlg32/cdlg_Tr.rc | 8 ++++---- dlls/comdlg32/cdlg_Zh.rc | 8 ++++---- dlls/comdlg32/printdlg.c | 36 ++++++++++++++++++++++++++++++++++++ 25 files changed, 136 insertions(+), 100 deletions(-) diff --git a/dlls/comdlg32/cdlg_Bg.rc b/dlls/comdlg32/cdlg_Bg.rc index b5b6c167e6a..746b942fa70 100644 --- a/dlls/comdlg32/cdlg_Bg.rc +++ b/dlls/comdlg32/cdlg_Bg.rc @@ -314,13 +314,13 @@ BEGIN AUTORADIOBUTTON "&", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Cs.rc b/dlls/comdlg32/cdlg_Cs.rc index 5831e10c577..64e9f892757 100644 --- a/dlls/comdlg32/cdlg_Cs.rc +++ b/dlls/comdlg32/cdlg_Cs.rc @@ -316,13 +316,13 @@ BEGIN AUTORADIOBUTTON "N&a ku", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Okraje", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&ev:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "P&rav:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "H&orn:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Doln:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Zruit", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "Tisk&rna...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Da.rc b/dlls/comdlg32/cdlg_Da.rc index b85ca0e66b5..839a1a46c7b 100644 --- a/dlls/comdlg32/cdlg_Da.rc +++ b/dlls/comdlg32/cdlg_Da.rc @@ -314,13 +314,13 @@ BEGIN AUTORADIOBUTTON "&Landskab", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Kanter", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Venstre:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Hjre:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "T&op:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Bund:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Annuller", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "P&rinter...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index bcdb4847803..5f86e0cbb6a 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -133,13 +133,13 @@ BEGIN AUTORADIOBUTTON "&Querformat", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Rnder", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Links:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Rechts:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Oben:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Unten:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Abbrechen", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Drucker...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_El.rc b/dlls/comdlg32/cdlg_El.rc index f448f77f013..9fa64dde42a 100644 --- a/dlls/comdlg32/cdlg_El.rc +++ b/dlls/comdlg32/cdlg_El.rc @@ -313,13 +313,13 @@ BEGIN AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc index bacdb548307..962c1891152 100644 --- a/dlls/comdlg32/cdlg_En.rc +++ b/dlls/comdlg32/cdlg_En.rc @@ -313,13 +313,13 @@ BEGIN AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&eft:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Right:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "T&op:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Bottom:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "P&rinter...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Eo.rc b/dlls/comdlg32/cdlg_Eo.rc index 76198184bf4..b9573f455a5 100644 --- a/dlls/comdlg32/cdlg_Eo.rc +++ b/dlls/comdlg32/cdlg_Eo.rc @@ -311,13 +311,13 @@ AUTORADIOBUTTON "&Vertikala", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Horizontala", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Marenoj", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Dekstra:", stc15, 88, 172, 21, 8 -EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER +EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Maldekstra:", stc16, 159, 172, 27, 8 -EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER +EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Supre:", stc17, 88, 192, 21, 8 -EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER +EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "Su&be:", stc18, 159, 192, 23, 8 -EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER +EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "Bone", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Rezigni", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Printilo..", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Es.rc b/dlls/comdlg32/cdlg_Es.rc index 9552f7d981f..1f6226a0fb0 100644 --- a/dlls/comdlg32/cdlg_Es.rc +++ b/dlls/comdlg32/cdlg_Es.rc @@ -314,13 +314,13 @@ BEGIN AUTORADIOBUTTON "&Apaisado", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Mrgenes", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "I&zquierdo:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Derecho:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Superior:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "In&ferior:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "Aceptar", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Impresora...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Fi.rc b/dlls/comdlg32/cdlg_Fi.rc index faca299c155..8e732df21a7 100644 --- a/dlls/comdlg32/cdlg_Fi.rc +++ b/dlls/comdlg32/cdlg_Fi.rc @@ -313,13 +313,13 @@ BEGIN AUTORADIOBUTTON "V&aaka", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Reunat", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Vasen:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Oikea:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Vasen:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Pohja:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Peruuta", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "T&ulostin...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Fr.rc b/dlls/comdlg32/cdlg_Fr.rc index d5a8b6e36a0..b8f90f90ab5 100644 --- a/dlls/comdlg32/cdlg_Fr.rc +++ b/dlls/comdlg32/cdlg_Fr.rc @@ -317,13 +317,13 @@ BEGIN AUTORADIOBUTTON "P&aysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Marges", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Droite:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Gauche:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Haut:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Bas:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Imprimante...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_It.rc b/dlls/comdlg32/cdlg_It.rc index d89efa3b509..f48b403f83d 100644 --- a/dlls/comdlg32/cdlg_It.rc +++ b/dlls/comdlg32/cdlg_It.rc @@ -314,13 +314,13 @@ BEGIN AUTORADIOBUTTON "&Verticale", rad2, 13, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Bordi", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Sinistro:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Destro:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Superiore:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Inferiore:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Annulla", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "S&tampante...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Ja.rc b/dlls/comdlg32/cdlg_Ja.rc index bf50b442dec..e29f2624d81 100644 --- a/dlls/comdlg32/cdlg_Ja.rc +++ b/dlls/comdlg32/cdlg_Ja.rc @@ -316,13 +316,13 @@ BEGIN AUTORADIOBUTTON "横(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "余白", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "左(&E):", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "右(&R):", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "上(&O):", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "下(&B):", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "キャンセル", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "プリンタ(&R)...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Ko.rc b/dlls/comdlg32/cdlg_Ko.rc index 18eace5314e..74467935fdd 100644 --- a/dlls/comdlg32/cdlg_Ko.rc +++ b/dlls/comdlg32/cdlg_Ko.rc @@ -315,13 +315,13 @@ BEGIN AUTORADIOBUTTON "(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "ڸ", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "(&E):", stc15, 82, 173, 28, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "(&R):", stc16, 151, 172, 34, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "(&O):", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "Ʒ(&B):", stc18, 154, 191, 31, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "Ȯ", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "(&R)...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index 8728d0456d5..baeb880a875 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -336,13 +336,13 @@ BEGIN AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&inks:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Rechts:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "B&oven:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Onder:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Annuleren", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "P&rinter...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_No.rc b/dlls/comdlg32/cdlg_No.rc index 59838465200..e1d35f5416a 100644 --- a/dlls/comdlg32/cdlg_No.rc +++ b/dlls/comdlg32/cdlg_No.rc @@ -313,13 +313,13 @@ BEGIN AUTORADIOBUTTON "&Liggende", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Rammer", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "V&enstre:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "Hy&re:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "T&opp:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Bunn:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "Sk&river...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Pl.rc b/dlls/comdlg32/cdlg_Pl.rc index 2b5eb5a0342..796054b6db3 100644 --- a/dlls/comdlg32/cdlg_Pl.rc +++ b/dlls/comdlg32/cdlg_Pl.rc @@ -315,13 +315,13 @@ BEGIN AUTORADIOBUTTON "P&ozioma", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Marginesy", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Lewy:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Prawy:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Grny:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Dolny:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Anuluj", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "Dr&ukarka...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Pt.rc b/dlls/comdlg32/cdlg_Pt.rc index 3ac86505878..2da9de53fdf 100644 --- a/dlls/comdlg32/cdlg_Pt.rc +++ b/dlls/comdlg32/cdlg_Pt.rc @@ -622,13 +622,13 @@ BEGIN AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Bordas", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Esquerda:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Direita:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Superior:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Inferior:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "Im&pressora...", psh3, 184, 220, 50, 14 @@ -654,13 +654,13 @@ BEGIN AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Bordas", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Esquerda:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Direita:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Superior:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Inferior:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "Im&pressora...", psh3, 184, 220, 50, 14 diff --git a/dlls/comdlg32/cdlg_Ro.rc b/dlls/comdlg32/cdlg_Ro.rc index b8f6a95eae4..0c58bfca874 100644 --- a/dlls/comdlg32/cdlg_Ro.rc +++ b/dlls/comdlg32/cdlg_Ro.rc @@ -316,13 +316,13 @@ BEGIN AUTORADIOBUTTON "&Peisaj", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Margini", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "S&tânga:", stc15, 84, 172, 27, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Dreapta:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Sus:", stc17, 84, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Jos:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Renunță", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Imprimantă...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Ru.rc b/dlls/comdlg32/cdlg_Ru.rc index 6be6b99486e..c5af92cb009 100644 --- a/dlls/comdlg32/cdlg_Ru.rc +++ b/dlls/comdlg32/cdlg_Ru.rc @@ -312,13 +312,13 @@ BEGIN AUTORADIOBUTTON "&", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&:", stc15, 88, 172, 31, 8 - EDITTEXT edt4, 121, 170, 29, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 121, 170, 29, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 29, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 29, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc17, 88, 192, 31, 8 - EDITTEXT edt5, 121, 190, 29, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 121, 190, 29, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 29, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 29, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Si.rc b/dlls/comdlg32/cdlg_Si.rc index 086467c1866..0650f535920 100644 --- a/dlls/comdlg32/cdlg_Si.rc +++ b/dlls/comdlg32/cdlg_Si.rc @@ -315,13 +315,13 @@ BEGIN AUTORADIOBUTTON "L&ežeče", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Robovi", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Levo:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Desno:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Zgoraj:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Spodaj:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "V redu", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Prekliči", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Sv.rc b/dlls/comdlg32/cdlg_Sv.rc index 2ef87b201e5..7abcfb47b9b 100644 --- a/dlls/comdlg32/cdlg_Sv.rc +++ b/dlls/comdlg32/cdlg_Sv.rc @@ -306,13 +306,13 @@ BEGIN AUTORADIOBUTTON "&Liggande", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Marginaler", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Vnster:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Hger:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&verkant:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Nederkant:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "Ok", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Skrivare...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Th.rc b/dlls/comdlg32/cdlg_Th.rc index 8b246e5ac5c..2e7131fd90d 100644 --- a/dlls/comdlg32/cdlg_Th.rc +++ b/dlls/comdlg32/cdlg_Th.rc @@ -313,13 +313,13 @@ BEGIN AUTORADIOBUTTON "ǹ͹", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "ͺд", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT ":", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT ":", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT ":", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "ҧ:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "ŧ", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "¡ԡ", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "ͧ...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Tr.rc b/dlls/comdlg32/cdlg_Tr.rc index bb313dbacb6..ba95000e53a 100644 --- a/dlls/comdlg32/cdlg_Tr.rc +++ b/dlls/comdlg32/cdlg_Tr.rc @@ -314,13 +314,13 @@ BEGIN AUTORADIOBUTTON "&Yatay", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Kenarlklar", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "S&ol:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Sa:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&st:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Alt:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "Tamam", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "ptal", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "Ya&zc...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/cdlg_Zh.rc b/dlls/comdlg32/cdlg_Zh.rc index cfb4227f0d1..d17896edc76 100644 --- a/dlls/comdlg32/cdlg_Zh.rc +++ b/dlls/comdlg32/cdlg_Zh.rc @@ -320,13 +320,13 @@ BEGIN AUTORADIOBUTTON "横向(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "边距", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "左(&e):", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "右(&R):", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "上(&o):", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "下(&B):", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "确定", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "打印机(&P)...", psh3, 184, 220, 48, 14 diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index fdedbcf1d7a..8217d0a77eb 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -35,6 +35,7 @@ #include "winspool.h" #include "winerror.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "commdlg.h" @@ -73,6 +74,7 @@ static const struct pd_flags psd_flags[] = { /* address of wndproc for subclassed Static control */ static WNDPROC lpfnStaticWndProc; +static WNDPROC edit_wndproc; /* the text of the fake document to render for the Page Setup dialog */ static WCHAR wszFakeDocumentText[1024]; static const WCHAR pd32_collateW[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; @@ -3302,6 +3304,39 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) #undef CALLPAINTHOOK } +/******************************************************* + * The margin edit controls are subclassed to filter + * anything other than numbers and the decimal separator. + */ +static LRESULT CALLBACK pagesetup_margin_editproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + WCHAR decimal = '.'; + + /* FIXME use LOCALE_SDECIMAL when the edit parsing code can cope */ + + switch(msg) + case WM_CHAR: + { + WCHAR wc = (WCHAR)wparam; + if(!isdigitW(wc) && wc != decimal && wc != VK_BACK) return 0; + } + return CallWindowProcW(edit_wndproc, hwnd, msg, wparam, lparam); +} + +static void subclass_margin_edits(HWND hDlg) +{ + int id; + WNDPROC old_proc; + + for(id = edt4; id <= edt7; id++) + { + old_proc = (WNDPROC)SetWindowLongPtrW(GetDlgItem(hDlg, id), + GWLP_WNDPROC, + (ULONG_PTR)pagesetup_margin_editproc); + InterlockedCompareExchangePointer((void**)&edit_wndproc, old_proc, NULL); + } +} + /*********************************************************************** * PRINTDLG_PageDlgProcA * Message handler for PageSetupDlgA @@ -3375,6 +3410,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pda->dlga->rtMargin.bottom = size; } update_margin_edits(hDlg, pda); + subclass_margin_edits(hDlg); set_margin_groupbox_title(hDlg, pda); /* if paper disabled */