// headers
// --------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
# pragma implementation "client.cpp"
# pragma interface "client.cpp"
#endif
// --------------------------------------------------------------------------
// the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
# include "mondrian.xpm"
#endif
// event handlers for Protocols menu
void OnTestURL(wxCommandEvent& event);
- // event handlers for DatagramSocket menu
+ // event handlers for DatagramSocket menu (stub)
void OnDatagram(wxCommandEvent& event);
// socket event handler
private:
wxSocketClient *m_sock;
- wxPanel *m_panel;
wxTextCtrl *m_text;
wxMenu *m_menuFile;
wxMenu *m_menuSocket;
// Status bar
CreateStatusBar(2);
- // Make a panel with a textctrl in it
- m_panel = new wxPanel(this, -1, wxPoint(0, 0), GetClientSize());
- m_text = new wxTextCtrl(m_panel, -1,
- _("Welcome to wxSocket demo: Client\n"
- "Client ready\n"),
- wxPoint(0, 0), m_panel->GetClientSize(),
+ // Make a textctrl for logging
+ m_text = new wxTextCtrl(this, -1,
+ _("Welcome to wxSocket demo: Client\nClient ready\n"),
+ wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxTE_READONLY);
// Create the socket
m_sock = new wxSocketClient();
+
+ // Setup the event handler and subscribe to most events
m_sock->SetEventHandler(*this, SOCKET_ID);
m_sock->SetNotify(wxSOCKET_CONNECTION_FLAG |
wxSOCKET_INPUT_FLAG |
MyFrame::~MyFrame()
{
+ // No delayed deletion here, as the frame is dying anyway
delete m_sock;
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
- wxMessageBox(_("wxSocket demo: Client\n"
- "(c) 1999 Guillermo Rodriguez Garcia\n"),
+ wxMessageBox(_("wxSocket demo: Client\n(c) 1999 Guillermo Rodriguez Garcia\n"),
_("About Client"),
wxOK | wxICON_INFORMATION, this);
}
//
// WaitOnConnect() itself never blocks the GUI (this might change
// in the future to honour the wxSOCKET_BLOCK flag). This call will
- // return TRUE if the connection request completed succesfully, or
- // FALSE otherwise, which in turn might mean:
- // a) that the specified timeout ellapsed, or
- // b) that the connection request failed.
+ // return FALSE on timeout, or TRUE if the connection request
+ // completes, which in turn might mean:
+ //
+ // a) That the connection was successfully established
+ // b) That the connection request failed (for example, because
+ // it was refused by the peer.
+ //
// Use IsConnected() to distinguish between these two.
//
// So, in a brief, you should do one of the following things:
//
// For blocking Connect:
//
- // bool success = Connect(addr, TRUE);
+ // bool success = client->Connect(addr, TRUE);
//
// For nonblocking Connect:
//
- // Connect(addr, FALSE);
- // WaitOnConnect(seconds, millis);
- // success = IsConnected();
+ // client->Connect(addr, FALSE);
+ //
+ // bool waitmore = TRUE;
+ // while (! client->WaitOnConnect(seconds, millis) && waitmore )
+ // {
+ // // possibly give some feedback to the user,
+ // // update waitmore if needed.
+ // }
+ // bool success = client->IsConnected();
//
// And that's all :-)
- //
+
m_text->AppendText(_("\nTrying to connect (timeout = 10 sec) ...\n"));
m_sock->Connect(addr, FALSE);
m_sock->WaitOnConnect(10);
void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
{
- const char *buf1;
- char *buf2;
+ const wxChar *buf1;
+ wxChar *buf2;
unsigned char len;
// Disable socket menu entries (exception: Close Session)
m_text->AppendText(_("\n=== Test 1 begins ===\n"));
// Tell the server which test we are running
- char c = 0xBE;
+ unsigned char c = 0xBE;
m_sock->Write(&c, 1);
// Send some data and read it back. We know the size of the
// value larger than a byte "as is" across the network, or
// you might be in trouble! Ever heard about big and little
// endian computers?)
- //
+
m_sock->SetFlags(wxSOCKET_WAITALL);
buf1 = _("Test string (less than 256 chars!)");
- len = wxStrlen(buf1) + 1;
- buf2 = new char[len];
+ len = (wxStrlen(buf1) + 1) * sizeof(wxChar);
+ buf2 = new wxChar[wxStrlen(buf1) + 1];
m_text->AppendText(_("Sending a test buffer to the server ..."));
- m_sock->Write((char *)&len, 1);
+ m_sock->Write(&len, 1);
m_sock->Write(buf1, len);
m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n"));
void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
{
- char *msg1;
- char *msg2;
+ const wxChar *msg1;
+ wxChar *msg2;
size_t len;
// Disable socket menu entries (exception: Close Session)
m_text->AppendText(_("\n=== Test 2 begins ===\n"));
// Tell the server which test we are running
- char c = 0xCE;
+ unsigned char c = 0xCE;
m_sock->Write(&c, 1);
// Here we use ReadMsg and WriteMsg to send messages with
//
// We need to set no flags here (ReadMsg and WriteMsg are
// not affected by flags)
- //
+
m_sock->SetFlags(wxSOCKET_WAITALL);
wxString s = wxGetTextFromUser(
_("Test 2 ..."),
_("Yes I like wxWindows!"));
- msg1 = (char *)s.c_str();
- len = wxStrlen(msg1) + 1;
- msg2 = new char[len];
+ msg1 = s.c_str();
+ len = (wxStrlen(msg1) + 1) * sizeof(wxChar);
+ msg2 = new wxChar[wxStrlen(msg1) + 1];
m_text->AppendText(_("Sending the string with WriteMsg ..."));
m_sock->WriteMsg(msg1, len);
m_text->AppendText(_("\n=== Test 3 begins ===\n"));
// Tell the server which test we are running
- char c = 0xDE;
+ unsigned char c = 0xDE;
m_sock->Write(&c, 1);
// This test also is similar to the first one but it sends a
// large buffer so that wxSocket is actually forced to split
// it into pieces and take care of sending everything before
// returning.
- //
+
m_sock->SetFlags(wxSOCKET_WAITALL);
// Note that len is in kbytes here!
buf1[i] = (char)(i % 256);
m_text->AppendText(_("Sending a large buffer (32K) to the server ..."));
- m_sock->Write((char *)&len, 1);
+ m_sock->Write(&len, 1);
m_sock->Write(buf1, len * 1024);
m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n"));
void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event))
{
+ m_text->AppendText(_("\n=== Datagram test begins ===\n"));
+ m_text->AppendText(_("Sorry, not implemented\n"));
+ m_text->AppendText(_("=== Datagram test ends ===\n"));
}
void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
m_text->AppendText(_("\n=== URL test begins ===\n"));
wxString urlname = wxGetTextFromUser(_("Enter an URL to get"),
_("URL:"),
- _("http://localhost"));
+ _T("http://localhost"));
// Parse the URL
wxURL url(urlname);
// Print the contents type and file size
wxString s;
- s.Printf(_("Contents type: %s\n"
- "File size: %i\n"
- "Starting to download...\n"),
+ s.Printf(_("Contents type: %s\nFile size: %i\nStarting to download...\n"),
url.GetProtocol().GetContentType().c_str(),
data->GetSize());
m_text->AppendText(s);
wxYield();
// Get the data
- wxFileOutputStream sout(wxString("test.url"));
+ wxFileOutputStream sout( wxT("test.url") );
if (!sout.Ok())
{
m_text->AppendText(_("Error: couldn't open file for output\n"));
{
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;
projects / wxWidgets.git / blobdiff