diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-16 20:33:13 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-16 20:33:13 +0000 |
| commit | 769b537b5e1a99fc53aa7296fd2b21dc77a4071c (patch) | |
| tree | 7df94b386078575e6186523e1a165e4b0ba7ad9f /plugins/KeyboardNotify/src | |
| parent | 2e15a3c2aae091fcbdd3234931a2777d050e43e1 (diff) | |
name conflicts solved
git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/KeyboardNotify/src')
| -rw-r--r-- | plugins/KeyboardNotify/src/options.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp index a4033d0f57..f3ef7bd033 100644 --- a/plugins/KeyboardNotify/src/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp @@ -516,7 +516,7 @@ INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR while (!db_unset(NULL, KEYBDMODULE, fmtDBSettingName("process%d", i++))); if (XstatusListAux) - for (int i = 0; i < ProtoList.protoCount; i++) + for (i = 0; i < ProtoList.protoCount; i++) for (int j = 0; j < (int)XstatusListAux[i].count; j++) db_set_b(NULL, KEYBDMODULE, fmtDBSettingName("%sxstatus%d", ProtoList.protoInfo[i].szProto, j), (BYTE)XstatusListAux[i].enabled[j]); @@ -930,8 +930,8 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case WM_NOTIFY: { int count; - TCHAR theme[MAX_PATH + 1], themeAux[MAX_PATH + 1], *str; - //Here we have pressed either the OK or the APPLY button. + TCHAR theme[MAX_PATH + 1], themeAux[MAX_PATH + 1]; + // Here we have pressed either the OK or the APPLY button. switch (((LPNMHDR)lParam)->idFrom) { case 0: switch (((LPNMHDR)lParam)->code) { @@ -1330,6 +1330,7 @@ INT_PTR CALLBACK DlgProcXstatusList(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA switch (msg) { case WM_INITDIALOG: + TranslateDialogDefault(hwndDlg); { WPARAM j; TVINSERTSTRUCT tvis = { 0 }; @@ -1337,7 +1338,6 @@ INT_PTR CALLBACK DlgProcXstatusList(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA HTREEITEM hSectionItem, hItem; HWND hwndTree = GetDlgItem(hwndDlg, IDC_TREE_XSTATUS); - TranslateDialogDefault(hwndDlg); SetWindowLongPtr(hwndTree, GWL_STYLE, GetWindowLongPtr(hwndTree, GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES); if (!XstatusListAux) return TRUE; |