Changed Socket() and SocketEvent() to Get... in the samples, also added

a few more comments and output messages for easier understanding of what's
going on inside wxSocket.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 03a9f7247a8eb802f9f9d6478e6ebbf9f978a74f..a505f01a189db551fd3bf470930a1d86d1a52f81 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -596,7 +596,7 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
   wxString s = _("OnSocketEvent: ");
 
 {
   wxString s = _("OnSocketEvent: ");
 

-  switch(event.SocketEvent())
+  switch(event.GetSocketEvent())

   {
     case wxSOCKET_INPUT      : s.Append(_("wxSOCKET_INPUT\n")); break;
     case wxSOCKET_LOST       : s.Append(_("wxSOCKET_LOST\n")); break;
   {
     case wxSOCKET_INPUT      : s.Append(_("wxSOCKET_INPUT\n")); break;
     case wxSOCKET_LOST       : s.Append(_("wxSOCKET_LOST\n")); break;

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 441d5721ba0d3ab8dcee7886f3251f04ede436d8..9807468ec77dec6e2903f5b5a1d643d104d3d35f 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -237,14 +237,19 @@ void MyFrame::Test1(wxSocketBase *sock)
 
   sock->SetFlags(wxSOCKET_WAITALL);
 
 
   sock->SetFlags(wxSOCKET_WAITALL);
 

+  // Read the size

   sock->Read(&len, 1);
   sock->Read(&len, 1);

-

   buf = new char[len];
   buf = new char[len];

+
+  // Read the data

   sock->Read(buf, len);
   sock->Read(buf, len);

+  m_text->AppendText(_("Got the data, sending it back\n"));
+
+  // Write it back

   sock->Write(buf, len);
   delete[] buf;
 
   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)
 }
 
 void MyFrame::Test2(wxSocketBase *sock)


@@ -260,16 +265,17 @@ void MyFrame::Test2(wxSocketBase *sock)
   // We don't need to set flags because ReadMsg and WriteMsg
   // are not affected by them anyway.
 
   // We don't need to set flags because ReadMsg and WriteMsg
   // are not affected by them anyway.
 

+  // Read the message

   len = sock->ReadMsg(buf, MAX_MSG_SIZE).LastCount();
   len = sock->ReadMsg(buf, MAX_MSG_SIZE).LastCount();

-

   s.Printf(_("Client says: %s\n"), buf);
   m_text->AppendText(s);
   m_text->AppendText(_("Sending the data back\n"));
 
   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;
 
   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
 }
 
 #undef MAX_MSG_SIZE
 }


@@ -286,14 +292,19 @@ void MyFrame::Test3(wxSocketBase *sock)
 
   sock->SetFlags(wxSOCKET_WAITALL);
 
 
   sock->SetFlags(wxSOCKET_WAITALL);
 

+  // Read the size

   sock->Read(&len, 1);
   sock->Read(&len, 1);

-  

   buf = new char[len * 1024];
   buf = new char[len * 1024];

+
+  // Read the data

   sock->Read(buf, len * 1024);
   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;
 
   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)
 }
 
 void MyFrame::OnServerEvent(wxSocketEvent& event)


@@ -301,7 +312,7 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
   wxString s = _("OnServerEvent: ");
   wxSocketBase *sock;
 
   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;
   {
     case wxSOCKET_CONNECTION : s.Append(_("wxSOCKET_CONNECTION\n")); break;
     default                  : s.Append(_("Unexpected event !\n")); break;


@@ -318,11 +329,11 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
 
   if (sock)
   {
 
   if (sock)
   {

-    m_text->AppendText(_("New client connection accepted\n"));
+    m_text->AppendText(_("New client connection accepted\n\n"));

   }
   else
   {
   }
   else
   {

-    m_text->AppendText(_("Error: couldn't accept a new connection"));
+    m_text->AppendText(_("Error: couldn't accept a new connection\n\n"));

     return;
   }
 
     return;
   }
 


@@ -336,11 +347,11 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
 
 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
 
 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {

-  wxSocketBase *sock = event.Socket();
+  wxSocketBase *sock = event.GetSocket();

   wxString s = _("OnSocketEvent: ");
 
   // We first print a msg
   wxString s = _("OnSocketEvent: ");
 
   // We first print a msg

-  switch(event.SocketEvent())
+  switch(event.GetSocketEvent())

   {
     case wxSOCKET_INPUT: s.Append(_("wxSOCKET_INPUT\n")); break;
     case wxSOCKET_LOST:  s.Append(_("wxSOCKET_LOST\n")); break;
   {
     case wxSOCKET_INPUT: s.Append(_("wxSOCKET_INPUT\n")); break;
     case wxSOCKET_LOST:  s.Append(_("wxSOCKET_LOST\n")); break;


@@ -350,7 +361,7 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
   m_text->AppendText(s);
 
   // Now we process the event
   m_text->AppendText(s);
 
   // Now we process the event

-  switch(event.SocketEvent())
+  switch(event.GetSocketEvent())

   {
     case wxSOCKET_INPUT:
     {
   {
     case wxSOCKET_INPUT:
     {


@@ -367,7 +378,7 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
         case 0xBE: Test1(sock); break;
         case 0xCE: Test2(sock); break;
         case 0xDE: Test3(sock); break;
         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: s.Append(_("Unknown test id received from client\n\n"));

       }
 
       // Enable input events again.
       }
 
       // Enable input events again.


@@ -385,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
       // 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;
     }
       sock->Destroy();
       break;
     }