From cc96ef0550815295a295fdd6e34c85af2f8f7340 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 21 Mar 2017 18:42:14 +0300 Subject: no need to export Srmm_ButtonSubclassProc anymore --- plugins/Scriver/src/chat_window.cpp | 5 +---- plugins/Scriver/src/msgdialog.cpp | 2 ++ plugins/TabSRMM/src/chat_window.cpp | 4 ---- plugins/TabSRMM/src/msgs.cpp | 1 + 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp index c8fd483e3c..7d76fc1a76 100644 --- a/plugins/Scriver/src/chat_window.cpp +++ b/plugins/Scriver/src/chat_window.cpp @@ -894,6 +894,7 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) void CChatRoomDlg::OnInitDialog() { + CScriverWindow::OnInitDialog(); m_si->pDlg = this; NotifyLocalWinEvent(m_hContact, m_hwnd, MSG_WINDOW_EVT_OPENING); @@ -909,10 +910,6 @@ void CChatRoomDlg::OnInitDialog() mir_subclassWindow(m_message.GetHwnd(), MessageSubclassProc); mir_subclassWindow(m_nickList.GetHwnd(), NicklistSubclassProc); - mir_subclassWindow(m_btnFilter.GetHwnd(), Srmm_ButtonSubclassProc); - mir_subclassWindow(m_btnColor.GetHwnd(), Srmm_ButtonSubclassProc); - mir_subclassWindow(m_btnBkColor.GetHwnd(), Srmm_ButtonSubclassProc); - Srmm_CreateToolbarIcons(m_hwnd, BBBF_ISCHATBUTTON); RECT rc; diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 6c31cdc6ec..2e0f3c5742 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -653,6 +653,8 @@ CSrmmWindow::CSrmmWindow(MCONTACT hContact, bool bIncoming, const char *szInitia void CSrmmWindow::OnInitDialog() { + CScriverWindow::OnInitDialog(); + SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this); WindowList_Add(pci->hWindowList, m_hwnd, m_hContact); diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp index 68a9e5a15d..e2efde0ab3 100644 --- a/plugins/TabSRMM/src/chat_window.cpp +++ b/plugins/TabSRMM/src/chat_window.cpp @@ -1597,10 +1597,6 @@ void CChatRoomDlg::OnInitDialog() mir_subclassWindow(m_list.GetHwnd(), NicklistSubclassProc); mir_subclassWindow(m_log.GetHwnd(), LogSubclassProc); - mir_subclassWindow(m_btnFilter.GetHwnd(), Srmm_ButtonSubclassProc); - mir_subclassWindow(m_btnColor.GetHwnd(), Srmm_ButtonSubclassProc); - mir_subclassWindow(m_btnBkColor.GetHwnd(), Srmm_ButtonSubclassProc); - mir_subclassWindow(m_message.GetHwnd(), MessageSubclassProc); m_message.SendMsg(EM_SUBCLASSED, 0, 0); diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index 8583720511..6c902c6570 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -156,6 +156,7 @@ void CTabBaseDlg::LoadSettings() void CTabBaseDlg::OnInitDialog() { + CSrmmBaseDialog::OnInitDialog(); SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this); // m_hwnd is valid, pass it to the tab control -- cgit v1.2.3