From 1bc4fecb9cc1641ed3ad0a2fda30766fc06fb13e Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 01 四月 2025 16:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/AlarmDlg.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/AlarmDlg.h b/SourceCode/Bond/Servo/AlarmDlg.h
index 4fbfc43..c1ef5dc 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.h
+++ b/SourceCode/Bond/Servo/AlarmDlg.h
@@ -1,6 +1,10 @@
 锘�#pragma once
 #include "afxdialogex.h"
 #include "AlarmManager.h"
+#include "ListCtrlEx.h"
+
+
+#define ID_MSG_ALARMDLG_HIDE		WM_USER + 1024
 
 // CAlarmDlg 瀵硅瘽妗�
 
@@ -45,6 +49,7 @@
 	// 鎺т欢
 	CDateTimeCtrl m_dateTimeStart;
 	CDateTimeCtrl m_dateTimeEnd;
+	CListCtrlEx m_listCtrl;
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -54,9 +59,9 @@
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
 	virtual BOOL OnInitDialog();
-	virtual BOOL DestroyWindow();
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
 	afx_msg void OnDestroy();
+	afx_msg void OnClose();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnCbnSelchangeComboDatetime();
 	afx_msg void OnBnClickedButtonSearch();

--
Gitblit v1.9.3