X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36bec0acf0ffcf5279eb704b3cb965fb5184bc39..54946cc95b8493fb092b6a508bf22a1cd6fa4693:/samples/sockets/server.cpp

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 678e668551..b3ddb96def 100644
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -29,7 +29,7 @@
 #  pragma hdrstop
 #endif
 
-// for all others, include the necessary headers 
+// for all others, include the necessary headers
 #ifndef WX_PRECOMP
 #  include "wx/wx.h"
 #endif
@@ -41,7 +41,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #  include "mondrian.xpm"
 #endif
 
@@ -216,8 +216,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-  wxMessageBox(_("wxSocket demo: Server\n" 
-                 "(c) 1999 Guillermo Rodriguez Garcia\n"),
+  wxMessageBox(_("wxSocket demo: Server\n(c) 1999 Guillermo Rodriguez Garcia\n"),
                _("About Server"),
                wxOK | wxICON_INFORMATION, this);
 }
@@ -237,14 +236,19 @@ void MyFrame::Test1(wxSocketBase *sock)
 
   sock->SetFlags(wxSOCKET_WAITALL);
 
-  sock->Read((char *)&len, 1);
-
+  // Read the size
+  sock->Read(&len, 1);
   buf = new char[len];
+
+  // Read the data
   sock->Read(buf, len);
+  m_text->AppendText(_("Got the data, sending it back\n"));
+
+  // Write it back
   sock->Write(buf, len);
   delete[] buf;
 
-  m_text->AppendText(_("Test 1 ends\n"));
+  m_text->AppendText(_("Test 1 ends\n\n"));
 }
 
 void MyFrame::Test2(wxSocketBase *sock)
@@ -252,7 +256,7 @@ void MyFrame::Test2(wxSocketBase *sock)
 #define MAX_MSG_SIZE 10000
 
   wxString s;
-  char *buf = new char[MAX_MSG_SIZE];
+  wxChar *buf = new wxChar[MAX_MSG_SIZE];
   wxUint32 len;
 
   m_text->AppendText(_("Test 2 begins\n"));
@@ -260,16 +264,17 @@ void MyFrame::Test2(wxSocketBase *sock)
   // We don't need to set flags because ReadMsg and WriteMsg
   // are not affected by them anyway.
 
-  len = sock->ReadMsg(buf, MAX_MSG_SIZE).LastCount();
-
+  // Read the message
+  len = sock->ReadMsg(buf, MAX_MSG_SIZE * sizeof(wxChar)).LastCount();
   s.Printf(_("Client says: %s\n"), buf);
   m_text->AppendText(s);
   m_text->AppendText(_("Sending the data back\n"));
 
+  // Write it back
   sock->WriteMsg(buf, len);
   delete[] buf;
 
-  m_text->AppendText(_("Test 2 ends\n"));
+  m_text->AppendText(_("Test 2 ends\n\n"));
 
 #undef MAX_MSG_SIZE
 }
@@ -281,18 +286,24 @@ void MyFrame::Test3(wxSocketBase *sock)
 
   m_text->AppendText(_("Test 3 begins\n"));
 
-  // This test is similar to the first one, but the len is   
+  // This test is similar to the first one, but the len is
   // expressed in kbytes - this tests large data transfers.
 
   sock->SetFlags(wxSOCKET_WAITALL);
 
-  sock->Read((char *)&len, 1);
+  // Read the size
+  sock->Read(&len, 1);
   buf = new char[len * 1024];
+
+  // Read the data
   sock->Read(buf, len * 1024);
+  m_text->AppendText(_("Got the data, sending it back\n"));
+
+  // Write it back
   sock->Write(buf, len * 1024);
   delete[] buf;
 
-  m_text->AppendText(_("Test 3 ends\n"));
+  m_text->AppendText(_("Test 3 ends\n\n"));
 }
 
 void MyFrame::OnServerEvent(wxSocketEvent& event)
@@ -300,7 +311,7 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
   wxString s = _("OnServerEvent: ");
   wxSocketBase *sock;
 
-  switch(event.SocketEvent())
+  switch(event.GetSocketEvent())
   {
     case wxSOCKET_CONNECTION : s.Append(_("wxSOCKET_CONNECTION\n")); break;
     default                  : s.Append(_("Unexpected event !\n")); break;
@@ -317,11 +328,11 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
 
   if (sock)
   {
-    m_text->AppendText(_("New client connection accepted\n"));
+    m_text->AppendText(_("New client connection accepted\n\n"));
   }
   else
   {
-    m_text->AppendText(_("Error: couldn't accept a new connection"));
+    m_text->AppendText(_("Error: couldn't accept a new connection\n\n"));
     return;
   }
 
@@ -335,21 +346,21 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
 
 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
-  wxSocketBase *sock = event.Socket();
   wxString s = _("OnSocketEvent: ");
+  wxSocketBase *sock = event.GetSocket();
 
-  // We first print a msg
-  switch(event.SocketEvent())
+  // First, print a message
+  switch(event.GetSocketEvent())
   {
-    case wxSOCKET_INPUT: s.Append(_("wxSOCKET_INPUT\n")); break;
-    case wxSOCKET_LOST:  s.Append(_("wxSOCKET_LOST\n")); break;
-    default:             s.Append(_("unexpected event !\n"));
+    case wxSOCKET_INPUT : s.Append(_("wxSOCKET_INPUT\n")); break;
+    case wxSOCKET_LOST  : s.Append(_("wxSOCKET_LOST\n")); break;
+    default             : s.Append(_("Unexpected event !\n")); break;
   }
 
   m_text->AppendText(s);
 
   // Now we process the event
-  switch(event.SocketEvent())
+  switch(event.GetSocketEvent())
   {
     case wxSOCKET_INPUT:
     {
@@ -359,14 +370,15 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
 
       // Which test are we going to run?
       unsigned char c;
-      sock->Read((char *)&c ,1);
+      sock->Read(&c, 1);
 
       switch (c)
       {
         case 0xBE: Test1(sock); break;
         case 0xCE: Test2(sock); break;
         case 0xDE: Test3(sock); break;
-        default: s.Append(_("Unknown test id received from client\n"));
+        default:
+          m_text->AppendText(_("Unknown test id received from client\n\n"));
       }
 
       // Enable input events again.
@@ -384,11 +396,9 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
       // has been deleted. Also, we might be doing some other thing with
       // the socket at the same time; for example, we might be in the
       // middle of a test or something. Destroy() takes care of all
-      // this for us. The only case where delete should be used instead
-      // is when the event handler itself is also being destroyed; for
-      // example, see the frame dtor above.
+      // this for us.
 
-      m_text->AppendText(_("Deleting socket.\n"));
+      m_text->AppendText(_("Deleting socket.\n\n"));
       sock->Destroy();
       break;
     }