From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/PageAlarm.h b/SourceCode/Bond/Servo/PageAlarm.h
index 783ce29..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();
@@ -63,11 +63,11 @@
 	afx_msg void OnDestroy();
 	afx_msg void OnClose();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg void OnCbnSelchangeComboDatetime();
 	afx_msg void OnBnClickedButtonSearch();
 	afx_msg void OnBnClickedButtonExport();
 	afx_msg void OnBnClickedButtonPrevPage();
 	afx_msg void OnBnClickedButtonNextPage();
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	DECLARE_MESSAGE_MAP()
 };

--
Gitblit v1.9.3