From b9c47379d8ab2c2857b2b728ae4229c2a15c7f22 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期六, 11 一月 2025 08:41:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
index 286767b..b159c87 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
@@ -8,6 +8,7 @@
 #include "CMainContainer.h"
 #include "CBaseView.h"
 #include "AlarmPopupDlg.h"
+#include "CPageLogcat.h"
 
 
 // CBoounionPLCDlg 对话框
@@ -33,6 +34,7 @@
 	CPagePlcList* m_pPagePlcList;
 	CMainContainer* m_pMainContainer;
 	CBaseView* m_pActiveView;
+	CPageLogcat* m_pPageLogcat;
 	CAlarmPopupDlg* m_pAlarmWnd;
 
 
@@ -48,6 +50,7 @@
 // 实现
 protected:
 	HICON m_hIcon;
+	BOOL m_bShowLogWnd;
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -62,6 +65,8 @@
 	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
 	afx_msg void OnMenuFileSettings();
 	afx_msg void OnUpdateMenuFileSettings(CCmdUI* pCmdUI);
+	afx_msg void OnMenuWndLog();
+	afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
 	afx_msg void OnMenuFileExit();
 	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
 	afx_msg void OnMenuHelpAbout();

--
Gitblit v1.9.3