- fix for button codes in tabSRMM;

- CSrmmBaseDialog::ProcessHotkeys to receives control keys statuses as well

4 files changed, 6 insertions, 9 deletions

diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 5fdab6eb00..00d2d4ad99 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -269,7 +269,7 @@ LRESULT CALLBACK CChatRoomDlg::MessageSubclassProc(HWND hwnd, UINT msg, WPARAM w
 				dat->szTabSave[0] = '\0';
 			}
 
-			if (pDlg->ProcessHotkeys(wParam))
+			if (pDlg->ProcessHotkeys(wParam, isShift, isCtrl, isAlt))
 				return TRUE;
 
 			if (wParam == 0x46 && isCtrl && !isAlt) { // ctrl-f (paste clean text)
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index da3ee660ea..db7b8fded0 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -429,5 +429,5 @@ Clist_ClearSearch @429 NONAME
 ?onClick_BIU@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @430 NONAME

 ?onClick_BkColor@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @431 NONAME

 ?onClick_Color@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @432 NONAME

-?ProcessHotkeys@CSrmmBaseDialog@@IAE_NH@Z @433 NONAME

-?RefreshButtonStatus@CSrmmBaseDialog@@IAEXXZ @434 NONAME

+?RefreshButtonStatus@CSrmmBaseDialog@@IAEXXZ @433 NONAME

+?ProcessHotkeys@CSrmmBaseDialog@@IAE_NH_N00@Z @434 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index cd572cd7e2..06e3fcb09b 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -429,5 +429,5 @@ Clist_ClearSearch @429 NONAME
 ?onClick_BIU@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @430 NONAME

 ?onClick_BkColor@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @431 NONAME

 ?onClick_Color@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @432 NONAME

-?ProcessHotkeys@CSrmmBaseDialog@@IEAA_NH@Z @433 NONAME

-?RefreshButtonStatus@CSrmmBaseDialog@@IEAAXXZ @434 NONAME

+?RefreshButtonStatus@CSrmmBaseDialog@@IEAAXXZ @433 NONAME

+?ProcessHotkeys@CSrmmBaseDialog@@IEAA_NH_N00@Z @434 NONAME

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index 81c4af1b38..6299bb6bf0 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -311,11 +311,8 @@ void CSrmmBaseDialog::onClick_BIU(CCtrlButton *pButton)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-bool CSrmmBaseDialog::ProcessHotkeys(int key)
+bool CSrmmBaseDialog::ProcessHotkeys(int key, bool /*isShift*/, bool isCtrl, bool isAlt)
 {
-	BOOL isCtrl = GetKeyState(VK_CONTROL) & 0x8000;
-	BOOL isAlt = GetKeyState(VK_MENU) & 0x8000;
-	
 	if (key == VK_F4 && isCtrl && !isAlt) { // ctrl-F4 (close tab)
 		CloseTab();
 		return true;