--- trunk/FlisServer/FlisServerDlg.h	2007/11/28 16:24:04	81
+++ trunk/FlisServer/FlisServerDlg.h	2007/11/30 16:03:46	110
@@ -5,7 +5,9 @@
 #include "afxwin.h"
 #include "stdafx.h"
 #include <vector>
-
+#include "Containers.h"
+#include "Serial.h"
+#define UWM_MYMESSAGE 0x8100
 
 // CFlisServerDlg dialog
 class CFlisServerDlg : public CDialog
@@ -14,8 +16,7 @@
 public:
 	CFlisServerDlg(CWnd* pParent = NULL);	// standard constructor
 	CSerial Serial;
-
-
+	CFlisServerDlg * mainwindow;
 // Dialog Data
 	enum { IDD = IDD_FLISSERVER_DIALOG };
 
@@ -29,28 +30,34 @@
 
 	// Generated message map functions
 	virtual BOOL OnInitDialog();
+	afx_msg LRESULT OnShowString(WPARAM,LPARAM);
 	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
 	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();
 	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 SetPin();
 	void DBConnect();
-	void DBRead();
+	vector<Commands> DBRead(void);
 	void ReadSms();
 	void SmsSplit(CString data);
 	CString Splitter(CString& fyrdata);
-	
+	void DeleteSms();
+	void startthread();
+	virtual void runthread();
+	void Reader();
+
 public:
 	CEdit m_Textwindow;
-	afx_msg void OnBnClickedOk();
-	afx_msg void OnBnClickedCancel();
 	afx_msg void OnBnClickedtest();
+	afx_msg void OnBnClickedClose();
+	afx_msg void OnBnClickedGsmpin();
+	BOOL 	continueThread;
+	friend UINT threadWrapper(LPVOID thread);
 };