~chenluhua/Bond2.git

			@@ -6,6 +6,7 @@
			#include "ServoGraph.h"
			#include "BlButton.h"
			#include "LogDlg.h"
			#include "TerminalDisplayDlg.h"


			// CServoDlg 对话框
			@@ -16,9 +17,20 @@
			CServoDlg(CWnd* pParent = NULL); // 标准构造函数


			public:
			void ShowTerminalText(const char* pszText, unsigned int duration = -1);

			private:
			void InitRxWindows();
			void Resize();
			void UpdateLogBtn();


			private:
			IObserver* m_pObserver;
			BOOL m_bShowLogWnd;
			CLogDlg* m_pLogDlg;
			CTerminalDisplayDlg* m_pTerminalDisplayDlg;


			// 对话框数据
			@@ -29,10 +41,6 @@
			protected:
			virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持


			private:
			BOOL m_bShowLogWnd;
			CLogDlg* m_pLogDlg;

			// 实现
			protected:
			@@ -70,4 +78,5 @@
			afx_msg void OnMenuFileExit();
			afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
			afx_msg void OnMenuHelpAbout();
			afx_msg void OnTimer(UINT_PTR nIDEvent);
			};