wxFileSelector should have file name only, not path, passed to 3rd arg

[wxWidgets.git] / samples / ipc / client.cpp

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 8c184d4d0bfb573f3abcba400b7fc8362642cc46..9b694cc696c538e0e2659a51609758e6feb98822 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -74,29 +74,37 @@ MyClient *my_client ;
 // main frame
 bool MyApp::OnInit()
 {
 // main frame
 bool MyApp::OnInit()
 {

-    wxString server = "4242";
-    wxString hostName = wxGetHostName();
+    // service name (DDE classes) or port number (TCP/IP based classes)
+    wxString service = "4242";
+
+    // ignored under DDE, host name in TCP/IP based classes
+    wxString hostName = "localhost";

 
     if (argc > 1)
 
     if (argc > 1)

-        server = argv[1];
+        service = argv[1];

     if (argc > 2)
         hostName = argv[2];
 
     // Create a new client
     my_client = new MyClient;
     if (argc > 2)
         hostName = argv[2];
 
     // Create a new client
     my_client = new MyClient;

-    the_connection = (MyConnection *)my_client->MakeConnection(hostName, server, "IPC TEST");

 
 

-    while ( !the_connection )
+    // suppress the log messages from MakeConnection()

     {
     {

-        if ( wxMessageBox("Failed to make connection to server.\nRetry?",
-                          "Client Demo Error",
-                          wxICON_ERROR | wxYES_NO | wxCANCEL ) != wxYES )
+        wxLogNull nolog;
+        the_connection = (MyConnection *)my_client->MakeConnection(hostName, service, "IPC TEST");
+
+        while ( !the_connection )

         {
         {

-            // no server
-            return FALSE;
+            if ( wxMessageBox("Failed to make connection to server.\nRetry?",
+                              "Client Demo Error",
+                              wxICON_ERROR | wxYES_NO | wxCANCEL ) != wxYES )
+            {
+                // no server
+                return FALSE;
+            }
+
+            the_connection = (MyConnection *)my_client->MakeConnection(hostName, service, "IPC TEST");

         }
         }

-
-        the_connection = (MyConnection *)my_client->MakeConnection(hostName, server, "IPC TEST");

     }
 
     if (!the_connection->StartAdvise("Item"))
     }
 
     if (!the_connection->StartAdvise("Item"))