fix #13

Author: guanlisheng

Makefile.in

@@ -70,7 +70,6 @@ WXSQLITEPLUS_OBJECTS =  \
 	wxsqliteplus_encrypkeydlg.o \
 	wxsqliteplus_filterdlg.o \
 	wxsqliteplus_indexbook.o \
-	wxsqliteplus_ipcframe.o \
 	wxsqliteplus_paneldata.o \
 	wxsqliteplus_preferences.o \
 	wxsqliteplus_sortdlg.o \
@@ -215,9 +214,6 @@ wxsqliteplus_filterdlg.o: $(srcdir)/src/filterdlg.cpp
 wxsqliteplus_indexbook.o: $(srcdir)/src/indexbook.cpp
 	$(CXXC) -c -o $@ $(WXSQLITEPLUS_CXXFLAGS) $(srcdir)/src/indexbook.cpp
 
-wxsqliteplus_ipcframe.o: $(srcdir)/src/ipcframe.cpp
-	$(CXXC) -c -o $@ $(WXSQLITEPLUS_CXXFLAGS) $(srcdir)/src/ipcframe.cpp
-
 wxsqliteplus_paneldata.o: $(srcdir)/src/paneldata.cpp
 	$(CXXC) -c -o $@ $(WXSQLITEPLUS_CXXFLAGS) $(srcdir)/src/paneldata.cpp
 

build/msw/makefile.gcc

@@ -97,7 +97,6 @@ WXSQLITEPLUS_OBJECTS =  \
 	wxsqliteplus_encrypkeydlg.o \
 	wxsqliteplus_filterdlg.o \
 	wxsqliteplus_indexbook.o \
-	wxsqliteplus_ipcframe.o \
 	wxsqliteplus_paneldata.o \
 	wxsqliteplus_preferences.o \
 	wxsqliteplus_sortdlg.o \
@@ -293,9 +292,6 @@ wxsqliteplus_filterdlg.o: ../../src/filterdlg.cpp
 wxsqliteplus_indexbook.o: ../../src/indexbook.cpp
 	$(CXX) -c -o $@ $(WXSQLITEPLUS_CXXFLAGS) $(CPPDEPS) $<
 
-wxsqliteplus_ipcframe.o: ../../src/ipcframe.cpp
-	$(CXX) -c -o $@ $(WXSQLITEPLUS_CXXFLAGS) $(CPPDEPS) $<
-
 wxsqliteplus_paneldata.o: ../../src/paneldata.cpp
 	$(CXX) -c -o $@ $(WXSQLITEPLUS_CXXFLAGS) $(CPPDEPS) $<
 

build/msw/makefile.vc

@@ -113,7 +113,6 @@ WXSQLITEPLUS_OBJECTS =  \
 	wxsqliteplus_encrypkeydlg.obj \
 	wxsqliteplus_filterdlg.obj \
 	wxsqliteplus_indexbook.obj \
-	wxsqliteplus_ipcframe.obj \
 	wxsqliteplus_paneldata.obj \
 	wxsqliteplus_preferences.obj \
 	wxsqliteplus_sortdlg.obj \
@@ -382,9 +381,6 @@ wxsqliteplus_filterdlg.obj: ..\..\src\filterdlg.cpp
 wxsqliteplus_indexbook.obj: ..\..\src\indexbook.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WXSQLITEPLUS_CXXFLAGS) ..\..\src\indexbook.cpp
 
-wxsqliteplus_ipcframe.obj: ..\..\src\ipcframe.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(WXSQLITEPLUS_CXXFLAGS) ..\..\src\ipcframe.cpp
-
 wxsqliteplus_paneldata.obj: ..\..\src\paneldata.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WXSQLITEPLUS_CXXFLAGS) ..\..\src\paneldata.cpp
 

build/msw/wxsqliteplus_wxsqliteplus.vcproj

@@ -464,10 +464,6 @@
 				RelativePath="..\..\src\indexbook.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\ipcframe.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\paneldata.cpp"
 				>
@@ -598,10 +594,6 @@
 				RelativePath="..\..\src\indexbook.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\ipcframe.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\paneldata.h"
 				>

src/ipcframe.cpp

@@ -109,9 +109,6 @@ wxString g_SQLiteObjTypeName[5] =
 IMPLEMENT_DYNAMIC_CLASS(wxSQLitePlusFrame, wxFrame)
 
 BEGIN_EVENT_TABLE(wxSQLitePlusFrame, wxFrame)
-   EVT_SOCKET(ID_IPC_SERVER, wxSQLitePlusFrame::OnServerEvent)
-   EVT_SOCKET(ID_IPC_SRV_SOCK, wxSQLitePlusFrame::OnSrvSocketEvent)
-
    EVT_CLOSE(wxSQLitePlusFrame::OnCloseWindow)
    EVT_TREE_ITEM_RIGHT_CLICK(ID_DBTREE, wxSQLitePlusFrame::OnDbtreeItemRightClick)
    EVT_TREE_SEL_CHANGED(ID_DBTREE, wxSQLitePlusFrame::OnDbtreeItemSelChanged)
@@ -248,21 +245,16 @@ bool wxSQLitePlusFrame::Create(wxWindow* parent, wxWindowID id,
    m_MnuTransact->Check(ID_MNU_AUTOTRANSACT, (autotransact == 1));
    m_TbTransact->ToggleTool(ID_MNU_AUTOTRANSACT, (autotransact == 1));
 
-   LaunchServer();
-
    return true;
 }
 /*---------------------------------------------------------------------------*/
 wxSQLitePlusFrame::~wxSQLitePlusFrame()
 {
-   if (m_Server)
-      delete m_Server;
    GetAuiManager().UnInit();
 }
 /*---------------------------------------------------------------------------*/
 void wxSQLitePlusFrame::Init()
 {
-   m_Server = NULL;
    m_TreeCtrl = NULL;
    m_CenterNotebook = NULL;
    m_MnuFile = NULL;
@@ -769,65 +761,6 @@ void wxSQLitePlusFrame::InitNodeParams()
    }
 }
 /*---------------------------------------------------------------------------*/
-void wxSQLitePlusFrame::OnServerEvent(wxSocketEvent& event)
-{
-   wxSocketBase *sock;
-
-   if (event.GetSocketEvent() == wxSOCKET_CONNECTION)
-   {
-      sock = m_Server->Accept(false);
-      if (sock)
-      {
-         // On indique que le gestionnaire d'évènement est La fenêtre
-         sock->SetEventHandler(*this, ID_IPC_SRV_SOCK);
-         // Spécification des évènements à générer
-         sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG | wxSOCKET_LOST_FLAG);
-         // les évènements peuvent être générés
-         sock->Notify(true);
-      }
-   }
-}
-/*---------------------------------------------------------------------------*/
-void wxSQLitePlusFrame::OnSrvSocketEvent(wxSocketEvent& event)
-{
-   wxSocketBase* ev_sock;
-   wxChar buffer[1024];
-   wxUint32 len;
-   wxString str, verb;
-
-   if (event.GetSocketEvent() == wxSOCKET_INPUT)
-   {
-      ev_sock = event.GetSocket();
-      ev_sock->SetFlags(wxSOCKET_BLOCK|wxSOCKET_WAITALL);
-      if (!ev_sock->Error())
-      {
-         len = ev_sock->ReadMsg(buffer, 1024 * sizeof(wxChar)).LastCount();
-         if (len > 0)
-         {
-            str.Printf(("%s"), buffer);
-            // wxLogMessage(str);
-            verb = str.BeforeFirst((' '));
-            if (verb == IPC_VERB_SHOW)
-            {
-               Raise();
-            }
-            else if (verb == IPC_VERB_OPEN)
-            {
-               str = str.AfterFirst((' '));
-               if (!str.IsEmpty())
-                  CmdOpen(str);
-            }
-            else
-            {
-               verb = wxString::Format(_("[%s]\nis not a correct IPC action."),
-                                       str.c_str());
-               wxMessageBox(verb, _("Internal Error"));
-            }
-         }
-      }
-   }
-}
-/*---------------------------------------------------------------------------*/
 void wxSQLitePlusFrame::OnDbtreeItemRightClick(wxTreeEvent& event)
 {
    wxTreeItemId item = event.GetItem();
@@ -2700,31 +2633,3 @@ bool wxSQLitePlusFrame::DoFinishTransaction()
    }
 }
 /*---------------------------------------------------------------------------*/
-void wxSQLitePlusFrame::LaunchServer()
-{
-   wxIPV4address addr;
-
-   addr.Service(0);  // pick an open port number.
-   // Création du serveur
-   m_Server = new wxSocketServer(addr);
-
-   // On teste si le serveur écoute
-   if (m_Server->Ok())
-   {
-      // Gets the new address, actually it is just the port number
-      m_Server->GetLocal(addr);
-      wxGetApp().SetService((unsigned int)addr.Service());
-      // On indique que le gestionnaire d'évènement est La fenêtre
-      m_Server->SetEventHandler(*this, ID_IPC_SERVER);
-      // Spécification des évènements à générer
-      m_Server->SetNotify(wxSOCKET_CONNECTION_FLAG);
-      // les évènements peuvent être générés
-      m_Server->Notify(true);
-   }
-   else
-   {
-      delete m_Server;
-      m_Server = NULL;
-   }
-}
-/*---------------------------------------------------------------------------*/

src/ipcframe.h

@@ -85,18 +85,13 @@ class wxSQLitePlusFrame: public wxFrame
 
       void CmdOpen(const wxString& file);
 
-      void LaunchServer();
-
    protected:
 
       void Init();
       void CreateControls();
       void CreateToolbars();
       void CreateMenus();
 
-      void OnServerEvent(wxSocketEvent& event);
-      void OnSrvSocketEvent(wxSocketEvent& event);
-
       void OnCloseWindow(wxCloseEvent& event);
       void OnDbtreeItemRightClick(wxTreeEvent& event);
       void OnDbtreeItemSelChanged(wxTreeEvent& event);
@@ -156,7 +151,6 @@ class wxSQLitePlusFrame: public wxFrame
 
    private:
 
-      wxSocketServer* m_Server;
       wxAuiManager m_auiManager;
       wxTreeCtrl* m_TreeCtrl;
       wxAuiNotebook* m_CenterNotebook;