Little changes

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

diff --git a/samples/wxsocket/client.cpp b/samples/wxsocket/client.cpp
index 3714a4f2bac7a66de38fd698f9e1ff91c363d65b..5a961e4cf5cb90413b29c7c2a4c76757a4fce74b 100644 (file)
--- a/samples/wxsocket/client.cpp
+++ b/samples/wxsocket/client.cpp
@@ -143,7 +143,7 @@ MyFrame::MyFrame():
   sock = new MyClient();
   sock->SetFlags((wxSocketBase::wxSockFlags) (wxSocketBase::WAITALL | wxSocketBase::SPEED));
   sock->frame = this;
   sock = new MyClient();
   sock->SetFlags((wxSocketBase::wxSockFlags) (wxSocketBase::WAITALL | wxSocketBase::SPEED));
   sock->frame = this;

-  sock->SetNotify(GSOCK_LOST_FLAG);
+  sock->SetNotify(wxSOCKET_LOST_FLAG);

   CreateStatusBar(2);
   UpdateStatus();
 }
   CreateStatusBar(2);
   UpdateStatus();
 }


@@ -281,7 +281,7 @@ void MyFrame::OnExecTest1(wxCommandEvent& WXUNUSED(evt))
 
   /* No 2 */
   sock->SetEventHandler(*this, SKDEMO_SCK);
 
   /* No 2 */
   sock->SetEventHandler(*this, SKDEMO_SCK);

-  sock->SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);

   sock->Notify(TRUE);
 
   text_win->WriteText("Test 1B: sending bytes to the server\n");
   sock->Notify(TRUE);
 
   text_win->WriteText("Test 1B: sending bytes to the server\n");

diff --git a/samples/wxsocket/server.cpp b/samples/wxsocket/server.cpp
index 26001a4453744cbb15f604f98883777253d41a8e..3d6438fe2903703096d855dd1d28e967646cc1c9 100644 (file)
--- a/samples/wxsocket/server.cpp
+++ b/samples/wxsocket/server.cpp
@@ -111,7 +111,7 @@ void MyFrame::OnSockRequest(wxSocketEvent& evt)
   wxPrintf(_T("OnSockRequest OK\n"));
   wxPrintf(_T("OnSockRequest (event = %d)\n"),evt.SocketEvent());
   switch (evt.SocketEvent()) {
   wxPrintf(_T("OnSockRequest OK\n"));
   wxPrintf(_T("OnSockRequest (event = %d)\n"),evt.SocketEvent());
   switch (evt.SocketEvent()) {

-  case GSOCK_INPUT:
+  case wxSOCKET_INPUT:

     unsigned char c;
 
     sock->Read((char *)&c, 1);
     unsigned char c;
 
     sock->Read((char *)&c, 1);


@@ -119,7 +119,7 @@ void MyFrame::OnSockRequest(wxSocketEvent& evt)
       ExecTest1(sock);
 
     break;
       ExecTest1(sock);
 
     break;

-  case GSOCK_LOST:
+  case wxSOCKET_LOST:

     wxPrintf(_T("Destroying socket\n"));
     wxPendingDelete.Append(sock);
     UpdateStatus(-1);
     wxPrintf(_T("Destroying socket\n"));
     wxPendingDelete.Append(sock);
     UpdateStatus(-1);


@@ -155,7 +155,7 @@ void MyFrame::OnSockRequestServer(wxSocketEvent& evt)
   sock2->SetFlags(wxSocketBase::NONE);
   sock2->Notify(TRUE);
   sock2->SetEventHandler(*this, SKDEMO_SOCKET);
   sock2->SetFlags(wxSocketBase::NONE);
   sock2->Notify(TRUE);
   sock2->SetEventHandler(*this, SKDEMO_SOCKET);

-  sock2->SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  sock2->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);

 }
 
 // My frame Constructor
 }
 
 // My frame Constructor


@@ -169,7 +169,7 @@ MyFrame::MyFrame(wxFrame *frame):
   // Init all
 
   sock = new wxSocketServer(addr);
   // Init all
 
   sock = new wxSocketServer(addr);

-  sock->SetNotify(GSOCK_CONNECTION_FLAG);
+  sock->SetNotify(wxSOCKET_CONNECTION_FLAG);

   sock->SetEventHandler(*this, SKDEMO_SOCKET_SERV);
   sock->SetFlags(wxSocketBase::SPEED);
   sock->Notify(TRUE);
   sock->SetEventHandler(*this, SKDEMO_SOCKET_SERV);
   sock->SetFlags(wxSocketBase::SPEED);
   sock->Notify(TRUE);