Module: wine Branch: master Commit: d0927f63aa3efbe4d84069bd391982dc1563a8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0927f63aa3efbe4d84069bd39...
Author: Dylan Smith dylan.ah.smith@gmail.com Date: Tue Jun 17 21:20:14 2008 -0400
wordpad: Fixed bugs that prevented setting alignment through dialog.
The combobox to select the alignment in the paragraph format dialog did not have enough height to display the dropdown list. Also, code was missing to set the alignment when OK button is pressed. This patch fixes these issues.
---
programs/wordpad/Da.rc | 2 +- programs/wordpad/De.rc | 2 +- programs/wordpad/En.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/Ko.rc | 2 +- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 2 +- programs/wordpad/Pl.rc | 2 +- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Si.rc | 2 +- programs/wordpad/Tr.rc | 2 +- programs/wordpad/wordpad.c | 10 +++++++++- 13 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index e82bc46..7b0ad62 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "F�rste linie", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 0c875a5..8c60473 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "Erste Zeile", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Ausrichtung", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 298fb89..87f5a97 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 5646137..ac40084 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 8b7c8de..254f435 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index bfb3b05..11c8942 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -141,7 +141,7 @@ BEGIN LTEXT "ù° ��", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "����", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "Ȯ��(&O)", IDOK, 137, 15, 50, 15 PUSHBUTTON "���(&C)", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index c5e0d92..bde4be3 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index b70cf5e..411e58a 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "F�rste linje", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 247d5e2..444faf8 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -140,7 +140,7 @@ BEGIN LTEXT "Pierwszy wiersz", 0, 15, 55, 40, 19 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Wyr�wnanie", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index e155f77..d4a67f9 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -139,7 +139,7 @@ BEGIN LTEXT "������ ������", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "������������", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&��", IDOK, 137, 15, 50, 15 PUSHBUTTON "�&�����", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index a2b2462..5242c21 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -141,7 +141,7 @@ BEGIN LTEXT "Prva vrstica", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Poravnava", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&V redu", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Prekliči", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index eeb4455..e8bf6a6 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -141,7 +141,7 @@ BEGIN LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c4d858b..f26e153 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1389,6 +1389,8 @@ static INT_PTR CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPA
static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { + static const WORD ALIGNMENT_VALUES[] = {PFA_LEFT, PFA_RIGHT, PFA_CENTER}; + switch(message) { case WM_INITDIALOG: @@ -1439,14 +1441,19 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, { case IDOK: { + HWND hListWnd = GetDlgItem(hWnd, IDC_PARA_ALIGN); HWND hLeftWnd = GetDlgItem(hWnd, IDC_PARA_LEFT); HWND hRightWnd = GetDlgItem(hWnd, IDC_PARA_RIGHT); HWND hFirstWnd = GetDlgItem(hWnd, IDC_PARA_FIRST); WCHAR buffer[MAX_STRING_LEN]; + int index; float num; int ret = 0; PARAFORMAT pf;
+ index = SendMessageW(hListWnd, CB_GETCURSEL, 0, 0); + pf.wAlignment = ALIGNMENT_VALUES[index]; + GetWindowTextW(hLeftWnd, buffer, MAX_STRING_LEN); if(number_from_string(buffer, &num, TRUE)) ret++; @@ -1490,7 +1497,8 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, pf.dxOffset = pf.dxOffset - pf.dxStartIndent;
pf.cbSize = sizeof(pf); - pf.dwMask = PFM_OFFSET | PFM_STARTINDENT | PFM_RIGHTINDENT; + pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT | + PFM_STARTINDENT; SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf); } }