From 592c0d89f865c44e6909e0ca1e9d0c550be890b4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Mar 2017 20:45:13 +0300 Subject: context menu moved to mir_app, part II :) --- plugins/Scriver/src/msgdialog.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Scriver/src/msgdialog.cpp') diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index c51e8da8f2..7968f3da0c 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -215,7 +215,7 @@ CSrmmWindow::CSrmmWindow(MCONTACT hContact, bool bIncoming, const char *szInitia void CSrmmWindow::OnInitDialog() { - CScriverWindow::OnInitDialog(); + CSuper::OnInitDialog(); SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this); WindowList_Add(pci->hWindowList, m_hwnd, m_hContact); @@ -997,9 +997,9 @@ LRESULT CSrmmWindow::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) pt.y = GET_Y_LPARAM(lParam); } - POINTL ptl = { (LONG)pt.x, (LONG)pt.y }; - ScreenToClient(m_message.GetHwnd(), (LPPOINT)&ptl); - ptrW pszWord(GetRichTextWord(m_message.GetHwnd(), &ptl)); + POINT ptl = pt; + ScreenToClient(m_log.GetHwnd(), &ptl); + ptrW pszWord(GetRichTextWord(m_log.GetHwnd(), &ptl)); if (pszWord && pszWord[0]) { wchar_t szMenuText[4096]; mir_snwprintf(szMenuText, TranslateT("Look up '%s':"), pszWord); @@ -1009,7 +1009,7 @@ LRESULT CSrmmWindow::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) else ModifyMenu(hSubMenu, 5, MF_STRING | MF_GRAYED | MF_BYPOSITION, 5, TranslateT("No word to look up")); inMenu = TRUE; - int uID = TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, m_message.GetHwnd(), nullptr); + int uID = TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, m_log.GetHwnd(), nullptr); inMenu = FALSE; switch (uID) { @@ -1743,5 +1743,5 @@ INT_PTR CSrmmWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) break; } - return CScriverWindow::DlgProc(msg, wParam, lParam); + return CSuper::DlgProc(msg, wParam, lParam); } -- cgit v1.2.3