added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

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

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index d418cd59557d9d8146c8d50efc2647c2c4f04a27..d99ef0205d6da49cb5df06d33abdca076a6f855c 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -43,7 +43,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

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

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


@@ -90,7 +90,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;


@@ -209,16 +208,16 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
   // Status bar
   CreateStatusBar(2);
 
   // 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,
-                           _("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();
                            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 |
   m_sock->SetEventHandler(*this, SOCKET_ID);
   m_sock->SetNotify(wxSOCKET_CONNECTION_FLAG |
                     wxSOCKET_INPUT_FLAG |


@@ -231,6 +230,7 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
 
 MyFrame::~MyFrame()
 {
 
 MyFrame::~MyFrame()
 {

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

   delete m_sock;
 }
 
   delete m_sock;
 }
 


@@ -244,8 +244,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 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);
 }


@@ -286,23 +285,32 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
   //
   // WaitOnConnect() itself never blocks the GUI (this might change
   // in the future to honour the wxSOCKET_BLOCK flag). This call will
   //
   // 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);
-  //   bool 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 :-)
 
   // 
   // And that's all :-)
 


@@ -324,8 +332,8 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
 
 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)


@@ -335,7 +343,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
   m_text->AppendText(_("\n=== Test 1 begins ===\n"));
 
   // Tell the server which test we are running
   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


@@ -353,11 +361,11 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
   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  = (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"));
 


@@ -385,8 +393,8 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
 {
 
 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)


@@ -396,7 +404,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
   m_text->AppendText(_("\n=== Test 2 begins ===\n"));
 
   // Tell the server which test we are running
   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


@@ -413,9 +421,9 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
     _("Test 2 ..."),
     _("Yes I like wxWindows!"));
 
     _("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(_("Sending the string with WriteMsg ..."));
   m_sock->WriteMsg(msg1, len);


@@ -465,7 +473,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
   m_text->AppendText(_("\n=== Test 3 begins ===\n"));
 
   // Tell the server which test we are running
   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
   m_sock->Write(&c, 1);
 
   // This test also is similar to the first one but it sends a


@@ -484,7 +492,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"));
 


@@ -518,9 +526,9 @@ void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event))
 {

-  m_text->AppendText(_("=== Datagram test begins ==="));
-  m_text->AppendText(_("Sorry, not implemented"));
-  m_text->AppendText(_("=== Datagram test ends ==="));
+  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))
 }
 
 void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))


@@ -532,7 +540,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);


@@ -556,9 +564,7 @@ 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);
              url.GetProtocol().GetContentType().c_str(),
              data->GetSize());
   m_text->AppendText(s);


@@ -585,7 +591,7 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
   wxString s = _("OnSocketEvent: ");
 
 {
   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;