From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BoounionPLC/CPageLogcat.cpp | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/CPageLogcat.cpp b/SourceCode/Bond/BoounionPLC/CPageLogcat.cpp
index 9781053..d3b0560 100644
--- a/SourceCode/Bond/BoounionPLC/CPageLogcat.cpp
+++ b/SourceCode/Bond/BoounionPLC/CPageLogcat.cpp
@@ -302,3 +302,13 @@
m_bIncludeRegex = pCheckBox->GetCheck();
theApp.m_model.m_configuration.setLogcatIncludeRegex(m_bIncludeRegex);
}
+
+
+BOOL CPageLogcat::PreTranslateMessage(MSG* pMsg)
+{
+ if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
+ return TRUE;
+ }
+
+ return CDialogEx::PreTranslateMessage(pMsg);
+}
--
Gitblit v1.9.3