diff options
| author | George Hazan <ghazan@miranda.im> | 2017-10-25 19:01:09 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-10-25 19:01:09 +0300 |
| commit | 083bf4917323edb4b73489d8261393a99f3edea1 (patch) | |
| tree | 886f6f47a1391608a11ff0c30fabca710a4f1ade | |
| parent | 55df6c3d447e7e3864b4e1cad671aaa0e74be16c (diff) | |
click emulator used instead of direct handler call
| -rw-r--r-- | plugins/Scriver/src/chat_window.cpp | 6 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/generic_msghandlers.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdialog.cpp | 8 | ||||
| -rw-r--r-- | src/core/stdmsg/src/chat_window.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/tabs.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp index 4f0c190a0c..7b22f4e8ad 100644 --- a/plugins/Scriver/src/chat_window.cpp +++ b/plugins/Scriver/src/chat_window.cpp @@ -713,18 +713,18 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) if (wParam == 0x4e && isCtrl && !isAlt) { // ctrl-n (nicklist)
if (m_btnNickList.Enabled())
- m_btnNickList.OnClick(&m_btnNickList);
+ m_btnNickList.Click();
return TRUE;
}
if (wParam == 0x48 && isCtrl && !isAlt) { // ctrl-h (history)
- m_btnHistory.OnClick(&m_btnHistory);
+ m_btnHistory.Click();
return TRUE;
}
if (wParam == 0x4f && isCtrl && !isAlt) { // ctrl-o (options)
if (m_btnChannelMgr.Enabled())
- m_btnChannelMgr.OnClick(&m_btnChannelMgr);
+ m_btnChannelMgr.Click();
return TRUE;
}
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index 626d5f45a6..6f6ca314bb 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -126,7 +126,7 @@ bool CTabBaseDlg::DM_GenericHotkeysCheck(MSG *message) return true; case TABSRMM_HK_HISTORY: - m_btnHistory.OnClick(&m_btnHistory); + m_btnHistory.Click(); return true; case TABSRMM_HK_CONTAINEROPTIONS: diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 147555a9c3..f5405007f5 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1898,7 +1898,7 @@ LRESULT CSrmmWindow::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) if (wParam == 0x03 && isCtrl) // Ctrl+C
return WMCopyHandler(msg, wParam, lParam);
if (wParam == 0x11 && isCtrl) // Ctrl+Q
- m_btnQuote.OnClick(&m_btnQuote);
+ m_btnQuote.Click();
break;
case WM_SYSKEYUP:
@@ -1997,15 +1997,15 @@ LRESULT CSrmmWindow::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) switch (wParam) {
case 0x02: // bold
if (m_SendFormat)
- m_btnBold.OnClick(&m_btnBold);
+ m_btnBold.Click();
return 0;
case 0x09:
if (m_SendFormat)
- m_btnItalic.OnClick(&m_btnItalic);
+ m_btnItalic.Click();
return 0;
case 21:
if (m_SendFormat)
- m_btnUnderline.OnClick(&m_btnUnderline);
+ m_btnUnderline.Click();
return 0;
case 0x0b:
m_message.SetText(L"");
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index 3c130511ed..46b9bbb97f 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -646,7 +646,7 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) if (wParam == '\n' || wParam == '\r') { if ((isCtrl != 0) ^ (0 != db_get_b(0, CHAT_MODULE, "SendOnEnter", 1))) { - m_btnOk.OnClick(&m_btnOk); + m_btnOk.Click(); return 0; } if (db_get_b(0, CHAT_MODULE, "SendOnDblEnter", 0)) { @@ -655,7 +655,7 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) else { m_message.SendMsg(WM_KEYDOWN, VK_BACK, 0); m_message.SendMsg(WM_KEYUP, VK_BACK, 0); - m_btnOk.OnClick(&m_btnOk); + m_btnOk.Click(); return 0; } } diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp index 013816a9c7..56b226614e 100644 --- a/src/core/stdmsg/src/tabs.cpp +++ b/src/core/stdmsg/src/tabs.cpp @@ -561,7 +561,7 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) if (LOWORD(wParam) == IDOK) { CMsgDialog *pDlg = (g_Settings.bTabsEnable) ? (CMsgDialog*)m_tab.GetActivePage() : m_pEmbed; if (pDlg != nullptr) { - pDlg->m_btnOk.OnClick(&pDlg->m_btnOk); + pDlg->m_btnOk.Click(); return TRUE; } } |