Little changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -143,7 +143,7 @@ MyFrame::MyFrame():
|
|||||||
sock = new MyClient();
|
sock = new MyClient();
|
||||||
sock->SetFlags((wxSocketBase::wxSockFlags) (wxSocketBase::WAITALL | wxSocketBase::SPEED));
|
sock->SetFlags((wxSocketBase::wxSockFlags) (wxSocketBase::WAITALL | wxSocketBase::SPEED));
|
||||||
sock->frame = this;
|
sock->frame = this;
|
||||||
sock->SetNotify(GSOCK_LOST_FLAG);
|
sock->SetNotify(wxSOCKET_LOST_FLAG);
|
||||||
CreateStatusBar(2);
|
CreateStatusBar(2);
|
||||||
UpdateStatus();
|
UpdateStatus();
|
||||||
}
|
}
|
||||||
@@ -281,7 +281,7 @@ void MyFrame::OnExecTest1(wxCommandEvent& WXUNUSED(evt))
|
|||||||
|
|
||||||
/* No 2 */
|
/* No 2 */
|
||||||
sock->SetEventHandler(*this, SKDEMO_SCK);
|
sock->SetEventHandler(*this, SKDEMO_SCK);
|
||||||
sock->SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
|
sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
|
||||||
sock->Notify(TRUE);
|
sock->Notify(TRUE);
|
||||||
|
|
||||||
text_win->WriteText("Test 1B: sending bytes to the server\n");
|
text_win->WriteText("Test 1B: sending bytes to the server\n");
|
||||||
|
@@ -111,7 +111,7 @@ void MyFrame::OnSockRequest(wxSocketEvent& evt)
|
|||||||
wxPrintf(_T("OnSockRequest OK\n"));
|
wxPrintf(_T("OnSockRequest OK\n"));
|
||||||
wxPrintf(_T("OnSockRequest (event = %d)\n"),evt.SocketEvent());
|
wxPrintf(_T("OnSockRequest (event = %d)\n"),evt.SocketEvent());
|
||||||
switch (evt.SocketEvent()) {
|
switch (evt.SocketEvent()) {
|
||||||
case GSOCK_INPUT:
|
case wxSOCKET_INPUT:
|
||||||
unsigned char c;
|
unsigned char c;
|
||||||
|
|
||||||
sock->Read((char *)&c, 1);
|
sock->Read((char *)&c, 1);
|
||||||
@@ -119,7 +119,7 @@ void MyFrame::OnSockRequest(wxSocketEvent& evt)
|
|||||||
ExecTest1(sock);
|
ExecTest1(sock);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case GSOCK_LOST:
|
case wxSOCKET_LOST:
|
||||||
wxPrintf(_T("Destroying socket\n"));
|
wxPrintf(_T("Destroying socket\n"));
|
||||||
wxPendingDelete.Append(sock);
|
wxPendingDelete.Append(sock);
|
||||||
UpdateStatus(-1);
|
UpdateStatus(-1);
|
||||||
@@ -155,7 +155,7 @@ void MyFrame::OnSockRequestServer(wxSocketEvent& evt)
|
|||||||
sock2->SetFlags(wxSocketBase::NONE);
|
sock2->SetFlags(wxSocketBase::NONE);
|
||||||
sock2->Notify(TRUE);
|
sock2->Notify(TRUE);
|
||||||
sock2->SetEventHandler(*this, SKDEMO_SOCKET);
|
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
|
// Init all
|
||||||
|
|
||||||
sock = new wxSocketServer(addr);
|
sock = new wxSocketServer(addr);
|
||||||
sock->SetNotify(GSOCK_CONNECTION_FLAG);
|
sock->SetNotify(wxSOCKET_CONNECTION_FLAG);
|
||||||
sock->SetEventHandler(*this, SKDEMO_SOCKET_SERV);
|
sock->SetEventHandler(*this, SKDEMO_SOCKET_SERV);
|
||||||
sock->SetFlags(wxSocketBase::SPEED);
|
sock->SetFlags(wxSocketBase::SPEED);
|
||||||
sock->Notify(TRUE);
|
sock->Notify(TRUE);
|
||||||
|
Reference in New Issue
Block a user