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/MRA | |
| 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/MRA')
| -rw-r--r-- | protocols/MRA/src/MraPopUp.cpp | 4 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_options.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index 14b780924c..75db5f0f89 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -131,8 +131,8 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = g_hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);
- odp.pwszTitle = m_tszUserName;
- odp.pwszGroup = LPGENW("Popups");
+ odp.szTitle.w = m_tszUserName;
+ odp.szGroup.w = LPGENW("Popups");
odp.groupPosition = 900000000;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = MraPopupDlgProcOpts;
diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index ac742a9f29..68689c4385 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -216,26 +216,26 @@ int CMraProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 };
odp.dwInitParam = (LPARAM)this;
odp.hInstance = g_hInstance;
- odp.pwszTitle = m_tszUserName;
- odp.pwszGroup = LPGENW("Network");
+ odp.szTitle.w = m_tszUserName;
+ odp.szGroup.w = LPGENW("Network");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszTab = LPGENW("Account");
+ odp.szTab.w = LPGENW("Account");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACCOUNT);
odp.pfnDlgProc = DlgProcOptsAccount;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Connections");
+ odp.szTab.w = LPGENW("Connections");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS);
odp.pfnDlgProc = DlgProcOptsConnections;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Files");
+ odp.szTab.w = LPGENW("Files");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILES);
odp.pfnDlgProc = MraFilesQueueDlgProcOpts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Avatars");
+ odp.szTab.w = LPGENW("Avatars");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AVATRS);
odp.pfnDlgProc = MraAvatarsQueueDlgProcOpts;
Options_AddPage(wParam, &odp);
|