[ros-diffs] [reactos] 01/01: [CPL:INPUT] Return TRUE against WM_INITDIALOG and add WS_TABSTOP

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d9026c852546896b3fc0…

commit 4d9026c852546896b3fc099afe9c15997bcf4c87
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sun Oct 30 08:01:50 2022 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Sun Oct 30 08:01:57 2022 +0900

    [CPL:INPUT] Return TRUE against WM_INITDIALOG and add WS_TABSTOP
    
    This affects control focus.
---
 dll/cpl/input/add_dialog.c          | 2 +-
 dll/cpl/input/edit_dialog.c         | 2 +-
 dll/cpl/input/key_sequence_dialog.c | 2 +-
 dll/cpl/input/key_settings_dialog.c | 4 +---
 dll/cpl/input/lang/bg-BG.rc         | 6 +++---
 dll/cpl/input/lang/cs-CZ.rc         | 6 +++---
 dll/cpl/input/lang/de-DE.rc         | 6 +++---
 dll/cpl/input/lang/el-GR.rc         | 6 +++---
 dll/cpl/input/lang/en-US.rc         | 6 +++---
 dll/cpl/input/lang/es-ES.rc         | 6 +++---
 dll/cpl/input/lang/fr-FR.rc         | 6 +++---
 dll/cpl/input/lang/he-IL.rc         | 6 +++---
 dll/cpl/input/lang/id-ID.rc         | 6 +++---
 dll/cpl/input/lang/it-IT.rc         | 6 +++---
 dll/cpl/input/lang/ja-JP.rc         | 6 +++---
 dll/cpl/input/lang/no-NO.rc         | 6 +++---
 dll/cpl/input/lang/pl-PL.rc         | 6 +++---
 dll/cpl/input/lang/pt-BR.rc         | 6 +++---
 dll/cpl/input/lang/pt-PT.rc         | 6 +++---
 dll/cpl/input/lang/ro-RO.rc         | 6 +++---
 dll/cpl/input/lang/ru-RU.rc         | 6 +++---
 dll/cpl/input/lang/sk-SK.rc         | 6 +++---
 dll/cpl/input/lang/sq-AL.rc         | 6 +++---
 dll/cpl/input/lang/tr-TR.rc         | 6 +++---
 dll/cpl/input/lang/uk-UA.rc         | 6 +++---
 dll/cpl/input/lang/zh-CN.rc         | 6 +++---
 dll/cpl/input/lang/zh-HK.rc         | 6 +++---
 dll/cpl/input/lang/zh-TW.rc         | 6 +++---
 dll/cpl/input/settings_page.c       | 2 +-
 29 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/dll/cpl/input/add_dialog.c b/dll/cpl/input/add_dialog.c
index 96567cf8d8a..3074ea2960f 100644
--- a/dll/cpl/input/add_dialog.c
+++ b/dll/cpl/input/add_dialog.c
@@ -180,7 +180,7 @@ AddDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
     {
         case WM_INITDIALOG:
             OnInitAddDialog(hwndDlg);
-            break;
+            return TRUE;
 
         case WM_COMMAND:
             OnCommandAddDialog(hwndDlg, wParam);
diff --git a/dll/cpl/input/edit_dialog.c b/dll/cpl/input/edit_dialog.c
index 4acd2c0a321..7e0956bf51e 100644
--- a/dll/cpl/input/edit_dialog.c
+++ b/dll/cpl/input/edit_dialog.c
@@ -45,8 +45,8 @@ EditDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
             }
 
             ComboBox_SelectString(hwndList, 0, pInput->pLayout->pszName);
+            return TRUE;
         }
-        break;
 
         case WM_COMMAND:
         {
diff --git a/dll/cpl/input/key_sequence_dialog.c b/dll/cpl/input/key_sequence_dialog.c
index 81bc82edbae..3864175d7ad 100644
--- a/dll/cpl/input/key_sequence_dialog.c
+++ b/dll/cpl/input/key_sequence_dialog.c
@@ -63,8 +63,8 @@ ChangeKeySeqDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam)
                     }
                 }
             }
+            return TRUE;
         }
-        break;
 
         case WM_COMMAND:
         {
diff --git a/dll/cpl/input/key_settings_dialog.c b/dll/cpl/input/key_settings_dialog.c
index 7a1076c4641..aa3ca4d0e09 100644
--- a/dll/cpl/input/key_settings_dialog.c
+++ b/dll/cpl/input/key_settings_dialog.c
@@ -228,10 +228,8 @@ KeySettingsDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam)
     switch (uMsg)
     {
         case WM_INITDIALOG:
-        {
             OnInitKeySettingsDialog(hwndDlg);
-        }
-        break;
+            return TRUE;
 
         case WM_COMMAND:
         {
diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc
index 9833958bd6e..3e7c9840a37 100644
--- a/dll/cpl/input/lang/bg-BG.rc
+++ b/dll/cpl/input/lang/bg-BG.rc
@@ -52,9 +52,9 @@ CAPTION "Добавяне език на писане"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Език на &въвеждане:", -1, 7, 7, 90, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "Клавиатурна подредба/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Добре", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Отказ", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Език на писане", -1, 7, 7, 55, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "Клавиатурна подредба/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Добре", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Отказ", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc
index f1046fab271..53b16411a2b 100644
--- a/dll/cpl/input/lang/cs-CZ.rc
+++ b/dll/cpl/input/lang/cs-CZ.rc
@@ -57,9 +57,9 @@ CAPTION "Přidat vstupní jazyk"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Vstupní jazyk:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Rozložení kláves/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Storno", IDCANCEL, 169, 68, 50, 14
 END
@@ -92,7 +92,7 @@ BEGIN
     LTEXT "Vstupní jazyk:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Rozložení kláves/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Storno", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc
index b23641e5cee..9ab6280cbb1 100644
--- a/dll/cpl/input/lang/de-DE.rc
+++ b/dll/cpl/input/lang/de-DE.rc
@@ -52,9 +52,9 @@ CAPTION "Eingabesprache hinzufügen"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Tastaturlayout/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Eingabesprache:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Tastaturlayout/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc
index 464aaa58581..5cee8ff4129 100644
--- a/dll/cpl/input/lang/el-GR.rc
+++ b/dll/cpl/input/lang/el-GR.rc
@@ -52,9 +52,9 @@ CAPTION "Προσθήκη γλώσσας εισαγωγής"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Γλώσσα εισαγωγής:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Διάταξη πληκτρολογίου/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Άκυρο", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Γλώσσα εισαγωγής:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Διάταξη πληκτρολογίου/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Άκυρο", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc
index 41e07463b91..554002777ee 100644
--- a/dll/cpl/input/lang/en-US.rc
+++ b/dll/cpl/input/lang/en-US.rc
@@ -52,9 +52,9 @@ CAPTION "Add Input language"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Input language:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Input language:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Cancel", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc
index c4dd0b014bd..9af3acc9d5a 100644
--- a/dll/cpl/input/lang/es-ES.rc
+++ b/dll/cpl/input/lang/es-ES.rc
@@ -61,9 +61,9 @@ CAPTION "Agregar idioma de entrada"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Idioma de dispositivo de entrada:", -1, 7, 7, 120, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Distribución del teclado/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Aceptar", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14
 END
@@ -96,7 +96,7 @@ BEGIN
     LTEXT "&Idioma de dispositivo de entrada:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Distribución del teclado/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Aceptar", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc
index d3796a9639a..1a47da41c22 100644
--- a/dll/cpl/input/lang/fr-FR.rc
+++ b/dll/cpl/input/lang/fr-FR.rc
@@ -52,9 +52,9 @@ CAPTION "Ajouter une langue de saisie"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Langue de sa&isie :", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "Configuration du clavier/IME :", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Annuler", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Langue de saisie :", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "Configuration clavier/IME :", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Annuler", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc
index b88284c27ca..ca527b1a91d 100644
--- a/dll/cpl/input/lang/he-IL.rc
+++ b/dll/cpl/input/lang/he-IL.rc
@@ -54,9 +54,9 @@ CAPTION "הוספת שפת כתיבה"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "שפת כתיבה:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "אישור", IDOK, 116, 68, 50, 14
     PUSHBUTTON "ביטול", IDCANCEL, 169, 68, 50, 14
 END
@@ -89,7 +89,7 @@ BEGIN
     LTEXT "שפת כתיבה:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "אישור", IDOK, 116, 53, 52, 14
     PUSHBUTTON "ביטול", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/id-ID.rc b/dll/cpl/input/lang/id-ID.rc
index 0c65a242953..589692618d1 100644
--- a/dll/cpl/input/lang/id-ID.rc
+++ b/dll/cpl/input/lang/id-ID.rc
@@ -52,9 +52,9 @@ CAPTION "Tambah Bahasa Masukan"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Bahasa masukan:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "Tata leta&k papan ketik/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Batal", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Bahasa masukan:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "Tata leta&k papan ketik/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Batal", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc
index 872727901f6..3c6c92d98fd 100644
--- a/dll/cpl/input/lang/it-IT.rc
+++ b/dll/cpl/input/lang/it-IT.rc
@@ -52,9 +52,9 @@ CAPTION "Aggiunta lingua"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Lingua:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Layout/IME tastiera:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Annulla", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Lingua:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Layout/IME tastiera:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Annulla", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc
index 7fe83d20e85..7e63602e126 100644
--- a/dll/cpl/input/lang/ja-JP.rc
+++ b/dll/cpl/input/lang/ja-JP.rc
@@ -52,9 +52,9 @@ CAPTION "入力言語の追加"
 FONT 9, "MS UI Gothic"
 BEGIN
     LTEXT "入力言語(&I):", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "キーボードレイアウト/IME(&K):", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "入力言語:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "キーボードレイアウト/IME(&K):", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc
index fa996580e08..fb6df7ec2b5 100644
--- a/dll/cpl/input/lang/no-NO.rc
+++ b/dll/cpl/input/lang/no-NO.rc
@@ -52,9 +52,9 @@ CAPTION "Teksttjenester og inndataspråk"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Inndataspråk:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Tastaturoppsett/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Inndataspråk:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Tastaturoppsett/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Avbryt", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc
index 11603d4c4cb..35475621d38 100644
--- a/dll/cpl/input/lang/pl-PL.rc
+++ b/dll/cpl/input/lang/pl-PL.rc
@@ -60,9 +60,9 @@ CAPTION "Dodawanie języków"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Język:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Układ klawiatury/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 169, 68, 50, 14
 END
@@ -95,7 +95,7 @@ BEGIN
     LTEXT "Język:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Układ klawiatury/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc
index af1929f8f9f..64cd9a42c75 100644
--- a/dll/cpl/input/lang/pt-BR.rc
+++ b/dll/cpl/input/lang/pt-BR.rc
@@ -52,9 +52,9 @@ CAPTION "Adicionar idioma de entrada"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Idioma de entrada:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "L&ayout do teclado/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Idioma de entrada:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "L&ayout do teclado/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc
index 58c10e99ca0..2fd58f5f788 100644
--- a/dll/cpl/input/lang/pt-PT.rc
+++ b/dll/cpl/input/lang/pt-PT.rc
@@ -52,9 +52,9 @@ CAPTION "Adicionar idioma de entrada"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Idioma de entrada:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Esquema do teclado/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Idioma de entrada:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Esquema do teclado/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Cancelar", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc
index 081e94a6a42..16e888bd4b4 100644
--- a/dll/cpl/input/lang/ro-RO.rc
+++ b/dll/cpl/input/lang/ro-RO.rc
@@ -60,9 +60,9 @@ CAPTION "Adăguare limbă de intrare"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Limbă:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Aranjament de tastatură/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Con&firmă", IDOK, 116, 68, 50, 14
     PUSHBUTTON "A&nulează", IDCANCEL, 169, 68, 50, 14
 END
@@ -95,7 +95,7 @@ BEGIN
     LTEXT "Limbă:", -1, 7, 7, 37, 8
     LTEXT "", IDC_INPUT_LANG_STR, 30, 7, 129, 8
     LTEXT "&Aranjament de tastatură/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Con&firmă", IDOK, 116, 53, 52, 14
     PUSHBUTTON "A&nulează", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc
index 94b549c2db9..413869214c3 100644
--- a/dll/cpl/input/lang/ru-RU.rc
+++ b/dll/cpl/input/lang/ru-RU.rc
@@ -52,9 +52,9 @@ CAPTION "Добавление языка ввода"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Язык ввода:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Раскладка клавиатуры:", -1, 7, 36, 170, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "ОК", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Отмена", IDCANCEL, 169, 68, 50, 14
 END
@@ -87,7 +87,7 @@ BEGIN
     LTEXT "Язык ввода:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Раскладка клавиатуры:", -1, 7, 21, 170, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "ОК", IDOK, 114, 53, 52, 14
     PUSHBUTTON "Отмена", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc
index 6b93972ee18..5479d745f6f 100644
--- a/dll/cpl/input/lang/sk-SK.rc
+++ b/dll/cpl/input/lang/sk-SK.rc
@@ -57,9 +57,9 @@ CAPTION "Add Input language"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Input language:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Zrušiť", IDCANCEL, 169, 68, 50, 14
 END
@@ -92,7 +92,7 @@ BEGIN
     LTEXT "Input language:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Zrušiť", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc
index a2d95b4a527..12d1d071018 100644
--- a/dll/cpl/input/lang/sq-AL.rc
+++ b/dll/cpl/input/lang/sq-AL.rc
@@ -56,9 +56,9 @@ CAPTION "Shto gjuhën hyrese"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Gjuha hyrese:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Paraqitja Tastieres/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Anulo", IDCANCEL, 169, 68, 50, 14
 END
@@ -91,7 +91,7 @@ BEGIN
     LTEXT "Gjuha hyrese:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Paraqitja Tastieres/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Anulo", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc
index fcfab5246f8..23f848337b5 100644
--- a/dll/cpl/input/lang/tr-TR.rc
+++ b/dll/cpl/input/lang/tr-TR.rc
@@ -54,9 +54,9 @@ CAPTION "Giriş Dili Ekle"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Giriş Dili:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Klavye Düzeni/IME:", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Tamam", IDOK, 116, 68, 50, 14
     PUSHBUTTON "İptal", IDCANCEL, 169, 68, 50, 14
 END
@@ -89,7 +89,7 @@ BEGIN
     LTEXT "&Giriş Dili:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Klavye Düzeni/IME:", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "Tamam", IDOK, 116, 53, 52, 14
     PUSHBUTTON "İptal", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc
index 2d91e093aa6..72964a71507 100644
--- a/dll/cpl/input/lang/uk-UA.rc
+++ b/dll/cpl/input/lang/uk-UA.rc
@@ -60,9 +60,9 @@ CAPTION "Додавання мови вводу"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&Мова вводу:", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Розкладка клавіатури або засіб вводу (IME):", -1, 7, 36, 140,
10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
     PUSHBUTTON "Скасувати", IDCANCEL, 169, 68, 50, 14
 END
@@ -95,7 +95,7 @@ BEGIN
     LTEXT "Мова вводу:", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "&Розкладка клавіатури або засіб вводу (IME):", -1, 7, 21, 150,
10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
     PUSHBUTTON "Скасувати", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc
index 3a6e20841c4..ae5cc27d299 100644
--- a/dll/cpl/input/lang/zh-CN.rc
+++ b/dll/cpl/input/lang/zh-CN.rc
@@ -54,9 +54,9 @@ CAPTION "添加输入语言"
 FONT 9, "宋体"
 BEGIN
     LTEXT "输入语言(&I)：", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "键盘布局/输入法(&K)：", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "确定", IDOK, 116, 68, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 169, 68, 50, 14
 END
@@ -89,7 +89,7 @@ BEGIN
     LTEXT "输入语言：", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "键盘布局/输入法(&K)：", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "确定", IDOK, 116, 53, 52, 14
     PUSHBUTTON "取消", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/zh-HK.rc b/dll/cpl/input/lang/zh-HK.rc
index 9430e0ff36e..4f7ac992dc4 100644
--- a/dll/cpl/input/lang/zh-HK.rc
+++ b/dll/cpl/input/lang/zh-HK.rc
@@ -60,9 +60,9 @@ CAPTION "新增輸入語言"
 FONT 9, "新細明體"
 BEGIN
     LTEXT "輸入語言(&I)：", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "鍵盤佈局／輸入法(&K)：", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "確定", IDOK, 116, 68, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 169, 68, 50, 14
 END
@@ -95,7 +95,7 @@ BEGIN
     LTEXT "輸入語言：", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "鍵盤佈局／輸入法(&K)：", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "確定", IDOK, 116, 53, 52, 14
     PUSHBUTTON "取消", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc
index e7ddb4a0ce0..ec81477e1f9 100644
--- a/dll/cpl/input/lang/zh-TW.rc
+++ b/dll/cpl/input/lang/zh-TW.rc
@@ -60,9 +60,9 @@ CAPTION "新增輸入語言"
 FONT 9, "新細明體"
 BEGIN
     LTEXT "輸入語言(&I)：", -1, 7, 7, 61, 10
-    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT "鍵盤布局／輸入法(&K)：", -1, 7, 36, 110, 10
-    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL
+    COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST |
CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "確定", IDOK, 116, 68, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 169, 68, 50, 14
 END
@@ -95,7 +95,7 @@ BEGIN
     LTEXT "輸入語言：", -1, 7, 7, 61, 8
     LTEXT "", IDC_INPUT_LANG_STR, 73, 7, 129, 8
     LTEXT "鍵盤布局／輸入法(&K)：", -1, 7, 21, 110, 10
-    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+    COMBOBOX IDC_KB_LAYOUT_IME_COMBO, 7, 32, 212, 150, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON "確定", IDOK, 116, 53, 52, 14
     PUSHBUTTON "取消", IDCANCEL, 169, 53, 52, 14
 END
diff --git a/dll/cpl/input/settings_page.c b/dll/cpl/input/settings_page.c
index a100cfcd3d9..bf10b057623 100644
--- a/dll/cpl/input/settings_page.c
+++ b/dll/cpl/input/settings_page.c
@@ -650,7 +650,7 @@ SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam)
     {
         case WM_INITDIALOG:
             OnInitSettingsPage(hwndDlg);
-            break;
+            return TRUE;
 
         case WM_DESTROY:
             OnDestroySettingsPage(hwndDlg);