--- trunk/FlisServer/FlisServerDlg.h	2007/11/28 16:24:04	81
+++ trunk/FlisServer/FlisServerDlg.h	2007/11/30 07:24:35	105
@@ -5,6 +5,7 @@
 #include "afxwin.h"
 #include "stdafx.h"
 #include <vector>
+#include "Containers.h"
 
 
 // CFlisServerDlg dialog
@@ -15,7 +16,6 @@
 	CFlisServerDlg(CWnd* pParent = NULL);	// standard constructor
 	CSerial Serial;
 
-
 // Dialog Data
 	enum { IDD = IDD_FLISSERVER_DIALOG };
 
@@ -33,8 +33,7 @@
 	afx_msg void OnPaint();
 	afx_msg HCURSOR OnQueryDragIcon();
 	DECLARE_MESSAGE_MAP()
-	CDatabase* db;
-	CDatabase db2;
+	CDatabase db;
 
 	int StartSerial(void);
 	std::vector<unsigned char> readFrame();
@@ -43,14 +42,14 @@
 	void SendSmsHead(std::vector<unsigned char> data);
 	int SetPin(void);
 	void DBConnect();
-	void DBRead();
+	vector<Commands> DBRead(void);
 	void ReadSms();
 	void SmsSplit(CString data);
 	CString Splitter(CString& fyrdata);
 	
 public:
 	CEdit m_Textwindow;
-	afx_msg void OnBnClickedOk();
-	afx_msg void OnBnClickedCancel();
 	afx_msg void OnBnClickedtest();
+	afx_msg void OnBnClickedClose();
+	afx_msg void OnBnClickedGsmpin();
 };