From 594cf28244b9420e5a8543883f3df183368dfbdd Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 13 五月 2025 15:06:12 +0800
Subject: [PATCH] 1. 修复AlarmList.csv文件异常时导致闪退的问题 2. 修复Master.dat异常时进程无法退出的问题

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

diff --git a/SourceCode/Bond/BondEq/TopToolbar.h b/SourceCode/Bond/BondEq/TopToolbar.h
index 8b33d3e..1228bbb 100644
--- a/SourceCode/Bond/BondEq/TopToolbar.h
+++ b/SourceCode/Bond/BondEq/TopToolbar.h
@@ -18,6 +18,7 @@
 public:
 	CWnd* GetBtn(UINT nId);
 	void SetOperatorBtnText(const char* pszText);
+	HMENU GetOperatorMenu();
 
 private:
 	void Resize();
@@ -31,6 +32,7 @@
 private:
 	CBlButton m_btnRun;
 	CBlButton m_btnStop;
+	CBlButton m_btnAlarm;
 	CBlButton m_btnSettings;
 	CBlButton m_btnOperator;
 
@@ -51,4 +53,5 @@
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnButtonOperatorMenuClicked(NMHDR* pNMHDR, LRESULT* pResult);
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 };

--
Gitblit v1.9.3