diff --git a/README.md b/README.md
index e1e6017..79b9e75 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ To build and run wxWidgets example, test_gui.cpp, on Linux
 ```
  $ cd serialgui
  
- $ g++ test_gui.cpp `wx-config --cxxflags --libs` -o test_gui -std=c++11 -I..
+ $ g++ test_gui.cpp test_frame.cpp `wx-config --cxxflags --libs` -o test_gui -std=c++11 -I..
  
  $ sudo ./test_gui
 
diff --git a/serialgui/test_frame.cpp b/serialgui/test_frame.cpp
new file mode 100644
index 0000000..67efb62
--- /dev/null
+++ b/serialgui/test_frame.cpp
@@ -0,0 +1,252 @@
+#include "ceserial.h"
+#include "test_gui.h"
+using namespace std;
+// ----------------------------------------------------------------------------
+// main frame
+// ----------------------------------------------------------------------------
+
+// frame constructor
+MyFrame::MyFrame(const wxString& title)
+       : wxFrame(NULL, wxID_ANY, title,wxDefaultPosition,wxSize(390, 280), wxDEFAULT_FRAME_STYLE ^ wxRESIZE_BORDER),m_timer(this, ID_TIMER)
+{
+    // set the frame icon
+    SetIcon(wxICON(sample));
+
+#if wxUSE_MENUS
+    // create a menu bar
+    wxMenu *fileMenu = new wxMenu;
+
+	//Edit menu
+	wxMenu *editMenu = new wxMenu;
+
+    // the "About" item should be in the help menu
+    wxMenu *helpMenu = new wxMenu;
+
+    helpMenu->Append(Minimal_About, wxT("&About\tF1"), wxT("Show about dialog"));
+    fileMenu->Append(Serial_Open, wxT("&Open\tAlt-O"), wxT("Open serial port"));
+	fileMenu->Append(Serial_Close, wxT("&Close\tAlt-C"), wxT("Close serial port"));
+	editMenu->Append(Txt_Clear, wxT("Clea&r\tAlt-R"), wxT("Clear text"));
+	fileMenu->Append(Serial_Port, wxT("&Serial Port\tAlt-S"), wxT("Select serial port"));
+	fileMenu->Append(Serial_Baud, wxT("&Baud Rate\tAlt-B"), wxT("Set baud rate"));
+	fileMenu->Append(Serial_DataSize, wxT("&Data Size\tAlt-D"), wxT("Set data size"));
+	fileMenu->Append(Serial_Parity, wxT("&Parity\tAlt-P"), wxT("Set parity"));
+	fileMenu->Append(Serial_StopBits, wxT("S&top Bits\tAlt-t"), wxT("Set stop bits"));
+	fileMenu->Append(Minimal_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
+
+
+    // now append the freshly created menu to the menu bar...
+    wxMenuBar *menuBar = new wxMenuBar();
+    menuBar->Append(fileMenu, wxT("&File"));
+	menuBar->Append(editMenu, wxT("&Edit"));
+    menuBar->Append(helpMenu, wxT("&Help"));
+
+    // ... and attach this menu bar to the frame
+    SetMenuBar(menuBar);
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+    // create a status bar just for fun (by default with 1 pane only)
+    CreateStatusBar(2);
+    SetStatusText(wxT("Serial Communication"));
+#endif // wxUSE_STATUSBAR
+	btnSend = new wxButton(this,Button_Send,wxT( "Send"), wxPoint(5, 5), wxSize(100, 25));
+	txtSend = new wxTextCtrl(this,Txt_Send,wxT("Hello!"),wxPoint(120,5),wxSize(250,25));
+	//lblRx = new wxStaticText(this, ID_LBLRX, wxT("Rx:"), wxPoint(5, 75), wxSize(35, 25));
+	txtRx = new wxTextCtrl(this, Txt_Rx, wxT(""), wxPoint(5, 35), wxSize(365, 125), wxTE_MULTILINE);
+	chkRTS = new wxCheckBox(this, Chk_RTS, wxT("RTS"), wxPoint(5, 170), wxDefaultSize);
+	chkDTR = new wxCheckBox(this, Chk_DTR, wxT("DTR"), wxPoint(55, 170), wxDefaultSize);
+	chkCTS = new wxCheckBox(this, ID_CHKCTS, wxT("CTS"), wxPoint(155, 170), wxDefaultSize);
+	chkDSR = new wxCheckBox(this, ID_CHKDSR, wxT("DSR"), wxPoint(205, 170), wxDefaultSize);
+	chkRI = new wxCheckBox(this, ID_CHKRI, wxT("RI"), wxPoint(255, 170), wxDefaultSize);
+	chkCD = new wxCheckBox(this, ID_CHKCD, wxT("CD"), wxPoint(305, 170), wxDefaultSize);
+
+	Connect(Button_Send, wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(MyFrame::OnSend));
+	Connect(Minimal_About,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(MyFrame::OnAbout));
+	Connect(Minimal_Quit,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(MyFrame::OnQuit));
+	Connect(Serial_Open,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(MyFrame::OnOpen));
+	Connect(Serial_Close,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(MyFrame::OnClose));
+	Connect(Serial_Port, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SelPort));
+	Connect(Serial_Baud, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SetBaud));
+	Connect(Serial_DataSize, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SetDataSize));
+	Connect(Serial_Parity, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SetParity));
+	Connect(Serial_StopBits, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SetStopBits));
+	Connect(Timer1,wxEVT_TIMER, wxTimerEventHandler(MyFrame::OnTimer));
+	Connect(Txt_Clear, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::ClearText));
+	Connect(Chk_RTS,wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(MyFrame::OnChkRTS));
+	Connect(Chk_DTR,wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(MyFrame::OnChkDTR));
+	//Bind(wxEVT_MENU, &MyFrame::OnClose, this, Serial_Close);
+	m_timer.Start(250);
+	chkCTS->Disable();
+	chkDSR->Disable();
+	chkRI->Disable();
+	chkCD->Disable();
+}
+
+
+// event handlers
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    // true is to force the frame to close
+    Close(true);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox(wxString::Format(
+                                  wxT("Serial Communication! \n ")
+                                  wxT("Author: Yan Naing Aye \n ")
+                                  wxT("Web: https://github.com/yan9a/serial")
+                                  ),
+        wxT("About Serial Comm"),
+        wxOK | wxICON_INFORMATION,
+        this);
+}
+
+void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
+{
+	if(com.Open()) txtRx->AppendText(wxString::Format(wxT("Error opening port %s.\n"),com.GetPort()));
+	else txtRx->AppendText(wxString::Format(wxT("Port %s is opened.\n"), com.GetPort()));
+}
+
+void MyFrame::OnClose(wxCommandEvent& WXUNUSED(event))
+{
+	com.Close();
+	txtRx->AppendText(wxString::Format(wxT("Port %s is closed.\n"), com.GetPort()));
+}
+
+void MyFrame::SelPort(wxCommandEvent& WXUNUSED(event))
+{
+	if (com.IsOpened()) {
+		txtRx->AppendText(wxString::Format(wxT("Close Port %s first.\n"), com.GetPort()));
+	}
+	else {
+        wxString cdev=wxString::Format(wxT("%s"), com.GetPort());
+		wxString device = wxGetTextFromUser(wxT("Enter the port"), wxT("Set Port"), cdev);
+		string str = device.ToStdString();
+		if (str.length() > 0) {
+			com.SetPortName(str);
+		}
+
+        txtRx->AppendText(wxString::Format(wxT("Port: %s\n"), com.GetPort()));
+	}
+}
+
+void MyFrame::SetParity(wxCommandEvent& WXUNUSED(event))
+{
+	if (com.IsOpened()) {
+		txtRx->AppendText(wxString::Format(wxT("Close Port %s first.\n"), com.GetPort()));
+	}
+	else {
+		wxString cdev = wxString::Format(wxT("%c"), com.GetParity());
+#if defined(__WINDOWS__)
+		wxString parity = wxGetTextFromUser(wxT("Enter the parity ( N, E, O, M, or S )"), wxT("Set Parity"), cdev);
+#else
+		wxString parity = wxGetTextFromUser(wxT("Enter the parity ( N, E, or O )"), wxT("Set Parity"), cdev);
+#endif
+
+		string pstr = parity.ToStdString();
+		if (pstr.length() > 0) {
+			com.SetParity(pstr.at(0));
+		}
+		txtRx->AppendText(wxString::Format(wxT("Parity: %c\n"), com.GetParity()));
+	}
+}
+
+void MyFrame::SetBaud(wxCommandEvent& WXUNUSED(event))
+{
+	if (com.IsOpened()) {
+		txtRx->AppendText(wxString::Format(wxT("Close port %s first.\n"), com.GetPort()));
+	}
+	else {
+		long n = wxGetNumberFromUser(wxT("Enter the baud rate"), wxT("Baud rate"), wxT("Set Baud Rate"),com.GetBaudRate(),0, 1000000);
+		if (n >= 0) {
+			com.SetBaudRate(n);
+		}
+		txtRx->AppendText(wxString::Format(wxT("Baud rate: %ld\n"), com.GetBaudRate()));
+	}
+}
+
+void MyFrame::SetDataSize(wxCommandEvent& WXUNUSED(event))
+{
+	if (com.IsOpened()) {
+		txtRx->AppendText(wxString::Format(wxT("Close port %s first.\n"), com.GetPort()));
+	}
+	else {
+		long n = wxGetNumberFromUser(wxT("Enter the data size"), wxT("Data Size"), wxT("Set Data Size"), com.GetDataSize(), 5, 8);
+		if (n >= 0) {
+			com.SetDataSize(n);
+		}
+		txtRx->AppendText(wxString::Format(wxT("Data size: %ld\n"), com.GetDataSize()));
+	}
+}
+
+void MyFrame::SetStopBits(wxCommandEvent& WXUNUSED(event))
+{
+	if (com.IsOpened()) {
+		txtRx->AppendText(wxString::Format(wxT("Close port %s first.\n"), com.GetPort()));
+	}
+	else {
+		long n = wxGetNumberFromUser(wxT("Enter the number of stop bits"), wxT("Data Size"), wxT("Set stop bits"), long(com.GetStopBits()), 1, 2);
+		if (n > 0) {
+			com.SetStopBits(float(n));
+		}
+		txtRx->AppendText(wxString::Format(wxT("Stop bits: %ld\n"), long(com.GetStopBits())));
+	}
+}
+
+void MyFrame::OnSend(wxCommandEvent& WXUNUSED(event))
+{
+	wxString str = txtSend->GetValue();
+	wxCharBuffer buffer = str.ToUTF8();
+	if (com.Write(buffer.data())) {
+		txtRx->AppendText(str);
+	}
+	else {
+		txtRx->AppendText(wxT("Write error.\n"));
+	}
+}
+
+void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+	char ch; bool r;
+	do {ch = com.ReadChar(r);if (r) ProcessChar(ch);} while (r);
+	UpdateCommStatus();
+}
+
+void MyFrame::ProcessChar(char ch)
+{
+	txtRx->AppendText(wxString::Format(wxT("%c"), ch));
+}
+
+void MyFrame::ClearText(wxCommandEvent& WXUNUSED(event))
+{
+	txtRx->Clear();
+}
+
+void MyFrame::OnChkRTS(wxCommandEvent& WXUNUSED(event))
+{
+	if (!com.SetRTS(chkRTS->IsChecked())) {
+		txtRx->AppendText(wxT("RTS error.\n"));
+	}
+}
+
+void MyFrame::OnChkDTR(wxCommandEvent& WXUNUSED(event))
+{
+	if (!com.SetDTR(chkDTR->IsChecked())) {
+		txtRx->AppendText(wxT("DTR error.\n"));
+	}
+}
+
+void MyFrame::UpdateCommStatus()
+{
+	bool s;
+	bool v;
+	v = com.GetCTS(s);
+	if (s) chkCTS->SetValue(v);
+	v = com.GetDSR(s);
+	if (s) chkDSR->SetValue(v);
+	v = com.GetRI(s);
+	if (s) chkRI->SetValue(v);
+	v = com.GetCD(s);
+	if (s) chkCD->SetValue(v);
+}
diff --git a/serialgui/test_gui.cpp b/serialgui/test_gui.cpp
index 5e36ead..2d18fea 100644
--- a/serialgui/test_gui.cpp
+++ b/serialgui/test_gui.cpp
@@ -1,131 +1,9 @@
-//Description: Serial communication for wxWidgets
-//WebSite: http://cool-emerald.blogspot.sg/2017/05/serial-port-programming-in-c-with.html
-//MIT License (https://opensource.org/licenses/MIT)
-//Copyright (c) 2017 Yan Naing Aye
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWidgets headers)
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
-// the application icon (under Windows and OS/2 it is in resources and even
-// though we could still include the XPM here it would be unused)
-#ifndef wxHAS_IMAGES_IN_RESOURCES
-    #include "sample.xpm"
-#endif
-
-#include <wx/numdlg.h>
 // ----------------------------------------------------------------------------
 // private classes
-#include"ceserial.h"
+#include "ceserial.h"
+#include "test_gui.h"
 using namespace std;
 // ----------------------------------------------------------------------------
-
-// Define a new application type, each program should derive a class from wxApp
-class MyApp : public wxApp
-{
-public:
-    // override base class virtuals
-    // ----------------------------
-
-    // this one is called on application startup and is a good place for the app
-    // initialization (doing it here and not in the ctor allows to have an error
-    // return: if OnInit() returns false, the application terminates)
-    virtual bool OnInit();
-};
-
-// Define a new frame type: this is going to be our main frame
-class MyFrame : public wxFrame
-{
-public:
-    // ctor(s)
-    MyFrame(const wxString& title);
-	wxButton *btnSend;
-	wxTextCtrl *txtSend;
-	ceSerial com;
-	wxTimer m_timer;
-	wxTextCtrl *txtRx;
-	wxCheckBox *chkRTS;
-	wxCheckBox *chkDTR;
-	wxCheckBox *chkCTS;
-	wxCheckBox *chkDSR;
-	wxCheckBox *chkRI;
-	wxCheckBox *chkCD;
-    // event handlers (these functions should _not_ be virtual)
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-	void OnOpen(wxCommandEvent& event);
-	void OnClose(wxCommandEvent& event);
-	void SelPort(wxCommandEvent& event);
-	void SetDataSize(wxCommandEvent& event);
-	void SetParity(wxCommandEvent& event);
-	void SetStopBits(wxCommandEvent& event);
-	void SetBaud(wxCommandEvent& event);
-	void OnSend(wxCommandEvent& event);
-	void OnTimer(wxTimerEvent& event);
-	void ProcessChar(char ch);
-	void ClearText(wxCommandEvent& event);
-	void OnChkRTS(wxCommandEvent& event);
-	void OnChkDTR(wxCommandEvent& event);
-	void UpdateCommStatus();
-private:
-
-};
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-const int ID_BTNSEND = 101;
-const int ID_TXTSEND = 102;
-const int ID_CHKRTS = 103;
-const int ID_BAUDRATE = 103;
-const int ID_TIMER = 104;
-const int ID_TXTRX = 105;
-const int ID_CHKDTR = 106;
-const int ID_SELPORT = 107;
-const int ID_CHKCTS = 108;
-const int ID_CHKDSR = 109;
-const int ID_CHKRI = 110;
-const int ID_CHKCD = 111;
-const int ID_DATASIZE = 112;
-const int ID_PARITY = 113;
-const int ID_STOPBITS = 114;
-
-enum
-{
-	Button_Send = ID_BTNSEND,
-	Txt_Send = ID_TXTSEND,
-	Chk_RTS = ID_CHKRTS,
-	Serial_Baud = ID_BAUDRATE,
-	Timer1 = ID_TIMER,
-	Txt_Rx =ID_TXTRX,
-	Chk_DTR = ID_CHKDTR,
-	Serial_Port = ID_SELPORT,
-	Serial_DataSize=ID_DATASIZE,
-	Serial_Parity=ID_PARITY,
-	Serial_StopBits=ID_STOPBITS,
-	Txt_Clear = wxID_CLEAR,
-	Serial_Open = wxID_OPEN,
-	Serial_Close = wxID_CLOSE,
-	Minimal_Quit = wxID_EXIT,
-
-    // it is important for the id corresponding to the "About" command to have
-    // this standard value as otherwise it won't be handled properly under Mac
-    // (where it is special and put into the "Apple" menu)
-    Minimal_About = wxID_ABOUT
-
-};
-
 // Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
@@ -161,253 +39,3 @@ bool MyApp::OnInit()
     // application would exit immediately.
     return true;
 }
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-MyFrame::MyFrame(const wxString& title)
-       : wxFrame(NULL, wxID_ANY, title,wxDefaultPosition,wxSize(390, 280), wxDEFAULT_FRAME_STYLE ^ wxRESIZE_BORDER),m_timer(this, ID_TIMER)
-{
-    // set the frame icon
-    SetIcon(wxICON(sample));
-
-#if wxUSE_MENUS
-    // create a menu bar
-    wxMenu *fileMenu = new wxMenu;
-
-	//Edit menu
-	wxMenu *editMenu = new wxMenu;
-
-    // the "About" item should be in the help menu
-    wxMenu *helpMenu = new wxMenu;
-
-    helpMenu->Append(Minimal_About, wxT("&About\tF1"), wxT("Show about dialog"));
-    fileMenu->Append(Serial_Open, wxT("&Open\tAlt-O"), wxT("Open serial port"));
-	fileMenu->Append(Serial_Close, wxT("&Close\tAlt-C"), wxT("Close serial port"));
-	editMenu->Append(Txt_Clear, wxT("Clea&r\tAlt-R"), wxT("Clear text"));
-	fileMenu->Append(Serial_Port, wxT("&Serial Port\tAlt-S"), wxT("Select serial port"));
-	fileMenu->Append(Serial_Baud, wxT("&Baud Rate\tAlt-B"), wxT("Set baud rate"));
-	fileMenu->Append(Serial_DataSize, wxT("&Data Size\tAlt-D"), wxT("Set data size"));
-	fileMenu->Append(Serial_Parity, wxT("&Parity\tAlt-P"), wxT("Set parity"));
-	fileMenu->Append(Serial_StopBits, wxT("S&top Bits\tAlt-t"), wxT("Set stop bits"));
-	fileMenu->Append(Minimal_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
-
-
-    // now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(fileMenu, wxT("&File"));
-	menuBar->Append(editMenu, wxT("&Edit"));
-    menuBar->Append(helpMenu, wxT("&Help"));
-
-    // ... and attach this menu bar to the frame
-    SetMenuBar(menuBar);
-#endif // wxUSE_MENUS
-
-#if wxUSE_STATUSBAR
-    // create a status bar just for fun (by default with 1 pane only)
-    CreateStatusBar(2);
-    SetStatusText(wxT("Serial Communication"));
-#endif // wxUSE_STATUSBAR
-	btnSend = new wxButton(this,Button_Send,wxT( "Send"), wxPoint(5, 5), wxSize(100, 25));
-	txtSend = new wxTextCtrl(this,Txt_Send,wxT("Hello!"),wxPoint(120,5),wxSize(250,25));
-	//lblRx = new wxStaticText(this, ID_LBLRX, wxT("Rx:"), wxPoint(5, 75), wxSize(35, 25));
-	txtRx = new wxTextCtrl(this, Txt_Rx, wxT(""), wxPoint(5, 35), wxSize(365, 125), wxTE_MULTILINE);
-	chkRTS = new wxCheckBox(this, Chk_RTS, wxT("RTS"), wxPoint(5, 170), wxDefaultSize);
-	chkDTR = new wxCheckBox(this, Chk_DTR, wxT("DTR"), wxPoint(55, 170), wxDefaultSize);
-	chkCTS = new wxCheckBox(this, ID_CHKCTS, wxT("CTS"), wxPoint(155, 170), wxDefaultSize);
-	chkDSR = new wxCheckBox(this, ID_CHKDSR, wxT("DSR"), wxPoint(205, 170), wxDefaultSize);
-	chkRI = new wxCheckBox(this, ID_CHKRI, wxT("RI"), wxPoint(255, 170), wxDefaultSize);
-	chkCD = new wxCheckBox(this, ID_CHKCD, wxT("CD"), wxPoint(305, 170), wxDefaultSize);
-
-	Connect(Button_Send, wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(MyFrame::OnSend));
-	Connect(Minimal_About,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(MyFrame::OnAbout));
-	Connect(Minimal_Quit,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(MyFrame::OnQuit));
-	Connect(Serial_Open,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(MyFrame::OnOpen));
-	Connect(Serial_Close,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(MyFrame::OnClose));
-	Connect(Serial_Port, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SelPort));
-	Connect(Serial_Baud, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SetBaud));
-	Connect(Serial_DataSize, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SetDataSize));
-	Connect(Serial_Parity, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SetParity));
-	Connect(Serial_StopBits, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::SetStopBits));
-	Connect(Timer1,wxEVT_TIMER, wxTimerEventHandler(MyFrame::OnTimer));
-	Connect(Txt_Clear, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::ClearText));
-	Connect(Chk_RTS,wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(MyFrame::OnChkRTS));
-	Connect(Chk_DTR,wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(MyFrame::OnChkDTR));
-	//Bind(wxEVT_MENU, &MyFrame::OnClose, this, Serial_Close);
-	m_timer.Start(250);
-	chkCTS->Disable();
-	chkDSR->Disable();
-	chkRI->Disable();
-	chkCD->Disable();
-}
-
-
-// event handlers
-void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    // true is to force the frame to close
-    Close(true);
-}
-
-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxMessageBox(wxString::Format(
-                                  wxT("Serial Communication! \n ")
-                                  wxT("Author: Yan Naing Aye \n ")
-                                  wxT("Web: https://github.com/yan9a/serial")
-                                  ),
-        wxT("About Serial Comm"),
-        wxOK | wxICON_INFORMATION,
-        this);
-}
-
-void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
-{
-	if(com.Open()) txtRx->AppendText(wxString::Format(wxT("Error opening port %s.\n"),com.GetPort()));
-	else txtRx->AppendText(wxString::Format(wxT("Port %s is opened.\n"), com.GetPort()));
-}
-
-void MyFrame::OnClose(wxCommandEvent& WXUNUSED(event))
-{
-	com.Close();
-	txtRx->AppendText(wxString::Format(wxT("Port %s is closed.\n"), com.GetPort()));
-}
-
-void MyFrame::SelPort(wxCommandEvent& WXUNUSED(event))
-{
-	if (com.IsOpened()) {
-		txtRx->AppendText(wxString::Format(wxT("Close Port %s first.\n"), com.GetPort()));
-	}
-	else {
-        wxString cdev=wxString::Format(wxT("%s"), com.GetPort());
-		wxString device = wxGetTextFromUser(wxT("Enter the port"), wxT("Set Port"), cdev);
-		string str = device.ToStdString();
-		if (str.length() > 0) {
-			com.SetPortName(str);
-		}
-
-        txtRx->AppendText(wxString::Format(wxT("Port: %s\n"), com.GetPort()));
-	}
-}
-
-void MyFrame::SetParity(wxCommandEvent& WXUNUSED(event))
-{
-	if (com.IsOpened()) {
-		txtRx->AppendText(wxString::Format(wxT("Close Port %s first.\n"), com.GetPort()));
-	}
-	else {
-		wxString cdev = wxString::Format(wxT("%c"), com.GetParity());
-#if defined(__WINDOWS__)
-		wxString parity = wxGetTextFromUser(wxT("Enter the parity ( N, E, O, M, or S )"), wxT("Set Parity"), cdev);
-#else
-		wxString parity = wxGetTextFromUser(wxT("Enter the parity ( N, E, or O )"), wxT("Set Parity"), cdev);
-#endif
-
-		string pstr = parity.ToStdString();
-		if (pstr.length() > 0) {
-			com.SetParity(pstr.at(0));
-		}
-		txtRx->AppendText(wxString::Format(wxT("Parity: %c\n"), com.GetParity()));
-	}
-}
-
-void MyFrame::SetBaud(wxCommandEvent& WXUNUSED(event))
-{
-	if (com.IsOpened()) {
-		txtRx->AppendText(wxString::Format(wxT("Close port %s first.\n"), com.GetPort()));
-	}
-	else {
-		long n = wxGetNumberFromUser(wxT("Enter the baud rate"), wxT("Baud rate"), wxT("Set Baud Rate"),com.GetBaudRate(),0, 1000000);
-		if (n >= 0) {
-			com.SetBaudRate(n);
-		}
-		txtRx->AppendText(wxString::Format(wxT("Baud rate: %ld\n"), com.GetBaudRate()));
-	}
-}
-
-void MyFrame::SetDataSize(wxCommandEvent& WXUNUSED(event))
-{
-	if (com.IsOpened()) {
-		txtRx->AppendText(wxString::Format(wxT("Close port %s first.\n"), com.GetPort()));
-	}
-	else {
-		long n = wxGetNumberFromUser(wxT("Enter the data size"), wxT("Data Size"), wxT("Set Data Size"), com.GetDataSize(), 5, 8);
-		if (n >= 0) {
-			com.SetDataSize(n);
-		}
-		txtRx->AppendText(wxString::Format(wxT("Data size: %ld\n"), com.GetDataSize()));
-	}
-}
-
-void MyFrame::SetStopBits(wxCommandEvent& WXUNUSED(event))
-{
-	if (com.IsOpened()) {
-		txtRx->AppendText(wxString::Format(wxT("Close port %s first.\n"), com.GetPort()));
-	}
-	else {
-		long n = wxGetNumberFromUser(wxT("Enter the number of stop bits"), wxT("Data Size"), wxT("Set stop bits"), long(com.GetStopBits()), 1, 2);
-		if (n > 0) {
-			com.SetStopBits(float(n));
-		}
-		txtRx->AppendText(wxString::Format(wxT("Stop bits: %ld\n"), long(com.GetStopBits())));
-	}
-}
-
-void MyFrame::OnSend(wxCommandEvent& WXUNUSED(event))
-{
-	wxString str = txtSend->GetValue();
-	wxCharBuffer buffer = str.ToUTF8();
-	if (com.Write(buffer.data())) {
-		txtRx->AppendText(str);
-	}
-	else {
-		txtRx->AppendText(wxT("Write error.\n"));
-	}
-}
-
-void MyFrame::OnTimer(wxTimerEvent& WXUNUSED(event))
-{
-	char ch; bool r;
-	do {ch = com.ReadChar(r);if (r) ProcessChar(ch);} while (r);
-	UpdateCommStatus();
-}
-
-void MyFrame::ProcessChar(char ch)
-{
-	txtRx->AppendText(wxString::Format(wxT("%c"), ch));
-}
-
-void MyFrame::ClearText(wxCommandEvent& WXUNUSED(event))
-{
-	txtRx->Clear();
-}
-
-void MyFrame::OnChkRTS(wxCommandEvent& WXUNUSED(event))
-{
-	if (!com.SetRTS(chkRTS->IsChecked())) {
-		txtRx->AppendText(wxT("RTS error.\n"));
-	}
-}
-
-void MyFrame::OnChkDTR(wxCommandEvent& WXUNUSED(event))
-{
-	if (!com.SetDTR(chkDTR->IsChecked())) {
-		txtRx->AppendText(wxT("DTR error.\n"));
-	}
-}
-
-void MyFrame::UpdateCommStatus()
-{
-	bool s;
-	bool v;
-	v = com.GetCTS(s);
-	if (s) chkCTS->SetValue(v);
-	v = com.GetDSR(s);
-	if (s) chkDSR->SetValue(v);
-	v = com.GetRI(s);
-	if (s) chkRI->SetValue(v);
-	v = com.GetCD(s);
-	if (s) chkCD->SetValue(v);
-}
diff --git a/serialgui/test_gui.h b/serialgui/test_gui.h
new file mode 100644
index 0000000..ee54319
--- /dev/null
+++ b/serialgui/test_gui.h
@@ -0,0 +1,125 @@
+//Description: Serial communication for wxWidgets
+//WebSite: http://cool-emerald.blogspot.sg/2017/05/serial-port-programming-in-c-with.html
+//MIT License (https://opensource.org/licenses/MIT)
+//Copyright (c) 2017 Yan Naing Aye
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers (this file is usually all you
+// need because it includes almost all "standard" wxWidgets headers)
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+// the application icon (under Windows and OS/2 it is in resources and even
+// though we could still include the XPM here it would be unused)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "sample.xpm"
+#endif
+
+#include <wx/numdlg.h>
+// ----------------------------------------------------------------------------
+// private classes
+#include "ceserial.h"
+using namespace std;
+// ----------------------------------------------------------------------------
+
+// Define a new application type, each program should derive a class from wxApp
+class MyApp : public wxApp
+{
+public:
+    // override base class virtuals
+    // ----------------------------
+
+    // this one is called on application startup and is a good place for the app
+    // initialization (doing it here and not in the ctor allows to have an error
+    // return: if OnInit() returns false, the application terminates)
+    virtual bool OnInit();
+};
+
+// Define a new frame type: this is going to be our main frame
+class MyFrame : public wxFrame
+{
+public:
+    // ctor(s)
+    MyFrame(const wxString& title);
+	wxButton *btnSend;
+	wxTextCtrl *txtSend;
+	ceSerial com;
+	wxTimer m_timer;
+	wxTextCtrl *txtRx;
+	wxCheckBox *chkRTS;
+	wxCheckBox *chkDTR;
+	wxCheckBox *chkCTS;
+	wxCheckBox *chkDSR;
+	wxCheckBox *chkRI;
+	wxCheckBox *chkCD;
+    // event handlers (these functions should _not_ be virtual)
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+	void OnOpen(wxCommandEvent& event);
+	void OnClose(wxCommandEvent& event);
+	void SelPort(wxCommandEvent& event);
+	void SetDataSize(wxCommandEvent& event);
+	void SetParity(wxCommandEvent& event);
+	void SetStopBits(wxCommandEvent& event);
+	void SetBaud(wxCommandEvent& event);
+	void OnSend(wxCommandEvent& event);
+	void OnTimer(wxTimerEvent& event);
+	void ProcessChar(char ch);
+	void ClearText(wxCommandEvent& event);
+	void OnChkRTS(wxCommandEvent& event);
+	void OnChkDTR(wxCommandEvent& event);
+	void UpdateCommStatus();
+private:
+
+};
+// constants
+// ----------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+const int ID_BTNSEND = 101;
+const int ID_TXTSEND = 102;
+const int ID_CHKRTS = 103;
+const int ID_BAUDRATE = 103;
+const int ID_TIMER = 104;
+const int ID_TXTRX = 105;
+const int ID_CHKDTR = 106;
+const int ID_SELPORT = 107;
+const int ID_CHKCTS = 108;
+const int ID_CHKDSR = 109;
+const int ID_CHKRI = 110;
+const int ID_CHKCD = 111;
+const int ID_DATASIZE = 112;
+const int ID_PARITY = 113;
+const int ID_STOPBITS = 114;
+
+enum
+{
+	Button_Send = ID_BTNSEND,
+	Txt_Send = ID_TXTSEND,
+	Chk_RTS = ID_CHKRTS,
+	Serial_Baud = ID_BAUDRATE,
+	Timer1 = ID_TIMER,
+	Txt_Rx =ID_TXTRX,
+	Chk_DTR = ID_CHKDTR,
+	Serial_Port = ID_SELPORT,
+	Serial_DataSize=ID_DATASIZE,
+	Serial_Parity=ID_PARITY,
+	Serial_StopBits=ID_STOPBITS,
+	Txt_Clear = wxID_CLEAR,
+	Serial_Open = wxID_OPEN,
+	Serial_Close = wxID_CLOSE,
+	Minimal_Quit = wxID_EXIT,
+
+    // it is important for the id corresponding to the "About" command to have
+    // this standard value as otherwise it won't be handled properly under Mac
+    // (where it is special and put into the "Apple" menu)
+    Minimal_About = wxID_ABOUT
+
+};