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/Popup | |
| 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/Popup')
| -rw-r--r-- | plugins/Popup/src/main.cpp | 16 | ||||
| -rw-r--r-- | plugins/Popup/src/opt_class.cpp | 7 |
2 files changed, 9 insertions, 14 deletions
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index b0386e5922..e210ab86e9 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -66,35 +66,35 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) odp.groupPosition = 910000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
- odp.pszTitle = MODULNAME_PLU;
+ odp.szTitle.a = MODULNAME_PLU;
- odp.pszTab = LPGEN("General");
+ odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = DlgProcPopupGeneral;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_GENERAL);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Classes");
+ odp.szTab.a = LPGEN("Classes");
odp.pfnDlgProc = DlgProcOptsClasses;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFICATIONS);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Actions");
+ odp.szTab.a = LPGEN("Actions");
odp.pfnDlgProc = DlgProcPopupActions;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACTIONS);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Contacts");
+ odp.szTab.a = LPGEN("Contacts");
odp.pfnDlgProc = DlgProcContactOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTACTS);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Advanced");
+ odp.szTab.a = LPGEN("Advanced");
odp.pfnDlgProc = DlgProcPopupAdvOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_ADVANCED);
Options_AddPage(wParam, &odp);
- odp.pszGroup = LPGEN("Skins");
- odp.pszTab = LPGEN(MODULNAME_PLU);
+ odp.szGroup.a = LPGEN("Skins");
+ odp.szTab.a = LPGEN(MODULNAME_PLU);
odp.pfnDlgProc = DlgProcPopSkinsOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN2);
Options_AddPage(wParam, &odp);
diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index 9110e4e58b..9a58419986 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -370,12 +370,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l break;
case IDC_MORE:
- {
- OPENOPTIONSDIALOG ood = { sizeof(ood) };
- ood.pszGroup = "Customize";
- ood.pszPage = "Fonts and colors";
- Options_Open(&ood);
- }
+ Options_Open(L"Customize", L"Fonts and colors");
break;
case IDC_SOFFLINE: case IDC_SONLINE: case IDC_SAWAY: case IDC_SNA: case IDC_SOCCUPIED:
|