From 198fa4f35166d05fa513658c30f4a0bc6ab5a733 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 19 Apr 2018 17:49:33 +0300 Subject: fixes #1283 (StdMsg: cursor does not change the shape) --- plugins/Scriver/src/msgdialog.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'plugins/Scriver/src') diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 020404d9ae..0ea68c5da6 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -910,7 +910,6 @@ void CSrmmWindow::MessageDialogResize(int w, int h) LRESULT CSrmmWindow::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) { - static BOOL inMenu = FALSE; switch (msg) { case WM_MEASUREITEM: MeasureMenuItem(wParam, lParam); @@ -919,13 +918,6 @@ LRESULT CSrmmWindow::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) case WM_DRAWITEM: return DrawMenuItem(wParam, lParam); - case WM_SETCURSOR: - if (inMenu) { - SetCursor(LoadCursor(nullptr, IDC_ARROW)); - return TRUE; - } - break; - case WM_CONTEXTMENU: HMENU hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT)); HMENU hSubMenu = GetSubMenu(hMenu, 0); @@ -957,9 +949,9 @@ 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; + m_bInMenu = true; int uID = TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, m_log.GetHwnd(), nullptr); - inMenu = FALSE; + m_bInMenu = false; switch (uID) { case IDM_COPY: -- cgit v1.2.3