From fda7833a7652e3b8290947bf6451bdbb1ca0587f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 17 十一月 2025 14:06:45 +0800
Subject: [PATCH] Merge branch 'clh' of http://soft.boounion.cn/r/~chenluhua/Bond2 into clh

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

diff --git a/SourceCode/Bond/Servo/PageAlarm.h b/SourceCode/Bond/Servo/PageAlarm.h
index e520fca..6d9710c 100644
--- a/SourceCode/Bond/Servo/PageAlarm.h
+++ b/SourceCode/Bond/Servo/PageAlarm.h
@@ -17,7 +17,7 @@
 	virtual ~CPageAlarm();
 
 private:
-	void InitRxWindow();
+	void InitRxWindows();
 	void Resize();
 	void LoadAlarms();
 	void UpdatePageData();
@@ -68,5 +68,6 @@
 	afx_msg void OnBnClickedButtonExport();
 	afx_msg void OnBnClickedButtonPrevPage();
 	afx_msg void OnBnClickedButtonNextPage();
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3