diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-28 14:18:31 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-28 14:18:31 +0300 |
| commit | 6a9e3738066370dac38f5f6768b8a6f61fe709e0 (patch) | |
| tree | 035d3b553c313505707f236e6c9c973416e1be65 /plugins/TabSRMM/src/chat_window.cpp | |
| parent | b60c918dbcb16f4da7c35c15b190ee9def957a49 (diff) | |
SRMM notifications went to the core with ME_MSG_WINDOWEVENT
Diffstat (limited to 'plugins/TabSRMM/src/chat_window.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/chat_window.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp index 77574de5a7..d73ca8f181 100644 --- a/plugins/TabSRMM/src/chat_window.cpp +++ b/plugins/TabSRMM/src/chat_window.cpp @@ -527,7 +527,7 @@ void CChatRoomDlg::OnInitDialog() m_log.SendMsg(EM_SETOLECALLBACK, 0, (LPARAM)&reOleCallback); m_log.SendMsg(EM_AUTOURLDETECT, 1, 0); SetWindowLongPtr(GetDlgItem(m_hwnd, IDC_PANELSPLITTER), GWLP_WNDPROC, (LONG_PTR)SplitterSubclassProc); - FireEvent(MSG_WINDOW_EVT_OPENING, 0); + NotifyEvent(MSG_WINDOW_EVT_OPENING); m_log.SendMsg(EM_SETEVENTMASK, 0, m_log.SendMsg(EM_GETEVENTMASK, 0, 0) | ENM_LINK | ENM_MOUSEEVENTS | ENM_KEYEVENTS); m_log.SendMsg(EM_LIMITTEXT, 0x7FFFFFFF, 0); @@ -572,7 +572,7 @@ void CChatRoomDlg::OnInitDialog() ShowWindow(m_hwnd, SW_SHOW); UpdateNickList(); m_pContainer->m_hwndActive = m_hwnd; - FireEvent(MSG_WINDOW_EVT_OPEN, 0); + NotifyEvent(MSG_WINDOW_EVT_OPEN); } void CChatRoomDlg::OnDestroy() @@ -588,7 +588,7 @@ void CChatRoomDlg::OnDestroy() m_si->pDlg = nullptr; m_si = nullptr; - FireEvent(MSG_WINDOW_EVT_CLOSING, 0); + NotifyEvent(MSG_WINDOW_EVT_CLOSING); DM_FreeTheme(); @@ -617,7 +617,7 @@ void CChatRoomDlg::OnDestroy() M.RemoveWindow(m_hwnd); - FireEvent(MSG_WINDOW_EVT_CLOSE, 0); + NotifyEvent(MSG_WINDOW_EVT_CLOSE); m_pContainer->ClearMargins(); PostMessage(m_pContainer->m_hwnd, WM_SIZE, 0, 1); @@ -1312,11 +1312,10 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) } return 0; } + if (wParam != VK_RIGHT && wParam != VK_LEFT) { - mir_free(m_wszSearchQuery); - m_wszSearchQuery = nullptr; - mir_free(m_wszSearchResult); - m_wszSearchResult = nullptr; + replaceStrW(m_wszSearchQuery, nullptr); + replaceStrW(m_wszSearchResult, nullptr); } if (wParam == VK_F4 && isCtrl && !isAlt) { // ctrl-F4 (close tab) |