use Windows standard icons instead of our own (patch 443856)

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

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index a33c01c74a4c8189dcf9393e8ee819c020bb9f4b..ec02f7eada976c34a76c9472dc5c4a6caf71ed33 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -43,7 +43,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #  include "mondrian.xpm"
 #endif
 
@@ -300,19 +300,19 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event))
   //
   // For blocking Connect:
   //
-  //   bool success = Connect(addr, TRUE);
+  //   bool success = client->Connect(addr, TRUE);
   //
   // For nonblocking Connect:
   //
-  //   Connect(addr, FALSE);
+  //   client->Connect(addr, FALSE);
   //
-  //   bool waitmore;
-  //   while (!WaitOnConnect(seconds, millis) && waitmore)
+  //   bool waitmore = TRUE;
+  //   while (! client->WaitOnConnect(seconds, millis) && waitmore )
   //   {
   //     // possibly give some feedback to the user,
   //     // update waitmore if needed.
   //   }
-  //   bool success = IsConnected();
+  //   bool success = client->IsConnected();
   // 
   // And that's all :-)
 
@@ -345,7 +345,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
   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
@@ -367,7 +367,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
   buf2 = new char[len];
 
   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"));
 
@@ -406,7 +406,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event))
   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
@@ -475,7 +475,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
   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
@@ -494,7 +494,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event))
     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"));
 
@@ -528,7 +528,7 @@ void MyFrame::OnCloseConnection(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event))
 {
-  m_text->AppendText(_("=== Datagram test begins ===\n"));
+  m_text->AppendText(_("\n=== Datagram test begins ===\n"));
   m_text->AppendText(_("Sorry, not implemented\n"));
   m_text->AppendText(_("=== Datagram test ends ===\n"));
 }
@@ -542,7 +542,7 @@ 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);
@@ -595,7 +595,7 @@ 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;