Correct 'markup' for GetResourceHandle after recent change in wx/gdiobj.h.

[wxWidgets.git] / samples / sockets / client.cpp

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index ab5d91ed38d18b80d527dae01ceae1eecf00a9c4..eebb8a06d718fc015db2ac37768f72de720e8585 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -17,11 +17,6 @@
 // headers
 // --------------------------------------------------------------------------
 
 // headers
 // --------------------------------------------------------------------------
 

-#ifdef __GNUG__
-#  pragma implementation "client.cpp"
-#  pragma interface "client.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -29,7 +24,7 @@
 #  pragma hdrstop
 #endif
 
 #  pragma hdrstop
 #endif
 

-// for all others, include the necessary headers 
+// for all others, include the necessary headers

 #ifndef WX_PRECOMP
 #  include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #  include "wx/wx.h"
 #endif


@@ -43,7 +38,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

 #  include "mondrian.xpm"
 #endif
 
 #  include "mondrian.xpm"
 #endif
 


@@ -76,10 +71,12 @@ public:
   void OnTest3(wxCommandEvent& event);
   void OnCloseConnection(wxCommandEvent& event);
 
   void OnTest3(wxCommandEvent& event);
   void OnCloseConnection(wxCommandEvent& event);
 

+#if wxUSE_URL

   // event handlers for Protocols menu
   void OnTestURL(wxCommandEvent& event);
   // event handlers for Protocols menu
   void OnTestURL(wxCommandEvent& event);

+#endif

 
 

-  // event handlers for DatagramSocket menu
+  // event handlers for DatagramSocket menu (stub)

   void OnDatagram(wxCommandEvent& event);
 
   // socket event handler
   void OnDatagram(wxCommandEvent& event);
 
   // socket event handler


@@ -90,7 +87,6 @@ public:
 
 private:
   wxSocketClient *m_sock;
 
 private:
   wxSocketClient *m_sock;

-  wxPanel        *m_panel;

   wxTextCtrl     *m_text;
   wxMenu         *m_menuFile;
   wxMenu         *m_menuSocket;
   wxTextCtrl     *m_text;
   wxMenu         *m_menuFile;
   wxMenu         *m_menuSocket;


@@ -99,7 +95,7 @@ private:
   wxMenuBar      *m_menuBar;
   bool            m_busy;
 
   wxMenuBar      *m_menuBar;
   bool            m_busy;
 

-  // any class wishing to process wxWindows events must use this macro
+  // any class wishing to process wxWidgets events must use this macro

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 


@@ -111,14 +107,16 @@ private:
 enum
 {
   // menu items
 enum
 {
   // menu items

-  CLIENT_QUIT = 1000,
-  CLIENT_ABOUT,
-  CLIENT_OPEN,
+  CLIENT_QUIT = wxID_EXIT,
+  CLIENT_ABOUT = wxID_ABOUT,
+  CLIENT_OPEN = 100,

   CLIENT_TEST1,
   CLIENT_TEST2,
   CLIENT_TEST3,
   CLIENT_CLOSE,
   CLIENT_TEST1,
   CLIENT_TEST2,
   CLIENT_TEST3,
   CLIENT_CLOSE,

+#if wxUSE_URL

   CLIENT_TESTURL,
   CLIENT_TESTURL,

+#endif

   CLIENT_DGRAM,
 
   // id for socket
   CLIENT_DGRAM,
 
   // id for socket


@@ -126,7 +124,7 @@ enum
 };
 
 // --------------------------------------------------------------------------
 };
 
 // --------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // --------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // --------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -138,7 +136,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(CLIENT_TEST3,    MyFrame::OnTest3)
   EVT_MENU(CLIENT_CLOSE,    MyFrame::OnCloseConnection)
   EVT_MENU(CLIENT_DGRAM,    MyFrame::OnDatagram)
   EVT_MENU(CLIENT_TEST3,    MyFrame::OnTest3)
   EVT_MENU(CLIENT_CLOSE,    MyFrame::OnCloseConnection)
   EVT_MENU(CLIENT_DGRAM,    MyFrame::OnDatagram)

+#if wxUSE_URL

   EVT_MENU(CLIENT_TESTURL,  MyFrame::OnTestURL)
   EVT_MENU(CLIENT_TESTURL,  MyFrame::OnTestURL)

+#endif

   EVT_SOCKET(SOCKET_ID,     MyFrame::OnSocketEvent)
 END_EVENT_TABLE()
 
   EVT_SOCKET(SOCKET_ID,     MyFrame::OnSocketEvent)
 END_EVENT_TABLE()
 


@@ -158,11 +158,11 @@ bool MyApp::OnInit()
   MyFrame *frame = new MyFrame();
 
   // Show it and tell the application that it's our main window
   MyFrame *frame = new MyFrame();
 
   // Show it and tell the application that it's our main window

-  frame->Show(TRUE);
+  frame->Show(true);

   SetTopWindow(frame);
 
   // success
   SetTopWindow(frame);
 
   // success

-  return TRUE;
+  return true;

 }
 
 // --------------------------------------------------------------------------
 }
 
 // --------------------------------------------------------------------------


@@ -170,7 +170,7 @@ bool MyApp::OnInit()
 // --------------------------------------------------------------------------
 
 // frame constructor
 // --------------------------------------------------------------------------
 
 // frame constructor

-MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
+MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,

                              _("wxSocket demo: Client"),
                              wxDefaultPosition, wxSize(300, 200))
 {
                              _("wxSocket demo: Client"),
                              wxDefaultPosition, wxSize(300, 200))
 {


@@ -195,42 +195,49 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
   m_menuDatagramSocket = new wxMenu();
   m_menuDatagramSocket->Append(CLIENT_DGRAM, _("Send Datagram"), _("Test UDP sockets"));
 
   m_menuDatagramSocket = new wxMenu();
   m_menuDatagramSocket->Append(CLIENT_DGRAM, _("Send Datagram"), _("Test UDP sockets"));
 

+#if wxUSE_URL

   m_menuProtocols = new wxMenu();
   m_menuProtocols->Append(CLIENT_TESTURL, _("Test URL"), _("Get data from the specified URL"));
   m_menuProtocols = new wxMenu();
   m_menuProtocols->Append(CLIENT_TESTURL, _("Test URL"), _("Get data from the specified URL"));

+#endif

 
   // Append menus to the menubar
   m_menuBar = new wxMenuBar();
   m_menuBar->Append(m_menuFile, _("&File"));
   m_menuBar->Append(m_menuSocket, _("&SocketClient"));
   m_menuBar->Append(m_menuDatagramSocket, _("&DatagramSocket"));
 
   // Append menus to the menubar
   m_menuBar = new wxMenuBar();
   m_menuBar->Append(m_menuFile, _("&File"));
   m_menuBar->Append(m_menuSocket, _("&SocketClient"));
   m_menuBar->Append(m_menuDatagramSocket, _("&DatagramSocket"));

+#if wxUSE_URL

   m_menuBar->Append(m_menuProtocols, _("&Protocols"));
   m_menuBar->Append(m_menuProtocols, _("&Protocols"));

+#endif

   SetMenuBar(m_menuBar);
 
   SetMenuBar(m_menuBar);
 

+#if wxUSE_STATUSBAR

   // Status bar
   CreateStatusBar(2);
   // Status bar
   CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
 

-  // 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, wxID_ANY,
+                           _("Welcome to wxSocket demo: Client\nClient ready\n"),
+                           wxDefaultPosition, wxDefaultSize,

                            wxTE_MULTILINE | wxTE_READONLY);
 
   // Create the socket
   m_sock = new wxSocketClient();
                            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 |
                     wxSOCKET_LOST_FLAG);
   m_sock->SetEventHandler(*this, SOCKET_ID);
   m_sock->SetNotify(wxSOCKET_CONNECTION_FLAG |
                     wxSOCKET_INPUT_FLAG |
                     wxSOCKET_LOST_FLAG);

-  m_sock->Notify(TRUE);
+  m_sock->Notify(true);

 
 

-  m_busy = FALSE;
+  m_busy = false;

   UpdateStatusBar();
 }
 
 MyFrame::~MyFrame()
 {
   UpdateStatusBar();
 }
 
 MyFrame::~MyFrame()
 {

+  // No delayed deletion here, as the frame is dying anyway

   delete m_sock;
 }
 
   delete m_sock;
 }
 


@@ -238,14 +245,13 @@ MyFrame::~MyFrame()
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-  // TRUE is to force the frame to close
-  Close(TRUE);
+  // true is to force the frame to close
+  Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 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);
 }
                _("About Client"),
                wxOK | wxICON_INFORMATION, this);
 }


@@ -254,8 +260,8 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
 {
   wxIPV4address addr;
 
 {
   wxIPV4address addr;
 

-  m_menuSocket->Enable(CLIENT_OPEN, FALSE);
-  m_menuSocket->Enable(CLIENT_CLOSE, FALSE);
+  m_menuSocket->Enable(CLIENT_OPEN, false);
+  m_menuSocket->Enable(CLIENT_CLOSE, false);

 
   // Ask user for server address
   wxString hostname = wxGetTextFromUser(
 
   // Ask user for server address
   wxString hostname = wxGetTextFromUser(


@@ -272,42 +278,51 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
   // There are two ways to use Connect(): blocking and non-blocking,
   // depending on the value passed as the 'wait' (2nd) parameter.
   //
   // There are two ways to use Connect(): blocking and non-blocking,
   // depending on the value passed as the 'wait' (2nd) parameter.
   //

-  // Connect(addr, TRUE) will wait until the connection completes,
-  // returning TRUE on success and FALSE on failure. This call blocks
+  // Connect(addr, true) will wait until the connection completes,
+  // returning true on success and false on failure. This call blocks

   // the GUI (this might be changed in future releases to honour the
   // wxSOCKET_BLOCK flag).
   //
   // the GUI (this might be changed in future releases to honour the
   // wxSOCKET_BLOCK flag).
   //

-  // Connect(addr, FALSE) will issue a nonblocking connection request
-  // and return immediately. If the return value is TRUE, then the
-  // connection has been already succesfully established. If it is
-  // FALSE, you must wait for the request to complete, either with
+  // Connect(addr, false) will issue a nonblocking connection request
+  // and return immediately. If the return value is true, then the
+  // connection has been already successfully established. If it is
+  // false, you must wait for the request to complete, either with

   // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST
   // events (please read the documentation).
   //
   // WaitOnConnect() itself never blocks the GUI (this might change
   // in the future to honour the wxSOCKET_BLOCK flag). This call will
   // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST
   // events (please read the documentation).
   //
   // 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:
   //
   // 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:
   //
   //
   // For nonblocking Connect:
   //

-  //   Connect(addr, FALSE);
-  //   WaitOnConnect(seconds, millis);
-  //   success = IsConnected();
-  // 
-  // And that's all :-)
+  //   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_text->AppendText(_("\nTrying to connect (timeout = 10 sec) ...\n"));

-  m_sock->Connect(addr, FALSE);
+  m_sock->Connect(addr, false);

   m_sock->WaitOnConnect(10);
 
   if (m_sock->IsConnected())
   m_sock->WaitOnConnect(10);
 
   if (m_sock->IsConnected())


@@ -318,24 +333,24 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
     m_text->AppendText(_("Failed ! Unable to connect\n"));
     wxMessageBox(_("Can't connect to the specified host"), _("Alert !"));
   }
     m_text->AppendText(_("Failed ! Unable to connect\n"));
     wxMessageBox(_("Can't connect to the specified host"), _("Alert !"));
   }

-  
+

   UpdateStatusBar();
 }
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
   UpdateStatusBar();
 }
 
 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)
   unsigned char len;
 
   // Disable socket menu entries (exception: Close Session)

-  m_busy = TRUE;
+  m_busy = true;

   UpdateStatusBar();
 
   m_text->AppendText(_("\n=== Test 1 begins ===\n"));
 
   // Tell the server which test we are running
   UpdateStatusBar();
 
   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
   m_sock->Write(&c, 1);
 
   // Send some data and read it back. We know the size of the


@@ -349,15 +364,15 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
   // value larger than a byte "as is" across the network, or
   // you might be in trouble! Ever heard about big and little
   // endian computers?)
   // 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!)");
   m_sock->SetFlags(wxSOCKET_WAITALL);
 
   buf1 = _("Test string (less than 256 chars!)");

-  len  = wxStrlen(buf1) + 1;
-  buf2 = new char[len];
+  len  = (unsigned char)((wxStrlen(buf1) + 1) * sizeof(wxChar));
+  buf2 = new wxChar[wxStrlen(buf1) + 1];

 
   m_text->AppendText(_("Sending a test buffer to the server ..."));
 
   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"));
 
   m_sock->Write(buf1, len);
   m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n"));
 


@@ -379,24 +394,24 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
   m_text->AppendText(_("=== Test 1 ends ===\n"));
 
   delete[] buf2;
   m_text->AppendText(_("=== Test 1 ends ===\n"));
 
   delete[] buf2;

-  m_busy = FALSE;
+  m_busy = false;

   UpdateStatusBar();
 }
 
 void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
 {
   UpdateStatusBar();
 }
 
 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)
   size_t len;
 
   // Disable socket menu entries (exception: Close Session)

-  m_busy = TRUE;
+  m_busy = true;

   UpdateStatusBar();
 
   m_text->AppendText(_("\n=== Test 2 begins ===\n"));
 
   // Tell the server which test we are running
   UpdateStatusBar();
 
   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
   m_sock->Write(&c, 1);
 
   // Here we use ReadMsg and WriteMsg to send messages with


@@ -405,17 +420,17 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
   //
   // We need to set no flags here (ReadMsg and WriteMsg are
   // not affected by flags)
   //
   // We need to set no flags here (ReadMsg and WriteMsg are
   // not affected by flags)

-  //
+

   m_sock->SetFlags(wxSOCKET_WAITALL);
 
   wxString s = wxGetTextFromUser(
     _("Enter an arbitrary string to send to the server:"),
     _("Test 2 ..."),
   m_sock->SetFlags(wxSOCKET_WAITALL);
 
   wxString s = wxGetTextFromUser(
     _("Enter an arbitrary string to send to the server:"),
     _("Test 2 ..."),

-    _("Yes I like wxWindows!"));
+    _("Yes I like wxWidgets!"));

 
 

-  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(_("Sending the string with WriteMsg ..."));
   m_sock->WriteMsg(msg1, len);


@@ -433,7 +448,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
     m_text->AppendText(_("Comparing the two buffers ..."));
     if (memcmp(msg1, msg2, len) != 0)
     {
     m_text->AppendText(_("Comparing the two buffers ..."));
     if (memcmp(msg1, msg2, len) != 0)
     {

-      m_text->AppendText(_("failed!\n"));  
+      m_text->AppendText(_("failed!\n"));

       m_text->AppendText(_("Test 2 failed !\n"));
     }
     else
       m_text->AppendText(_("Test 2 failed !\n"));
     }
     else


@@ -448,7 +463,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
   m_text->AppendText(_("=== Test 2 ends ===\n"));
 
   delete[] msg2;
   m_text->AppendText(_("=== Test 2 ends ===\n"));
 
   delete[] msg2;

-  m_busy = FALSE;
+  m_busy = false;

   UpdateStatusBar();
 }
 
   UpdateStatusBar();
 }
 


@@ -459,20 +474,20 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
   unsigned char len;
 
   // Disable socket menu entries (exception: Close Session)
   unsigned char len;
 
   // Disable socket menu entries (exception: Close Session)

-  m_busy = TRUE;
+  m_busy = true;

   UpdateStatusBar();
 
   m_text->AppendText(_("\n=== Test 3 begins ===\n"));
 
   // Tell the server which test we are running
   UpdateStatusBar();
 
   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->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!
   m_sock->SetFlags(wxSOCKET_WAITALL);
 
   // Note that len is in kbytes here!


@@ -484,7 +499,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
     buf1[i] = (char)(i % 256);
 
   m_text->AppendText(_("Sending a large buffer (32K) to the server ..."));
     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"));
 
   m_sock->Write(buf1, len * 1024);
   m_text->AppendText(m_sock->Error() ? _("failed !\n") : _("done\n"));
 


@@ -506,7 +521,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
   m_text->AppendText(_("=== Test 3 ends ===\n"));
 
   delete[] buf2;
   m_text->AppendText(_("=== Test 3 ends ===\n"));
 
   delete[] buf2;

-  m_busy = FALSE;
+  m_busy = false;

   UpdateStatusBar();
 }
 
   UpdateStatusBar();
 }
 


@@ -518,8 +533,13 @@ void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event))
 {
 
 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"));

 }
 
 }
 

+#if wxUSE_URL
+

 void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
 {
   // Note that we are creating a new socket here, so this
 void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
 {
   // Note that we are creating a new socket here, so this


@@ -529,7 +549,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
   m_text->AppendText(_("\n=== URL test begins ===\n"));
   wxString urlname = wxGetTextFromUser(_("Enter an URL to get"),
                                        _("URL:"),
   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);
 
   // Parse the URL
   wxURL url(urlname);


@@ -553,16 +573,15 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
 
   // Print the contents type and file size
   wxString s;
 
   // 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
              url.GetProtocol().GetContentType().c_str(),
              data->GetSize());
   m_text->AppendText(s);
   wxYield();
 
   // Get the data

-  wxFileOutputStream sout(wxString("test.url"));
+  wxFile fileTest(wxT("test.url"), wxFile::write);
+  wxFileOutputStream sout(fileTest);

   if (!sout.Ok())
   {
     m_text->AppendText(_("Error: couldn't open file for output\n"));
   if (!sout.Ok())
   {
     m_text->AppendText(_("Error: couldn't open file for output\n"));


@@ -578,11 +597,13 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
   delete data;
 }
 
   delete data;
 }
 

+#endif
+

 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
   wxString s = _("OnSocketEvent: ");
 
 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
   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;
   {
     case wxSOCKET_INPUT      : s.Append(_("wxSOCKET_INPUT\n")); break;
     case wxSOCKET_LOST       : s.Append(_("wxSOCKET_LOST\n")); break;


@@ -612,7 +633,9 @@ void MyFrame::UpdateStatusBar()
     s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service());
   }
 
     s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service());
   }
 

+#if wxUSE_STATUSBAR

   SetStatusText(s, 1);
   SetStatusText(s, 1);

+#endif // wxUSE_STATUSBAR

 
   m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);
 
   m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy);
   m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);