From 4f821578e14747bca6fb8d0e99ead0d12dd818e9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 29 Mar 2017 19:17:05 +0300 Subject: fixes #780 (Scriver: All message log text is selected on keyboard focus) --- protocols/JabberG/src/jabber_form.cpp | 2 -- src/mir_app/src/srmm_base.cpp | 10 ++++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/protocols/JabberG/src/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp index 3508d9bb69..e9706e4c57 100644 --- a/protocols/JabberG/src/jabber_form.cpp +++ b/protocols/JabberG/src/jabber_form.cpp @@ -28,8 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static LRESULT CALLBACK JabberFormMultiLineWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { - //case WM_GETDLGCODE: - // return DLGC_WANTARROWS|DLGC_WANTCHARS|DLGC_HASSETSEL|DLGC_WANTALLKEYS; case WM_KEYDOWN: if (wParam == VK_TAB) { SetFocus(GetNextDlgTabItem(GetParent(GetParent(hwnd)), hwnd, GetKeyState(VK_SHIFT) < 0 ? TRUE : FALSE)); diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 9543f2e1e5..3c737fd772 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -298,7 +298,10 @@ LRESULT CSrmmBaseDialog::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) break; } - return mir_callNextSubclass(m_log.GetHwnd(), stubLogProc, msg, wParam, lParam); + LRESULT res = mir_callNextSubclass(m_log.GetHwnd(), stubLogProc, msg, wParam, lParam); + if (msg == WM_GETDLGCODE) + return res & ~DLGC_HASSETSEL; + return res; } ///////////////////////////////////////////////////////////////////////////////////////// @@ -314,7 +317,10 @@ EXTERN_C MIR_APP_DLL(LRESULT) CALLBACK stubMessageProc(HWND hwnd, UINT msg, WPAR LRESULT CSrmmBaseDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) { - return mir_callNextSubclass(m_message.GetHwnd(), stubMessageProc, msg, wParam, lParam); + LRESULT res = mir_callNextSubclass(m_message.GetHwnd(), stubMessageProc, msg, wParam, lParam); + if (msg == WM_GETDLGCODE) + return res & ~DLGC_HASSETSEL; + return res; } ///////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3