From 0677e1aaead1762fc19c16c82a02926ec6d21b8a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 13 十二月 2024 11:59:01 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/BondEq/CPageAlarm.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BondEq/CPageAlarm.h b/SourceCode/Bond/BondEq/CPageAlarm.h
index 2fdbcb7..583a6b2 100644
--- a/SourceCode/Bond/BondEq/CPageAlarm.h
+++ b/SourceCode/Bond/BondEq/CPageAlarm.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "AlarmMonitor.h"
 
 
 // CPageAlarm 对话框
@@ -13,6 +14,10 @@
 
 private:
 	void InitRxWindow();
+	void Resize();
+	void LoadAlarms();
+	void AddAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm);
+	void UpdateAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm);
 
 private:
 	COLORREF m_crBkgnd;
@@ -34,4 +39,5 @@
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
 	afx_msg void OnDestroy();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	virtual BOOL DestroyWindow();
 };

--
Gitblit v1.9.3