X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f99a08fc094301ba6a62c755fb5b10f91e4bf18..6a87168b300a58635fdebf8c8af2f4160ea90a95:/samples/sockets/server.cpp?ds=inline

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index aef4d493d1..ac8a2dd3f0 100644
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -17,7 +17,7 @@
 // headers
 // --------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #  pragma implementation "server.cpp"
 #  pragma interface "server.cpp"
 #endif
@@ -29,7 +29,7 @@
 #  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
@@ -41,7 +41,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #  include "mondrian.xpm"
 #endif
 
@@ -216,8 +216,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-  wxMessageBox(_("wxSocket demo: Server\n" 
-                 "(c) 1999 Guillermo Rodriguez Garcia\n"),
+  wxMessageBox(_("wxSocket demo: Server\n(c) 1999 Guillermo Rodriguez Garcia\n"),
                _("About Server"),
                wxOK | wxICON_INFORMATION, this);
 }
@@ -257,7 +256,7 @@ void MyFrame::Test2(wxSocketBase *sock)
 #define MAX_MSG_SIZE 10000
 
   wxString s;
-  char *buf = new char[MAX_MSG_SIZE];
+  wxChar *buf = new wxChar[MAX_MSG_SIZE];
   wxUint32 len;
 
   m_text->AppendText(_("Test 2 begins\n"));
@@ -266,7 +265,7 @@ void MyFrame::Test2(wxSocketBase *sock)
   // are not affected by them anyway.
 
   // Read the message
-  len = sock->ReadMsg(buf, MAX_MSG_SIZE).LastCount();
+  len = sock->ReadMsg(buf, MAX_MSG_SIZE * sizeof(wxChar)).LastCount();
   s.Printf(_("Client says: %s\n"), buf);
   m_text->AppendText(s);
   m_text->AppendText(_("Sending the data back\n"));
@@ -287,7 +286,7 @@ void MyFrame::Test3(wxSocketBase *sock)
 
   m_text->AppendText(_("Test 3 begins\n"));
 
-  // This test is similar to the first one, but the len is   
+  // This test is similar to the first one, but the len is
   // expressed in kbytes - this tests large data transfers.
 
   sock->SetFlags(wxSOCKET_WAITALL);
@@ -334,7 +333,6 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
   else
   {
     m_text->AppendText(_("Error: couldn't accept a new connection\n\n"));
-    sock->Destroy();
     return;
   }