--- trunk/FlisServer/FlisServerDlg.h	2007/11/27 15:26:42	70
+++ trunk/FlisServer/FlisServerDlg.h	2007/11/30 07:24:35	105
@@ -3,7 +3,9 @@
 
 #pragma once
 #include "afxwin.h"
+#include "stdafx.h"
 #include <vector>
+#include "Containers.h"
 
 
 // CFlisServerDlg dialog
@@ -13,13 +15,6 @@
 public:
 	CFlisServerDlg(CWnd* pParent = NULL);	// standard constructor
 	CSerial Serial;
-	int StartSerial(void);
-	std::vector<unsigned char> readFrame();
-	void writeFrame(std::vector<unsigned char> data);
-	void SendSmsData(std::vector<unsigned char> data);
-	void SendSmsHead(std::vector<unsigned char> data);
-	int SetPin(void);
-	void DBconnect();
 
 // Dialog Data
 	enum { IDD = IDD_FLISSERVER_DIALOG };
@@ -38,9 +33,23 @@
 	afx_msg void OnPaint();
 	afx_msg HCURSOR OnQueryDragIcon();
 	DECLARE_MESSAGE_MAP()
+	CDatabase db;
+
+	int StartSerial(void);
+	std::vector<unsigned char> readFrame();
+	void writeFrame(std::vector<unsigned char> data);
+	void SendSmsData(std::vector<unsigned char> data);
+	void SendSmsHead(std::vector<unsigned char> data);
+	int SetPin(void);
+	void DBConnect();
+	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();
 };