From 009eda749899fc85d3a75ad2016371f27436bf36 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期四, 09 一月 2025 14:04:16 +0800
Subject: [PATCH] Merge branch 'liuyang' into chenluhua

---
 SourceCode/Bond/BondEq/TopToolbar.cpp |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BondEq/TopToolbar.cpp b/SourceCode/Bond/BondEq/TopToolbar.cpp
index fa03ee4..eff0bb2 100644
--- a/SourceCode/Bond/BondEq/TopToolbar.cpp
+++ b/SourceCode/Bond/BondEq/TopToolbar.cpp
@@ -200,3 +200,11 @@
 	return m_btnOperator.GetMenu();
 }
 
+BOOL CTopToolbar::PreTranslateMessage(MSG* pMsg)
+{
+	if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
+		return TRUE;
+	}
+
+	return CDialogEx::PreTranslateMessage(pMsg);
+}

--
Gitblit v1.9.3