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 /plugins/Ping | |
| 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 'plugins/Ping')
| -rw-r--r-- | plugins/Ping/src/options.cpp | 8 | ||||
| -rw-r--r-- | plugins/Ping/src/pingthread.cpp | 18 |
2 files changed, 6 insertions, 20 deletions
diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp index 0d763f466a..974469725f 100644 --- a/plugins/Ping/src/options.cpp +++ b/plugins/Ping/src/options.cpp @@ -506,15 +506,15 @@ int PingOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszGroup = LPGENW("Network");
- odp.pwszTitle = LPGENW("Ping");
+ odp.szGroup.w = LPGENW("Network");
+ odp.szTitle.w = LPGENW("Ping");
- odp.pwszTab = LPGENW("Settings");
+ odp.szTab.w = LPGENW("Settings");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG1);
odp.pfnDlgProc = DlgProcOpts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Hosts");
+ odp.szTab.w = LPGENW("Hosts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG2);
odp.pfnDlgProc = DlgProcOpts2;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index c0f48b16cc..c3d215329d 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -678,25 +678,11 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return TRUE;
case ID_MENU_OPTIONS:
- {
- OPENOPTIONSDIALOG oop = { 0 };
- oop.cbSize = sizeof(oop);
- oop.pszGroup = "Network";
- oop.pszPage = "Ping";
- oop.pszTab = "Settings";
- Options_Open(&oop);
- }
+ Options_Open(L"Network", L"Ping", L"Settings");
return TRUE;
case ID_MENU_DESTINATIONS:
- {
- OPENOPTIONSDIALOG oop = { 0 };
- oop.cbSize = sizeof(oop);
- oop.pszGroup = "Network";
- oop.pszPage = "Ping";
- oop.pszTab = "Hosts";
- Options_Open(&oop);
- }
+ Options_Open(L"Network", L"Ping", L"Hosts");
return TRUE;
}
|