From 13c65091dba7803ddc8b604732d3cf3e8cb2fe5d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 11 Feb 2023 18:58:29 +0300 Subject: PS_CREATEACCMGRUI is obsoleted and converted into event --- protocols/ICQ-WIM/src/options.cpp | 6 +++--- protocols/ICQ-WIM/src/proto.cpp | 2 -- protocols/ICQ-WIM/src/proto.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'protocols/ICQ-WIM/src') diff --git a/protocols/ICQ-WIM/src/options.cpp b/protocols/ICQ-WIM/src/options.cpp index 5f9d9ce5db..d5cd234cf4 100644 --- a/protocols/ICQ-WIM/src/options.cpp +++ b/protocols/ICQ-WIM/src/options.cpp @@ -366,12 +366,12 @@ public: ///////////////////////////////////////////////////////////////////////////////////////// // Services -INT_PTR CIcqProto::CreateAccMgrUI(WPARAM, LPARAM hwndParent) +MWindow CIcqProto::OnCreateAccMgrUI(MWindow hwndParent) { COptionsDlg *pDlg = new COptionsDlg(this, IDD_OPTIONS_ACCMGR, false); - pDlg->SetParent((HWND)hwndParent); + pDlg->SetParent(hwndParent); pDlg->Create(); - return (INT_PTR)pDlg->GetHwnd(); + return pDlg->GetHwnd(); } int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM) diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp index 4f34d1c0ff..7a2c9d1002 100644 --- a/protocols/ICQ-WIM/src/proto.cpp +++ b/protocols/ICQ-WIM/src/proto.cpp @@ -63,8 +63,6 @@ CIcqProto::CIcqProto(const char *aProtoName, const wchar_t *aUserName) : m_isMra = !stricmp(Proto_GetAccount(m_szModuleName)->szProtoName, "MRA"); // services - CreateProtoService(PS_CREATEACCMGRUI, &CIcqProto::CreateAccMgrUI); - CreateProtoService(PS_GETAVATARCAPS, &CIcqProto::GetAvatarCaps); CreateProtoService(PS_GETAVATARINFO, &CIcqProto::GetAvatarInfo); CreateProtoService(PS_GETMYAVATAR, &CIcqProto::GetAvatar); diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h index c184e02c8e..f36f6911ab 100644 --- a/protocols/ICQ-WIM/src/proto.h +++ b/protocols/ICQ-WIM/src/proto.h @@ -406,7 +406,6 @@ class CIcqProto : public PROTO INT_PTR __cdecl GetAvatarInfo(WPARAM, LPARAM); INT_PTR __cdecl SetAvatar(WPARAM, LPARAM); - INT_PTR __cdecl CreateAccMgrUI(WPARAM, LPARAM); INT_PTR __cdecl EditGroups(WPARAM, LPARAM); INT_PTR __cdecl EditProfile(WPARAM, LPARAM); INT_PTR __cdecl GetEmailCount(WPARAM, LPARAM); @@ -450,6 +449,7 @@ class CIcqProto : public PROTO void OnBuildProtoMenu(void) override; void OnContactAdded(MCONTACT) override; void OnContactDeleted(MCONTACT) override; + MWindow OnCreateAccMgrUI(MWindow) override; void OnEventEdited(MCONTACT, MEVENT) override; void OnMarkRead(MCONTACT, MEVENT) override; void OnModulesLoaded() override; -- cgit v1.2.3