From 9300399ed59f4d82f5e62f5ef43b752da4dd0735 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 22 Apr 2018 14:34:57 +0300 Subject: EV_PROTO_ONMENU removed --- protocols/Tox/src/tox_menus.cpp | 6 +----- protocols/Tox/src/tox_proto.cpp | 3 --- protocols/Tox/src/tox_proto.h | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'protocols/Tox/src') diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index 9dc0ee8b79..e876cbeb6f 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -44,10 +44,8 @@ int CToxProto::UpdateStatusMenu(WPARAM, LPARAM) return 0; } -int CToxProto::OnInitStatusMenu() +void CToxProto::OnBuildProtoMenu() { - //HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &CToxProto::UpdateStatusMenu); - CMenuItem mi; mi.flags = CMIF_UNICODE; mi.root = Menu_GetProtocolRoot(this); @@ -87,6 +85,4 @@ int CToxProto::OnInitStatusMenu() StatusMenuItems[SMI_PASSWORD_REMOVE] = Menu_AddProtoMenuItem(&mi, m_szModuleName); UpdateStatusMenu(NULL, NULL); - - return 0; } diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index f893e881fe..c8c66012a1 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -228,9 +228,6 @@ int CToxProto::UserIsTyping(MCONTACT hContact, int type) int CToxProto::OnEvent(PROTOEVENTTYPE iEventType, WPARAM, LPARAM) { switch (iEventType) { - case EV_PROTO_ONMENU: - return OnInitStatusMenu(); - case EV_PROTO_ONERASE: return OnDeleteToxProfile(); } diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index b89ce4118d..e29fceaa14 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -47,6 +47,7 @@ public: int UserIsTyping(MCONTACT hContact, int type) override; int OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam) override; + void OnBuildProtoMenu(void) override; void OnContactDeleted(MCONTACT) override; void OnModulesLoaded() override; @@ -134,7 +135,6 @@ private: int __cdecl OnPrebuildContactMenu(WPARAM hContact, LPARAM); HGENMENU StatusMenuItems[SMI_MAX]; - int OnInitStatusMenu(); int __cdecl UpdateStatusMenu(WPARAM, LPARAM); //services -- cgit v1.2.3