Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp
index c74ef2866620fac2a720c81d86a3f2d172cb2e0d..ac856e80a269c0d18c85d191665f715550f9e744 100644 (file)
--- a/samples/sockets/baseserver.cpp
+++ b/samples/sockets/baseserver.cpp
@@ -6,7 +6,7 @@
 // Created:     27.06.2005
 // RCS-ID:      $Id$
 // Copyright:   (c) 2005 Lukasz Michalski <lmichalski@user.sourceforge.net>
 // Created:     27.06.2005
 // RCS-ID:      $Id$
 // Copyright:   (c) 2005 Lukasz Michalski <lmichalski@user.sourceforge.net>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -101,7 +101,7 @@ WX_DECLARE_LIST(EventWorker, EList);
 //and list of two type worker classes that serve clients
 class Server : public wxApp
 {
 //and list of two type worker classes that serve clients
 class Server : public wxApp
 {

-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()

 public:
     Server() : m_maxConnections(-1) {}
     ~Server() {}
 public:
     Server() : m_maxConnections(-1) {}
     ~Server() {}


@@ -198,7 +198,7 @@ private:
     void DoWrite();
     void DoRead();
 
     void DoWrite();
     void DoRead();
 

-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()

 };
 
 /******************* Implementation ******************/
 };
 
 /******************* Implementation ******************/


@@ -315,7 +315,7 @@ bool Server::OnInit()
     m_listeningSocket->SetEventHandler(*this);
     m_listeningSocket->SetNotify(wxSOCKET_CONNECTION_FLAG);
     m_listeningSocket->Notify(true);
     m_listeningSocket->SetEventHandler(*this);
     m_listeningSocket->SetNotify(wxSOCKET_CONNECTION_FLAG);
     m_listeningSocket->Notify(true);

-    if (!m_listeningSocket->Ok())
+    if (!m_listeningSocket->IsOk())

     {
         wxLogError("Cannot bind listening socket");
         return false;
     {
         wxLogError("Cannot bind listening socket");
         return false;


@@ -650,8 +650,7 @@ EventWorker::DoRead()
         if (m_size == m_infill)
         {
             m_signature[0] = m_signature[1] = 0x0;
         if (m_size == m_infill)
         {
             m_signature[0] = m_signature[1] = 0x0;

-            delete [] m_inbuf;
-            m_inbuf = NULL;
+            wxDELETEA(m_inbuf);

             m_infill = 0;
             return;
         }
             m_infill = 0;
             return;
         }


@@ -688,17 +687,17 @@ void EventWorker::OnSocketEvent(wxSocketEvent& pEvent)
             break;
 
         case wxSOCKET_OUTPUT:
             break;
 
         case wxSOCKET_OUTPUT:

-            if (m_inbuf != NULL)
+            if ( m_outbuf )

                 DoWrite();
             break;
 
         case wxSOCKET_CONNECTION:
                 DoWrite();
             break;
 
         case wxSOCKET_CONNECTION:

-            LogWorker(wxString::Format("Unexpected wxSOCKET_CONNECTION in EventWorker"),wxLOG_Error);
+            LogWorker("Unexpected wxSOCKET_CONNECTION in EventWorker", wxLOG_Error);

             break;
 
         case wxSOCKET_LOST:
             {
             break;
 
         case wxSOCKET_LOST:
             {

-                LogWorker(wxString::Format("Connection lost"));
+                LogWorker("Connection lost");

                 WorkerEvent e(this);
                 e.m_workerFailed = m_written != m_size;
                 wxGetApp().AddPendingEvent(e);
                 WorkerEvent e(this);
                 e.m_workerFailed = m_written != m_size;
                 wxGetApp().AddPendingEvent(e);


@@ -713,8 +712,7 @@ void  EventWorker::DoWrite()
     {
         if (m_written == m_size)
         {
     {
         if (m_written == m_size)
         {

-            delete [] m_outbuf;
-            m_outbuf = NULL;
+            wxDELETEA(m_outbuf);

             m_outfill = 0;
             LogWorker( "All data written");
             return;
             m_outfill = 0;
             LogWorker( "All data written");
             return;