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/WhatsApp/src/options.cpp | 6 +++--- protocols/WhatsApp/src/proto.cpp | 2 -- protocols/WhatsApp/src/proto.h | 5 +---- 3 files changed, 4 insertions(+), 9 deletions(-) (limited to 'protocols/WhatsApp') diff --git a/protocols/WhatsApp/src/options.cpp b/protocols/WhatsApp/src/options.cpp index 86cffde83b..073ac02d49 100644 --- a/protocols/WhatsApp/src/options.cpp +++ b/protocols/WhatsApp/src/options.cpp @@ -71,12 +71,12 @@ public: ///////////////////////////////////////////////////////////////////////////////////////// -INT_PTR WhatsAppProto::SvcCreateAccMgrUI(WPARAM, LPARAM hwndParent) +MWindow WhatsAppProto::OnCreateAccMgrUI(MWindow hwndParent) { auto *pDlg = new COptionsDlg(this, IDD_ACCMGRUI, false); - pDlg->SetParent((HWND)hwndParent); + pDlg->SetParent(hwndParent); pDlg->Create(); - return (INT_PTR)pDlg->GetHwnd(); + return pDlg->GetHwnd(); } int WhatsAppProto::OnOptionsInit(WPARAM wParam, LPARAM) diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp index 1c2e0a7142..be3526d996 100644 --- a/protocols/WhatsApp/src/proto.cpp +++ b/protocols/WhatsApp/src/proto.cpp @@ -58,8 +58,6 @@ WhatsAppProto::WhatsAppProto(const char *proto_name, const wchar_t *username) : { db_set_resident(m_szModuleName, "StatusMsg"); - CreateProtoService(PS_CREATEACCMGRUI, &WhatsAppProto::SvcCreateAccMgrUI); - CreateProtoService(PS_GETAVATARINFO, &WhatsAppProto::GetAvatarInfo); CreateProtoService(PS_GETAVATARCAPS, &WhatsAppProto::GetAvatarCaps); CreateProtoService(PS_GETMYAVATAR, &WhatsAppProto::GetMyAvatar); diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h index 4edc296d3f..942ab8d862 100644 --- a/protocols/WhatsApp/src/proto.h +++ b/protocols/WhatsApp/src/proto.h @@ -464,13 +464,10 @@ public: int SetStatus(int iNewStatus) override; int UserIsTyping(MCONTACT hContact, int type) override; + MWindow OnCreateAccMgrUI(MWindow) override; void OnErase() override; void OnModulesLoaded() override; - // Services //////////////////////////////////////////////////////////////////////////// - - INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM, LPARAM); - // Events ////////////////////////////////////////////////////////////////////////////// int __cdecl OnOptionsInit(WPARAM, LPARAM); -- cgit v1.2.3