marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wordpad: Sort tab stops by numeric value rather than as string. 

The bug could be seen by inserting tabs stops 1cm, 2cm, & 10cm.  The
10cm tab stop would be inserted before 2cm since the comparison isn't
based on the numeric value.
oldstable
Dylan Smith 2009-02-25 15:15:25 -05:00 committed by Alexandre Julliard
parent 0292135a92
commit 8e8c02a71f
17 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/wordpad/Da.rc
View File

@ -150,7 +150,7 @@ Caption "Tabulatorer"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tabulatorstop", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Tilføj", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/De.rc
View File

@ -152,7 +152,7 @@ Caption "Tabstopps"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tabstoppposition", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/En.rc
View File

@ -150,7 +150,7 @@ Caption "Tabs"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tab stops", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/Fr.rc
View File

@ -150,7 +150,7 @@ Caption "Tabulations"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Arrêts de tabulation", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Ajouter", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Supprimer", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/Hu.rc
View File

@ -150,7 +150,7 @@ Caption "Tabs"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tab stops", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/Ja.rc
View File

@ -153,7 +153,7 @@ CAPTION "タブの設定"
FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "タブの停止位置(&T)", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "追加(&A)", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "削除(&R)", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/Ko.rc
View File

@ -152,7 +152,7 @@ Caption "
FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "탭 정지", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "더하기(&A)", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "지우기(&R)", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "확인(&O)", IDOK, 137, 15, 50, 15

2
programs/wordpad/Nl.rc
View File

@ -151,7 +151,7 @@ Caption "Tabs"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tab stops", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Toevoegen", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Verwijderen", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/No.rc
View File

@ -150,7 +150,7 @@ Caption "Tabulatorer"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Legg til", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/Pl.rc
View File

@ -151,7 +151,7 @@ Caption "Tabulatory"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Pozycje tabulatorów", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Usuñ", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 57, 15

2
programs/wordpad/Pt.rc
View File

@ -152,7 +152,7 @@ Caption "Tabula
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Marca de tabulação", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Adicionar", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remover", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 135, 15, 55, 15

2
programs/wordpad/Ru.rc
View File

@ -150,7 +150,7 @@ Caption "
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Ïîçèöèè òàáóëÿöèè", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Óñòàíîâèòü", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "Î&÷èñòèòü", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15

2
programs/wordpad/Si.rc
View File

@ -152,7 +152,7 @@ Caption "Tabulatorji"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Položaji tabulatorja", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Odstrani", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&V redu", IDOK, 137, 15, 50, 15

2
programs/wordpad/Sv.rc
View File

@ -152,7 +152,7 @@ Caption "Tabulatorer"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "Lägg &till", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "Ta &bort", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

2
programs/wordpad/Tr.rc
View File

@ -152,7 +152,7 @@ Caption "Tabs"
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tab stops", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15

4
programs/wordpad/Zh.rc
View File

@ -155,7 +155,7 @@ Caption "标签"
FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "标签停点", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "添加(&A)", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "删除(&R)", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "确定(&O)", IDOK, 137, 15, 50, 15
@ -380,7 +380,7 @@ Caption "標籤"
FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "標籤停點", -1, 10, 10, 120, 90
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "添加(&A)", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "刪除(&R)", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "確定(&O)", IDOK, 137, 15, 50, 15

22
programs/wordpad/wordpad.c
View File

@ -1646,8 +1646,26 @@ static INT_PTR CALLBACK tabstops_proc(HWND hWnd, UINT message, WPARAM wParam, LP
MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_MAX_TAB_STOPS),
wszAppTitle, MB_OK | MB_ICONINFORMATION);
} else {
SendMessageW(hTabWnd, CB_ADDSTRING, 0, (LPARAM)&buffer);
SetWindowTextW(hTabWnd, 0);
int i;
float next_number = -1;
int next_number_in_twips = -1;
int insert_number = current_units_to_twips(number);
/* linear search for position to insert the string */
for(i = 0; i < item_count; i++)
{
SendMessageW(hTabWnd, CB_GETLBTEXT, i, (LPARAM)&buffer);
number_from_string(buffer, &next_number, TRUE);
next_number_in_twips = current_units_to_twips(next_number);
if (insert_number <= next_number_in_twips)
break;
}
if (insert_number != next_number_in_twips)
{
number_with_units(buffer, insert_number);
SendMessageW(hTabWnd, CB_INSERTSTRING, i, (LPARAM)&buffer);
SetWindowTextW(hTabWnd, 0);
}
}
}
SetFocus(hTabWnd);