From b7d98aad7e8728c5a41c6fab5a21b6c633042527 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 11:43:13 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

---
 SourceCode/Bond/Servo/CPageGlassList.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPageGlassList.h b/SourceCode/Bond/Servo/CPageGlassList.h
index af56f30..1094c50 100644
--- a/SourceCode/Bond/Servo/CPageGlassList.h
+++ b/SourceCode/Bond/Servo/CPageGlassList.h
@@ -40,7 +40,7 @@
 	bool m_rebuilding = false;
 
 private:
-	void InitRxWindow();
+	void InitRxWindows();
 	void Resize();
 	void InitStatusCombo();
 	void InitTimeRangeCombo();
@@ -75,5 +75,6 @@
 	afx_msg void OnBnClickedButtonPrevPage();
 	afx_msg void OnBnClickedButtonNextPage();
 	afx_msg void OnShowFullText(NMHDR* pNMHDR, LRESULT* pResult);
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3