little changes

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

diff --git a/samples/wxsocket/client.cpp b/samples/wxsocket/client.cpp
index a3109c1c6ce37def6a534ffe09059af6a5fe75d0..4d14e9cb941f00b3a3094e1e4ea813ba02f8465c 100644 (file)
--- a/samples/wxsocket/client.cpp
+++ b/samples/wxsocket/client.cpp
@@ -169,8 +169,6 @@ void MyFrame::OnExecOpenConnection(wxCommandEvent& WXUNUSED(evt))
                                   "Connect ...", "localhost");
   addr.Hostname(hname);
   addr.Service(3000);
-  sock->SetNotify(wxSOCKET_CONNECTION_FLAG | wxSOCKET_LOST_FLAG);
-  sock->SetNotify(TRUE);
   sock->Connect(addr, FALSE);
   sock->WaitOnConnect(10);
   sock->SetFlags(wxSocketBase::NONE);
@@ -285,8 +283,10 @@ void MyFrame::OnExecTest1(wxCommandEvent& WXUNUSED(evt))
   sock->SetEventHandler(*this, SKDEMO_SCK);
   sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
   sock->Notify(TRUE);
-
   text_win->WriteText("Test 1B: sending bytes to the server\n");
+  if (!sock->IsData())
+    text_win->WriteText("No data to read yet (this is OK)\n");
+
   wxYield();
   sock->Write((char *)buf, wxStrlen(buf)+1);
   text_win->WriteText("Waiting for incoming bytes (timeout = 2 sec) ...");
@@ -303,14 +303,19 @@ void MyFrame::OnExecTest1(wxCommandEvent& WXUNUSED(evt))
    wxYield();
 
   if (!m_good) {
-    text_win->WriteText("Timeout ! Failed.\n");
+    text_win->WriteText("timeout ! Failed.\n");
     sock->Close();
     UpdateStatus();
   } else
-    text_win->WriteText("Success.");
+    text_win->WriteText("event ! (no timeout).\n");
+
+  if (sock->IsData())
+    text_win->WriteText("Data is available, as expected...\n");
 
   sock->Read((char *)buf2, wxStrlen(buf)+1);
 
+  text_win->WriteText("Success!\n");
+
   dlgbox->Layout();
   dlgbox->ShowModal();