diff options
| author | George Hazan <ghazan@miranda.im> | 2016-10-28 16:18:50 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2016-10-28 16:18:50 +0300 |
| commit | cf9de21af3073e29cb7b149fbd8427241de70729 (patch) | |
| tree | 2a0b17f49d14d4a51bc942f15bf3747509f0c3cf /protocols/IcqOscarJ | |
| parent | 3de431cc811a1fbf9cd0d520fe33b6163c73e919 (diff) | |
- old useless helpers removed from the Options module;
- mir_app functions introduced instead of them;
- OPENOPTIONSDIALOG structure removed from m_options.h
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_opts.cpp | 16 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/userinfotab.cpp | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index 94633b1d97..c4e6fb538e 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -511,27 +511,27 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -800000000;
odp.hInstance = hInst;
- odp.pwszGroup = LPGENW("Network");
+ odp.szGroup.w = LPGENW("Network");
odp.dwInitParam = LPARAM(this);
- odp.pwszTitle = m_tszUserName;
+ odp.szTitle.w = m_tszUserName;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
- odp.pwszTab = LPGENW("Account");
+ odp.szTab.w = LPGENW("Account");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQ);
odp.pfnDlgProc = DlgProcIcqOpts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Contacts");
+ odp.szTab.w = LPGENW("Contacts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQCONTACTS);
odp.pfnDlgProc = DlgProcIcqContactsOpts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Features");
+ odp.szTab.w = LPGENW("Features");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQFEATURES);
odp.pfnDlgProc = DlgProcIcqFeaturesOpts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Privacy");
+ odp.szTab.w = LPGENW("Privacy");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQPRIVACY);
odp.pfnDlgProc = DlgProcIcqPrivacyOpts;
Options_AddPage(wParam, &odp);
@@ -541,8 +541,8 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);
odp.groupPosition = 900000000;
odp.pfnDlgProc = DlgProcIcqPopupOpts;
- odp.pwszGroup = LPGENW("Popups");
- odp.pwszTab = NULL;
+ odp.szGroup.w = LPGENW("Popups");
+ odp.szTab.w = NULL;
Options_AddPage(wParam, &odp);
}
return 0;
diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp index 607aa13da3..e6be98831a 100644 --- a/protocols/IcqOscarJ/src/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/userinfotab.cpp @@ -273,14 +273,14 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.dwInitParam = LPARAM(this);
odp.pfnDlgProc = IcqDlgProc;
odp.position = -1900000000;
- odp.pwszTitle = m_tszUserName;
+ odp.szTitle.w = m_tszUserName;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_ICQ);
UserInfo_AddPage(wParam, &odp);
if (!lParam) {
wchar_t buf[200];
mir_snwprintf(buf, TranslateT("%s Details"), m_tszUserName);
- odp.pwszTitle = buf;
+ odp.szTitle.w = buf;
odp.position = -1899999999;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_CHANGEINFO);
|