// --------------------------------------------------------------------------
// the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
# include "mondrian.xpm"
#endif
private:
wxSocketServer *m_server;
- wxPanel *m_panel;
wxTextCtrl *m_text;
wxMenu *m_menuFile;
wxMenuBar *m_menuBar;
IMPLEMENT_APP(MyApp)
-// To append sockets for delayed deletion [XXX: this should be removed]
-extern WXDLLEXPORT wxList wxPendingDelete;
-
-
// ==========================================================================
// implementation
// ==========================================================================
frame->Show(TRUE);
SetTopWindow(frame);
- // success
+ // Success
return TRUE;
}
// --------------------------------------------------------------------------
// frame constructor
+
MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
- _T("wxSocket demo: Server"),
+ _("wxSocket demo: Server"),
wxDefaultPosition, wxSize(300, 200))
{
// Give the frame an icon
// Make menus
m_menuFile = new wxMenu();
- m_menuFile->Append(SERVER_ABOUT, _T("&About...\tCtrl-A"), _T("Show about dialog"));
+ m_menuFile->Append(SERVER_ABOUT, _("&About...\tCtrl-A"), _("Show about dialog"));
m_menuFile->AppendSeparator();
- m_menuFile->Append(SERVER_QUIT, _T("E&xit\tAlt-X"), _T("Quit server"));
+ m_menuFile->Append(SERVER_QUIT, _("E&xit\tAlt-X"), _("Quit server"));
// Append menus to the menubar
m_menuBar = new wxMenuBar();
- m_menuBar->Append(m_menuFile, _T("&File"));
+ m_menuBar->Append(m_menuFile, _("&File"));
SetMenuBar(m_menuBar);
// Status bar
CreateStatusBar(2);
- // Make a panel with a textctrl in it
- m_panel = new wxPanel(this, -1);
- m_text = new wxTextCtrl(m_panel, -1,
- _T("Welcome to wxSocket demo: Server\n"),
- wxPoint(0, 0), m_panel->GetClientSize(),
+ // Make a textctrl for logging
+ m_text = new wxTextCtrl(this, -1,
+ _("Welcome to wxSocket demo: Server\n"),
+ wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxTE_READONLY);
- // Create the socket - defaults to localhost:0
+ // Create the address - defaults to localhost:0 initially
wxIPV4address addr;
addr.Service(3000);
+ // Create the socket
m_server = new wxSocketServer(addr);
- m_server->SetEventHandler(*this, SERVER_ID);
- m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);
- m_server->Notify(TRUE);
// We use Ok() here to see if the server is really listening
- if (m_server->Ok())
- m_text->AppendText(_T("Server listening.\n\n"));
+ if (! m_server->Ok())
+ {
+ m_text->AppendText(_("Could not listen at the specified port !\n\n"));
+ return;
+ }
else
- m_text->AppendText(_T("Could not listen at the specified port !\n\n"));
+ {
+ m_text->AppendText(_("Server listening.\n\n"));
+ }
+
+ // Setup the event handler and subscribe to connection events
+ m_server->SetEventHandler(*this, SERVER_ID);
+ m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);
+ m_server->Notify(TRUE);
m_busy = FALSE;
m_numClients = 0;
MyFrame::~MyFrame()
{
+ // No delayed deletion here, as the frame is dying anyway
delete m_server;
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
- wxMessageBox(_T("wxSocket demo: Server\n")
- _T("(c) 1999 Guillermo Rodriguez Garcia\n"),
- _T("About Server"),
+ wxMessageBox(_("wxSocket demo: Server\n"
+ "(c) 1999 Guillermo Rodriguez Garcia\n"),
+ _("About Server"),
wxOK | wxICON_INFORMATION, this);
}
unsigned char len;
char *buf;
- m_text->AppendText(_T("Test 1 begins\n"));
+ m_text->AppendText(_("Test 1 begins\n"));
// Receive data from socket and send it back. We will first
// get a byte with the buffer size, so we can specify the
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(_T("Test 1 ends\n"));
+ m_text->AppendText(_("Test 1 ends\n\n"));
}
void MyFrame::Test2(wxSocketBase *sock)
char *buf = new char[MAX_MSG_SIZE];
wxUint32 len;
- m_text->AppendText(_T("Test 2 begins\n"));
+ m_text->AppendText(_("Test 2 begins\n"));
// 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();
-
- s.Printf(_T("Client says: %s\n"), buf);
+ 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(_T("Test 2 ends\n"));
+ m_text->AppendText(_("Test 2 ends\n\n"));
#undef MAX_MSG_SIZE
}
unsigned char len;
char *buf;
- m_text->AppendText(_T("Test 3 begins\n"));
+ m_text->AppendText(_("Test 3 begins\n"));
// 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(_T("Test 3 ends\n"));
+ m_text->AppendText(_("Test 3 ends\n\n"));
}
void MyFrame::OnServerEvent(wxSocketEvent& event)
{
- wxString s = _T("OnServerEvent: ");
+ wxString s = _("OnServerEvent: ");
wxSocketBase *sock;
- switch(event.SocketEvent())
+ switch(event.GetSocketEvent())
{
- case wxSOCKET_CONNECTION : s.Append(_T("wxSOCKET_CONNECTION\n")); break;
- default : s.Append(_T("Unexpected event !\n")); break;
+ case wxSOCKET_CONNECTION : s.Append(_("wxSOCKET_CONNECTION\n")); break;
+ default : s.Append(_("Unexpected event !\n")); break;
}
m_text->AppendText(s);
if (sock)
{
- m_text->AppendText(_T("New client connection accepted\n"));
+ m_text->AppendText(_("New client connection accepted\n\n"));
}
else
{
- m_text->AppendText(_T("Error: couldn't accept a new connection"));
+ m_text->AppendText(_("Error: couldn't accept a new connection\n\n"));
+ sock->Destroy();
return;
}
void MyFrame::OnSocketEvent(wxSocketEvent& event)
{
- wxSocketBase *sock = event.Socket();
- wxString s = _T("OnSocketEvent: ");
+ 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(_T("wxSOCKET_INPUT\n")); break;
- case wxSOCKET_LOST: s.Append(_T("wxSOCKET_LOST\n")); break;
- default: s.Append(_T("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:
{
// 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(_T("Unknown test id received from client\n"));
+ default:
+ m_text->AppendText(_("Unknown test id received from client\n\n"));
}
// Enable input events again.
{
m_numClients--;
- // We cannot delete the socket right now because we can
- // be in the middle of a test or something. So we append
- // it to the list of objects to be deleted.
-
- m_text->AppendText(_T("Deleting socket.\n"));
- wxPendingDelete.Append(sock);
+ // Destroy() should be used instead of delete wherever possible,
+ // due to the fact that wxSocket uses 'delayed events' (see the
+ // documentation for wxPostEvent) and we don't want an event to
+ // arrive to the event handler (the frame, here) after the socket
+ // 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.
+
+ m_text->AppendText(_("Deleting socket.\n\n"));
+ sock->Destroy();
break;
}
default: ;
void MyFrame::UpdateStatusBar()
{
wxString s;
- s.Printf(_T("%d clients connected"), m_numClients);
+ s.Printf(_("%d clients connected"), m_numClients);
SetStatusText(s, 1);
}
projects / wxWidgets.git / blobdiff