X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39d580f7dcc48a85d092f6088f8c978a18db5a97..336b8a4257b2723804ed6aa5a033e86b7edb8dad:/samples/ipc/server.cpp

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index f278b704e8..5d9b0cf1aa 100644
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -57,7 +57,6 @@ END_EVENT_TABLE()
 // global variables
 // ----------------------------------------------------------------------------
 
-char ipc_buffer[4000];
 MyConnection *the_connection = NULL;
 
 // ============================================================================
@@ -71,10 +70,10 @@ MyConnection *the_connection = NULL;
 bool MyApp::OnInit()
 {
     // Create the main frame window
-    (new MyFrame(NULL, "Server"))->Show(TRUE);
+    (new MyFrame(NULL, _T("Server")))->Show(TRUE);
 
     // service name (DDE classes) or port number (TCP/IP based classes)
-    wxString service = "4242";
+    wxString service = IPC_SERVICE;
 
     if (argc > 1)
         service = argv[1];
@@ -109,22 +108,22 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
-    file_menu->Append(SERVER_EXIT, "&Quit\tCtrl-Q");
+    file_menu->Append(SERVER_EXIT, _T("&Quit\tCtrl-Q"));
 
     wxMenuBar *menu_bar = new wxMenuBar;
 
-    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(file_menu, _T("&File"));
 
     // Associate the menu bar with the frame
     SetMenuBar(menu_bar);
 
     // Make a listbox
     wxListBox *list = new wxListBox(this, SERVER_LISTBOX, wxPoint(5, 5));
-    list->Append("Apple");
-    list->Append("Pear");
-    list->Append("Orange");
-    list->Append("Banana");
-    list->Append("Fruit");
+    list->Append(_T("Apple"));
+    list->Append(_T("Pear"));
+    list->Append(_T("Orange"));
+    list->Append(_T("Banana"));
+    list->Append(_T("Fruit"));
 }
 
 // Set the client process's listbox to this item
@@ -134,9 +133,12 @@ void MyFrame::OnListBoxClick(wxCommandEvent& WXUNUSED(event))
     if (listBox)
     {
         wxString value = listBox->GetStringSelection();
+
+        /* Because the_connection only holds one connection, in this sample only
+           one connection can receive advise messages */
         if (the_connection)
         {
-            the_connection->Advise("Item", (wxChar *)value.c_str());
+            the_connection->Advise(IPC_ADVISE_NAME, (wxChar*)value.c_str());
         }
     }
 }
@@ -156,11 +158,19 @@ IPCDialogBox::IPCDialogBox(wxWindow *parent, const wxString& title,
             : wxDialog(parent, -1, title, pos, size)
 {
     m_connection = connection;
-    (void)new wxButton(this, SERVER_QUIT_BUTTON, "Quit this connection",
+    (void)new wxButton(this, SERVER_QUIT_BUTTON, _T("Quit this connection"),
                        wxPoint(5, 5));
     Fit();
 }
 
+IPCDialogBox::~IPCDialogBox( )
+{
+    // wxWindows exit code destroys dialog before destroying the connection in
+    // OnExit, so make sure connection won't try to delete the dialog later.
+    if (m_connection)
+        m_connection->dialog = NULL;
+}
+
 void IPCDialogBox::OnQuit(wxCommandEvent& event)
 {
     m_connection->Disconnect();
@@ -173,20 +183,21 @@ void IPCDialogBox::OnQuit(wxCommandEvent& event)
 
 wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic)
 {
-    if (strcmp(topic, "STDIO") != 0 && strcmp(topic, "IPC TEST") == 0)
-        return new MyConnection(ipc_buffer, WXSIZEOF(ipc_buffer));
-    else
-        return NULL;
+    if ( topic == IPC_TOPIC )
+        return new MyConnection();
+
+    // unknown topic
+    return NULL;
 }
 
 // ----------------------------------------------------------------------------
 // MyConnection
 // ----------------------------------------------------------------------------
 
-MyConnection::MyConnection(char *buf, int size)
-            : wxConnection(buf, size)
+MyConnection::MyConnection()
+            : wxConnection()
 {
-    dialog = new IPCDialogBox(wxTheApp->GetTopWindow(), "Connection",
+    dialog = new IPCDialogBox(wxTheApp->GetTopWindow(), _T("Connection"),
                               wxPoint(100, 100), wxSize(500, 500), this);
     dialog->Show(TRUE);
     the_connection = this;
@@ -196,36 +207,40 @@ MyConnection::~MyConnection()
 {
     if (the_connection)
     {
-        dialog->Destroy();
+        if (dialog)
+        {
+            dialog->m_connection = NULL;
+            dialog->Destroy();
+        }
         the_connection = NULL;
     }
 }
 
 bool MyConnection::OnExecute(const wxString& WXUNUSED(topic),
-                             char *data,
+                             wxChar *data,
                              int WXUNUSED(size),
                              wxIPCFormat WXUNUSED(format))
 {
-    wxLogStatus("Execute command: %s", data);
+    wxLogStatus(wxT("Execute command: %s"), data);
     return TRUE;
 }
 
 bool MyConnection::OnPoke(const wxString& WXUNUSED(topic),
                           const wxString& item,
-                          char *data,
+                          wxChar *data,
                           int WXUNUSED(size),
                           wxIPCFormat WXUNUSED(format))
 {
-    wxLogStatus("Poke command: %s = %s", item.c_str(), data);
+    wxLogStatus(wxT("Poke command: %s = %s"), item.c_str(), data);
     return TRUE;
 }
 
-char *MyConnection::OnRequest(const wxString& WXUNUSED(topic),
+wxChar *MyConnection::OnRequest(const wxString& WXUNUSED(topic),
                               const wxString& WXUNUSED(item),
                               int * WXUNUSED(size),
                               wxIPCFormat WXUNUSED(format))
 {
-    return "Here, have your data, client!";
+    return _T("Here, have your data, client!");
 }
 
 bool MyConnection::OnStartAdvise(const wxString& WXUNUSED(topic),