From 8e52135f5e61099bb24e6d02ecc9b3a34d5a0848 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 19 Feb 2020 20:47:51 +0300 Subject: Jabber: useless button removed --- protocols/JabberG/src/jabber_groupchat.cpp | 9 +++------ protocols/JabberG/src/resource.h | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 033d56213c..d8abeec340 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -1122,16 +1122,13 @@ void CJabberProto::GroupchatProcessMessage(const TiXmlElement *node) class CGroupchatInviteAcceptDlg : public CJabberDlgBase { typedef CJabberDlgBase CSuper; - CCtrlButton m_accept; CMStringA m_roomJid, m_from, m_reason, m_password; public: CGroupchatInviteAcceptDlg(CJabberProto *ppro, const char *roomJid, const char *from, const char *reason, const char *password) : CSuper(ppro, IDD_GROUPCHAT_INVITE_ACCEPT), - m_roomJid(roomJid), m_from(from), m_reason(reason), m_password(password), - m_accept(this, IDC_ACCEPT) + m_roomJid(roomJid), m_from(from), m_reason(reason), m_password(password) { - m_accept.OnClick = Callback(this, &CGroupchatInviteAcceptDlg::OnCommand_Accept); } bool OnInitDialog() override @@ -1152,12 +1149,12 @@ public: return true; } - void OnCommand_Accept(CCtrlButton*) + bool OnApply() override { wchar_t text[128]; GetDlgItemText(m_hwnd, IDC_NICK, text, _countof(text)); m_proto->AcceptGroupchatInvite(m_roomJid, T2Utf(text), m_password); - EndDialog(m_hwnd, 0); + return true; } }; diff --git a/protocols/JabberG/src/resource.h b/protocols/JabberG/src/resource.h index e6e77f4784..c9a3df960e 100644 --- a/protocols/JabberG/src/resource.h +++ b/protocols/JabberG/src/resource.h @@ -180,7 +180,6 @@ #define IDC_ADDJID 1174 #define IDC_INVITE 1175 #define IDC_BTN_ADVANCED 1175 -#define IDC_ACCEPT 1176 #define IDC_BTN_SIMPLE 1176 #define IDC_FROM 1177 #define IDC_USE_TLS 1180 -- cgit v1.2.3