~chenluhua/Bond2.git

			@@ -6,8 +6,11 @@
			#include "ServoGraph.h"
			#include "BlButton.h"
			#include "LogDlg.h"
			#include "AlarmDlg.h"
			#include "TerminalDisplayDlg.h"
			#include "CPanelMaster.h"
			#include "CPanelEquipment.h"
			#include "CPanelAttributes.h"


			enum DeviceStatus {
			@@ -41,6 +44,7 @@
			BOOL m_bShowLogWnd;
			BOOL m_bShowAlarmWnd;
			CLogDlg* m_pLogDlg;
			CAlarmDlg* m_pAlarmDlg;
			CTerminalDisplayDlg* m_pTerminalDisplayDlg;


			@@ -65,7 +69,8 @@
			CBlButton m_btnLog;
			CBlButton m_btnAlarm;
			CPanelMaster* m_pPanelMaster;

			CPanelEquipment* m_pPanelEquipment;
			CPanelAttributes* m_pPanelAttributes;

			// 生成的消息映射函数
			virtual BOOL OnInitDialog();
			@@ -82,6 +87,7 @@
			afx_msg void OnSize(UINT nType, int cx, int cy);
			afx_msg void OnClose();
			afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
			afx_msg LRESULT OnAlarmDlgHide(WPARAM wParam, LPARAM lParam);
			afx_msg void OnMoving(UINT fwSide, LPRECT pRect);
			afx_msg void OnMove(int x, int y);
			afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
			@@ -91,6 +97,8 @@
			afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
			afx_msg void OnMenuWndLog();
			afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
			afx_msg void OnMenuWndAlarm();
			afx_msg void OnUpdateMenuWndAlarm(CCmdUI* pCmdUI);
			afx_msg void OnMenuFileExit();
			afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
			afx_msg void OnMenuHelpAbout();