summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-05-22 16:10:40 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-05-22 16:10:40 +0300
commit6ccfdcb25f2bb3c7a4e39a055bb392c0d4bfa905 (patch)
treeb53333d819f9afe5fd44dd874cfc0f51189122f8 /utils
parent295ca5e99da922699f1bae398f0411f0c99df5f6 (diff)
m_langpack.h unbound from hLangpack
Diffstat (limited to 'utils')
-rw-r--r--utils/mir_options.cpp12
-rw-r--r--utils/mir_smileys.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/utils/mir_options.cpp b/utils/mir_options.cpp
index c027b4e7e1..65716a8d16 100644
--- a/utils/mir_options.cpp
+++ b/utils/mir_options.cpp
@@ -126,7 +126,7 @@ static void LoadOpt(OptPageControl *ctrl, char *module)
break;
case CONTROL_TEXT:
- MyDBGetContactSettingTString(NULL, module, ctrl->setting, ((wchar_t *)ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), ctrl->tszDefValue == nullptr ? nullptr : TranslateW(ctrl->tszDefValue));
+ MyDBGetContactSettingTString(NULL, module, ctrl->setting, ((wchar_t *)ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), ctrl->tszDefValue == nullptr ? nullptr : TranslateW_LP(ctrl->tszDefValue));
break;
case CONTROL_INT:
@@ -140,7 +140,7 @@ static void LoadOpt(OptPageControl *ctrl, char *module)
case CONTROL_COMBO_TEXT:
case CONTROL_COMBO_ITEMDATA:
- MyDBGetContactSettingTString(NULL, module, ctrl->setting, ((wchar_t *)ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), ctrl->tszDefValue == nullptr ? nullptr : TranslateW(ctrl->tszDefValue));
+ MyDBGetContactSettingTString(NULL, module, ctrl->setting, ((wchar_t *)ctrl->var), min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), ctrl->tszDefValue == nullptr ? nullptr : TranslateW_LP(ctrl->tszDefValue));
break;
}
}
@@ -157,7 +157,7 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
switch (msg) {
case WM_INITDIALOG:
- TranslateDialogDefault(hwndDlg);
+ TranslateDialog_LP(hwndDlg, 0);
for (int i = 0; i < controlsSize; i++) {
OptPageControl *ctrl = &controls[i];
@@ -231,7 +231,7 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
break;
case CONTROL_TEXT:
- SetDlgItemText(hwndDlg, ctrl->nID, MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == nullptr ? nullptr : TranslateW(ctrl->tszDefValue)));
+ SetDlgItemText(hwndDlg, ctrl->nID, MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == nullptr ? nullptr : TranslateW_LP(ctrl->tszDefValue)));
SendDlgItemMessage(hwndDlg, ctrl->nID, EM_LIMITTEXT, min(ctrl->max <= 0 ? 1024 : ctrl->max, 1024), 0);
break;
@@ -251,12 +251,12 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha
break;
case CONTROL_COMBO_TEXT:
- MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == nullptr ? nullptr : TranslateW(ctrl->tszDefValue));
+ MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == nullptr ? nullptr : TranslateW_LP(ctrl->tszDefValue));
SendDlgItemMessage(hwndDlg, ctrl->nID, CB_SELECTSTRING, 0, (WPARAM)tmp);
break;
case CONTROL_COMBO_ITEMDATA:
- MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == nullptr ? nullptr : TranslateW(ctrl->tszDefValue));
+ MyDBGetContactSettingTString(NULL, module, ctrl->setting, tmp, 1024, ctrl->tszDefValue == nullptr ? nullptr : TranslateW_LP(ctrl->tszDefValue));
{
int count = SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETCOUNT, 0, 0);
int k;
diff --git a/utils/mir_smileys.cpp b/utils/mir_smileys.cpp
index 4ac6703dcf..f683447c88 100644
--- a/utils/mir_smileys.cpp
+++ b/utils/mir_smileys.cpp
@@ -71,7 +71,7 @@ int InitContactListSmileys()
rc.cbSize = sizeof(rc);
rc.name = "clist";
- rc.dispname = Translate("Contact List smileys");
+ rc.dispname = TranslateA_LP("Contact List smileys");
CallService(MS_SMILEYADD_REGISTERCATEGORY, 0, (LPARAM)&rc);
}