removed obsolete docs

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index ffa094fcb53e78873a927e06080e48f45dccf0b2..003bd9dbcfb3afccda8e45f3cf037ae82951ccc5 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -9,6 +9,10 @@
 // License:    see wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // License:    see wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ==========================================================================
+// Declarations
+// ==========================================================================
+

 #ifdef __GNUG__
 #pragma implementation "socket.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "socket.h"
 #endif


@@ -22,10 +26,6 @@
 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 

-// ==========================================================================
-// Headers and constants
-// ==========================================================================
-

 #include "wx/app.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/app.h"
 #include "wx/defs.h"
 #include "wx/object.h"


@@ -44,23 +44,40 @@
 #include "wx/sckaddr.h"
 #include "wx/socket.h"
 
 #include "wx/sckaddr.h"
 #include "wx/socket.h"
 

+// --------------------------------------------------------------------------
+// macros and constants
+// --------------------------------------------------------------------------

 
 // discard buffer
 #define MAX_DISCARD_SIZE (10 * 1024)
 
 
 // discard buffer
 #define MAX_DISCARD_SIZE (10 * 1024)
 

-// what to do within waits
+// what to do within waits: in wxBase we don't do anything as we don't have
+// the event loop anyhow (for now). In GUI apps we have 2 cases: from the main
+// thread itself we have to call wxYield() to let the events (including the
+// GUI events and the low-level (not wxWindows) events from GSocket) be
+// processed. From another thread it is enough to just call wxThread::Yield()
+// which will give away the rest of our time slice: the explanation is that
+// the events will be processed by the main thread anyhow, without calling
+// wxYield(), but we don't want to eat the CPU time uselessly while sitting
+// in the loop waiting for the data

 #if wxUSE_GUI
 #if wxUSE_GUI

-  #define PROCESS_EVENTS() wxYield()
-#else
-  #define PROCESS_EVENTS()
-#endif
-
-// use wxPostEvent or not
-#define USE_DELAYED_EVENTS 1
-
+    #if wxUSE_THREADS
+        #define PROCESS_EVENTS()        \
+        {                               \
+            if ( wxThread::IsMain() )   \
+                wxYield();              \
+            else                        \
+                wxThread::Yield();      \
+        }
+    #else // !wxUSE_THREADS
+        #define PROCESS_EVENTS() wxYield()
+    #endif // wxUSE_THREADS/!wxUSE_THREADS
+#else // !wxUSE_GUI
+    #define PROCESS_EVENTS()
+#endif // wxUSE_GUI/!wxUSE_GUI

 
 // --------------------------------------------------------------------------
 
 // --------------------------------------------------------------------------

-// ClassInfos
+// wxWin macros

 // --------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxSocketBase, wxObject)
 // --------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxSocketBase, wxObject)


@@ -69,20 +86,26 @@ IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
 IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase)
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
 
 IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase)
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
 

+// --------------------------------------------------------------------------
+// private classes
+// --------------------------------------------------------------------------
+

 class wxSocketState : public wxObject
 {
 public:
 class wxSocketState : public wxObject
 {
 public:

-  bool                     m_notify_state;
-  wxSocketEventFlags       m_neededreq;

   wxSocketFlags            m_flags;
   wxSocketFlags            m_flags;

+  wxSocketEventFlags       m_eventmask;
+  bool                     m_notify;
+  void                    *m_clientData;
+#if WXWIN_COMPATIBILITY

   wxSocketBase::wxSockCbk  m_cbk;
   char                    *m_cdata;
   wxSocketBase::wxSockCbk  m_cbk;
   char                    *m_cdata;

+#endif // WXWIN_COMPATIBILITY

 
 public:
   wxSocketState() : wxObject() {}
 };
 
 
 public:
   wxSocketState() : wxObject() {}
 };
 

-

 // ==========================================================================
 // wxSocketBase
 // ==========================================================================
 // ==========================================================================
 // wxSocketBase
 // ==========================================================================


@@ -116,10 +139,12 @@ void wxSocketBase::Init()
   m_id           = -1;
   m_handler      = NULL;
   m_clientData   = NULL;
   m_id           = -1;
   m_handler      = NULL;
   m_clientData   = NULL;

-  m_notify_state = FALSE;
-  m_neededreq    = 0;
+  m_notify       = FALSE;
+  m_eventmask    = 0;
+#if WXWIN_COMPATIBILITY

   m_cbk          = NULL;
   m_cdata        = NULL;
   m_cbk          = NULL;
   m_cdata        = NULL;

+#endif // WXWIN_COMPATIBILITY

 }
 
 wxSocketBase::wxSocketBase()
 }
 
 wxSocketBase::wxSocketBase()


@@ -166,9 +191,12 @@ bool wxSocketBase::Destroy()
   // Shutdown and close the socket
   Close();
 
   // Shutdown and close the socket
   Close();
 

+  // Supress events from now on
+  Notify(FALSE);
+

 #if wxUSE_GUI
 #if wxUSE_GUI

-  if ( wxPendingDelete.Member(this) )
-      wxPendingDelete.Append(this);
+  if ( !wxPendingDelete.Member(this) )
+    wxPendingDelete.Append(this);

 #else
   delete this;
 #endif
 #else
   delete this;
 #endif


@@ -176,9 +204,8 @@ bool wxSocketBase::Destroy()
   return TRUE;
 }
 
   return TRUE;
 }
 

-

 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------

-// Basic IO operations
+// Basic IO calls

 // --------------------------------------------------------------------------
 
 // The following IO operations update m_error and m_lcount:
 // --------------------------------------------------------------------------
 
 // The following IO operations update m_error and m_lcount:


@@ -189,7 +216,7 @@ bool wxSocketBase::Destroy()
 bool wxSocketBase::Close()
 {
   // Interrupt pending waits
 bool wxSocketBase::Close()
 {
   // Interrupt pending waits

-  InterruptAllWaits();
+  InterruptWait();

 
   if (m_socket)
   {
 
   if (m_socket)
   {


@@ -235,32 +262,38 @@ wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
   nbytes -= total;
   buffer  = (char *)buffer + total;
 
   nbytes -= total;
   buffer  = (char *)buffer + total;
 

-  // If the socket is invalid or we got all the data, return now
-  if (!m_socket || !nbytes)
+  // Return now in one of the following cases:
+  // - the socket is invalid,
+  // - we got all the data,
+  // - we got *some* data and we are not using wxSOCKET_WAITALL.
+  if ( !m_socket ||
+       !nbytes ||
+       ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )

     return total;
 
   // Possible combinations (they are checked in this order)
   // wxSOCKET_NOWAIT
     return total;
 
   // Possible combinations (they are checked in this order)
   // wxSOCKET_NOWAIT

-  // wxSOCKET_WAITALL | wxSOCKET_BLOCK
-  // wxSOCKET_WAITALL
+  // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)

   // wxSOCKET_BLOCK
   // wxSOCKET_NONE
   //
   if (m_flags & wxSOCKET_NOWAIT)
   {
   // wxSOCKET_BLOCK
   // wxSOCKET_NONE
   //
   if (m_flags & wxSOCKET_NOWAIT)
   {

-    GSocket_SetNonBlocking(m_socket, TRUE);
+    GSocket_SetNonBlocking(m_socket, 1);

     ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
     ret = GSocket_Read(m_socket, (char *)buffer, nbytes);

-    GSocket_SetNonBlocking(m_socket, FALSE);
+    GSocket_SetNonBlocking(m_socket, 0);

 
     if (ret > 0)
       total += ret;
   }
 
     if (ret > 0)
       total += ret;
   }

-  else if (m_flags & wxSOCKET_WAITALL)
+  else

   {
   {

-    while (ret > 0 && nbytes > 0)
+    bool more = TRUE;
+
+    while (more)

     {
     {

-      if (!(m_flags & wxSOCKET_BLOCK) && !WaitForRead())
-          break;
+      if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForRead() )
+        break;

 
       ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
 
 
       ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
 


@@ -270,16 +303,12 @@ wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
         nbytes -= ret;
         buffer  = (char *)buffer + ret;
       }
         nbytes -= ret;
         buffer  = (char *)buffer + ret;
       }

-    }
-  }
-  else
-  {
-    if ((m_flags & wxSOCKET_BLOCK) || WaitForRead())
-    {
-      ret = GSocket_Read(m_socket, (char *)buffer, nbytes);

 
 

-      if (ret > 0)
-        total += ret;
+      // If we got here and wxSOCKET_WAITALL is not set, we can leave
+      // now. Otherwise, wait until we recv all the data or until there
+      // is an error.
+      //
+      more = (ret > 0 && nbytes > 0 && (m_flags & wxSOCKET_WAITALL));

     }
   }
 
     }
   }
 


@@ -315,7 +344,7 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
 
   if (sig != 0xfeeddead)
   {
 
   if (sig != 0xfeeddead)
   {

-    wxLogWarning( _("wxSocket: invalid signature in ReadMsg."));
+    wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));

     goto exit;
   }
 
     goto exit;
   }
 


@@ -369,7 +398,7 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
 
   if (sig != 0xdeadfeed)
   {
 
   if (sig != 0xdeadfeed)
   {

-    wxLogWarning( _("wxSocket: invalid signature in ReadMsg."));
+    wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));

     goto exit;
   }
 
     goto exit;
   }
 


@@ -429,32 +458,33 @@ wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
   wxUint32 total = 0;
   int ret = 1;
 
   wxUint32 total = 0;
   int ret = 1;
 

-  // If the socket is invalid, return immediately
-  if (!m_socket)
+  // If the socket is invalid or parameters are ill, return immediately
+  if (!m_socket || !buffer || !nbytes)

     return 0;
 
   // Possible combinations (they are checked in this order)
   // wxSOCKET_NOWAIT
     return 0;
 
   // Possible combinations (they are checked in this order)
   // wxSOCKET_NOWAIT

-  // wxSOCKET_WAITALL | wxSOCKET_BLOCK
-  // wxSOCKET_WAITALL
+  // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)

   // wxSOCKET_BLOCK
   // wxSOCKET_NONE
   //
   if (m_flags & wxSOCKET_NOWAIT)
   {
   // wxSOCKET_BLOCK
   // wxSOCKET_NONE
   //
   if (m_flags & wxSOCKET_NOWAIT)
   {

-    GSocket_SetNonBlocking(m_socket, TRUE);
+    GSocket_SetNonBlocking(m_socket, 1);

     ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
     ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);

-    GSocket_SetNonBlocking(m_socket, FALSE);
+    GSocket_SetNonBlocking(m_socket, 0);

 
     if (ret > 0)
       total = ret;
   }
 
     if (ret > 0)
       total = ret;
   }

-  else if (m_flags & wxSOCKET_WAITALL)
+  else

   {
   {

-    while (ret > 0 && nbytes > 0)
+    bool more = TRUE;
+
+    while (more)

     {
     {

-      if (!(m_flags & wxSOCKET_BLOCK) && !WaitForWrite())
-          break;
+      if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
+        break;

 
       ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
 
 
       ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
 


@@ -464,16 +494,12 @@ wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
         nbytes -= ret;
         buffer  = (const char *)buffer + ret;
       }
         nbytes -= ret;
         buffer  = (const char *)buffer + ret;
       }

-    }
-  }
-  else
-  {
-    if ((m_flags & wxSOCKET_BLOCK) || WaitForWrite())
-    {
-      ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);

 
 

-      if (ret > 0)
-        total = ret;
+      // If we got here and wxSOCKET_WAITALL is not set, we can leave
+      // now. Otherwise, wait until we send all the data or until there
+      // is an error.
+      //
+      more = (ret > 0 && nbytes > 0 && (m_flags & wxSOCKET_WAITALL));

     }
   }
 
     }
   }
 


@@ -588,7 +614,8 @@ wxSocketBase& wxSocketBase::Discard()
 // timeout elapses. The polling loop calls PROCESS_EVENTS(), so
 // this won't block the GUI.
 
 // timeout elapses. The polling loop calls PROCESS_EVENTS(), so
 // this won't block the GUI.
 

-bool wxSocketBase::_Wait(long seconds, long milliseconds,
+bool wxSocketBase::_Wait(long seconds,
+                         long milliseconds,

                          wxSocketEventFlags flags)
 {
   GSocketEventFlags result;
                          wxSocketEventFlags flags)
 {
   GSocketEventFlags result;


@@ -607,14 +634,12 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds,
   else
     timeout = m_timeout * 1000;
 
   else
     timeout = m_timeout * 1000;
 

-  // Active polling (without using events)
+  // Wait in an active polling loop.

   //
   //

-  // NOTE: this duplicates some of the code in OnRequest (lost
-  //   connection and connection establishment handling) but
-  //   this doesn't hurt. It has to be here because the event
-  //   might be a bit delayed, and it has to be in OnRequest
-  //   as well because maybe the Wait functions are not being
-  //   used.
+  // NOTE: We duplicate some of the code in OnRequest, but this doesn't
+  //   hurt. It has to be here because the (GSocket) event might arrive
+  //   a bit delayed, and it has to be in OnRequest as well because we
+  //   don't know whether the Wait functions are being used.

   //
   // Do this at least once (important if timeout == 0, when
   // we are just polling). Also, if just polling, do not yield.
   //
   // Do this at least once (important if timeout == 0, when
   // we are just polling). Also, if just polling, do not yield.


@@ -645,7 +670,7 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds,
     {
       m_connected = FALSE;
       m_establishing = FALSE;
     {
       m_connected = FALSE;
       m_establishing = FALSE;

-      return (flags & GSOCK_LOST_FLAG);
+      return (flags & GSOCK_LOST_FLAG) != 0;

     }
 
     // Wait more?
     }
 
     // Wait more?


@@ -737,11 +762,14 @@ void wxSocketBase::SaveState()
 
   state = new wxSocketState();
 
 
   state = new wxSocketState();
 

-  state->m_notify_state = m_notify_state;
-  state->m_neededreq    = m_neededreq;
-  state->m_flags        = m_flags;
-  state->m_cbk          = m_cbk;
-  state->m_cdata        = m_cdata;
+  state->m_flags      = m_flags;
+  state->m_notify     = m_notify;
+  state->m_eventmask  = m_eventmask;
+  state->m_clientData = m_clientData;
+#if WXWIN_COMPATIBILITY
+  state->m_cbk        = m_cbk;
+  state->m_cdata      = m_cdata;
+#endif // WXWIN_COMPATIBILITY

 
   m_states.Append(state);
 }
 
   m_states.Append(state);
 }


@@ -757,11 +785,14 @@ void wxSocketBase::RestoreState()
 
   state = (wxSocketState *)node->Data();
 
 
   state = (wxSocketState *)node->Data();
 

-  SetFlags(state->m_flags);
-  m_cbk       = state->m_cbk;
-  m_cdata     = state->m_cdata;
-  m_neededreq = state->m_neededreq;
-  Notify(state->m_notify_state);
+  m_flags      = state->m_flags;
+  m_notify     = state->m_notify;
+  m_eventmask  = state->m_eventmask;
+  m_clientData = state->m_clientData;
+#if WXWIN_COMPATIBILITY
+  m_cbk        = state->m_cbk;
+  m_cdata      = state->m_cdata;
+#endif // WXWIN_COMPATIBILITY

 
   delete node;
   delete state;
 
   delete node;
   delete state;


@@ -789,6 +820,8 @@ void wxSocketBase::SetFlags(wxSocketFlags flags)
 // Callbacks (now obsolete - use events instead)
 // --------------------------------------------------------------------------
 
 // Callbacks (now obsolete - use events instead)
 // --------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY
+

 wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
 {
   wxSockCbk old_cbk = cbk_;
 wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
 {
   wxSockCbk old_cbk = cbk_;


@@ -805,31 +838,47 @@ char *wxSocketBase::CallbackData(char *data)
   return old_data;
 }
 
   return old_data;
 }
 

+#endif // WXWIN_COMPATIBILITY
+

 // --------------------------------------------------------------------------
 // Event handling
 // --------------------------------------------------------------------------
 
 // --------------------------------------------------------------------------
 // Event handling
 // --------------------------------------------------------------------------
 

-// Callback function from GSocket. All events are internally
-// monitored, but users only get these they are interested in.
+// A note on how events are processed, which is probably the most
+// difficult thing to get working right while keeping the same API
+// and functionality for all platforms.
+//
+// When GSocket detects an event, it calls wx_socket_callback, which in
+// turn just calls wxSocketBase::OnRequest in the corresponding wxSocket
+// object. OnRequest does some housekeeping, and if the event is to be
+// propagated to the user, it creates a new wxSocketEvent object and
+// posts it. The event is not processed immediately, but delayed with
+// AddPendingEvent instead. This is necessary in order to decouple the
+// event processing from wx_socket_callback; otherwise, subsequent IO
+// calls made from the user event handler would fail, as gtk callbacks
+// are not reentrant.
+//
+// Note that, unlike events, user callbacks (now deprecated) are _not_
+// decoupled from wx_socket_callback and thus they suffer from a variety
+// of problems. Avoid them where possible and use events instead.

 
 static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
 
 static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),

-                                           GSocketEvent notify,
+                                           GSocketEvent notification,

                                            char *cdata)
 {
   wxSocketBase *sckobj = (wxSocketBase *)cdata;
 
                                            char *cdata)
 {
   wxSocketBase *sckobj = (wxSocketBase *)cdata;
 

-  sckobj->OnRequest((wxSocketNotify) notify);
+  sckobj->OnRequest((wxSocketNotify) notification);

 }
 
 }
 

-
-void wxSocketBase::OnRequest(wxSocketNotify req_evt)
+void wxSocketBase::OnRequest(wxSocketNotify notification)

 {
 {

-  // This duplicates some code in _Wait, but this doesn't
-  // hurt. It has to be here because we don't know whether
-  // the Wait functions will be used, and it has to be in
-  // _Wait as well because the event might be a bit delayed.
+  // NOTE: We duplicate some of the code in _Wait, but this doesn't
+  //   hurt. It has to be here because the (GSocket) event might arrive
+  //   a bit delayed, and it has to be in _Wait as well because we don't
+  //   know whether the Wait functions are being used.

 
 

-  switch(req_evt)
+  switch(notification)

   {
     case wxSOCKET_CONNECTION:
       m_establishing = FALSE;
   {
     case wxSOCKET_CONNECTION:
       m_establishing = FALSE;


@@ -861,43 +910,45 @@ void wxSocketBase::OnRequest(wxSocketNotify req_evt)
 
   // Schedule the event
 
 
   // Schedule the event
 

-  wxSocketEventFlags flag = -1;
-  switch (req_evt)
+  wxSocketEventFlags flag = 0;
+  switch (notification)

   {
     case GSOCK_INPUT:      flag = GSOCK_INPUT_FLAG; break;
     case GSOCK_OUTPUT:     flag = GSOCK_OUTPUT_FLAG; break;
     case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break;
     case GSOCK_LOST:       flag = GSOCK_LOST_FLAG; break;
   {
     case GSOCK_INPUT:      flag = GSOCK_INPUT_FLAG; break;
     case GSOCK_OUTPUT:     flag = GSOCK_OUTPUT_FLAG; break;
     case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break;
     case GSOCK_LOST:       flag = GSOCK_LOST_FLAG; break;

+    default:
+      wxLogWarning(_("wxSocket: unknown event!."));
+      return;

   }
 
   }
 

-  if (((m_neededreq & flag) == flag) && m_notify_state)
+  if (((m_eventmask & flag) == flag) && m_notify)

   {
   {

-    wxSocketEvent event(m_id);
-
-    event.m_event      = req_evt;
-    event.m_clientData = m_clientData;
-    event.SetEventObject(this);
-

     if (m_handler)
     if (m_handler)

-#if USE_DELAYED_EVENTS
+    {
+      wxSocketEvent event(m_id);
+      event.m_event      = notification;
+      event.m_clientData = m_clientData;
+      event.SetEventObject(this);
+

       m_handler->AddPendingEvent(event);
       m_handler->AddPendingEvent(event);

-#else
-      m_handler->ProcessEvent(event);
-#endif
+    }

 
 

+#if WXWIN_COMPATIBILITY

     if (m_cbk)
     if (m_cbk)

-      m_cbk(*this, req_evt, m_cdata);
+      m_cbk(*this, notification, m_cdata);
+#endif // WXWIN_COMPATIBILITY

   }
 }
 
 void wxSocketBase::Notify(bool notify)
 {
   }
 }
 
 void wxSocketBase::Notify(bool notify)
 {

-  m_notify_state = notify;
+  m_notify = notify;

 }
 
 void wxSocketBase::SetNotify(wxSocketEventFlags flags)
 {
 }
 
 void wxSocketBase::SetNotify(wxSocketEventFlags flags)
 {

-  m_neededreq = flags;
+  m_eventmask = flags;

 }
 
 void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)
 }
 
 void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)


@@ -906,7 +957,6 @@ void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)
   m_id      = id;
 }
 
   m_id      = id;
 }
 

-

 // --------------------------------------------------------------------------
 // Pushback buffer
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // Pushback buffer
 // --------------------------------------------------------------------------


@@ -960,7 +1010,7 @@ wxUint32 wxSocketBase::GetPushback(void *buffer, wxUint32 size, bool peek)
 
 
 // ==========================================================================
 
 
 // ==========================================================================

-// wxSocketServer                             
+// wxSocketServer

 // ==========================================================================
 
 // --------------------------------------------------------------------------
 // ==========================================================================
 
 // --------------------------------------------------------------------------


@@ -1009,12 +1059,12 @@ bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
   // again.
 
   if (!wait)
   // again.
 
   if (!wait)

-    GSocket_SetNonBlocking(m_socket, TRUE);
+    GSocket_SetNonBlocking(m_socket, 1);

 
   child_socket = GSocket_WaitConnection(m_socket);
 
   if (!wait)
 
   child_socket = GSocket_WaitConnection(m_socket);
 
   if (!wait)

-    GSocket_SetNonBlocking(m_socket, FALSE);
+    GSocket_SetNonBlocking(m_socket, 0);

 
   if (!child_socket)
     return FALSE;
 
   if (!child_socket)
     return FALSE;


@@ -1038,7 +1088,10 @@ wxSocketBase *wxSocketServer::Accept(bool wait)
   sock->SetFlags(m_flags);
 
   if (!AcceptWith(*sock, wait))
   sock->SetFlags(m_flags);
 
   if (!AcceptWith(*sock, wait))

-    return NULL;
+  {
+    sock->Destroy();
+    sock = NULL;
+  }

 
   return sock;
 }
 
   return sock;
 }


@@ -1097,13 +1150,13 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
   // again.
 
   if (!wait)
   // again.
 
   if (!wait)

-    GSocket_SetNonBlocking(m_socket, TRUE);
+    GSocket_SetNonBlocking(m_socket, 1);

 
   GSocket_SetPeer(m_socket, addr_man.GetAddress());
   err = GSocket_Connect(m_socket, GSOCK_STREAMED);
 
   if (!wait)
 
   GSocket_SetPeer(m_socket, addr_man.GetAddress());
   err = GSocket_Connect(m_socket, GSOCK_STREAMED);
 
   if (!wait)

-    GSocket_SetNonBlocking(m_socket, FALSE);
+    GSocket_SetNonBlocking(m_socket, 0);

 
   if (err != GSOCK_NOERROR)
   {
 
   if (err != GSOCK_NOERROR)
   {


@@ -1182,36 +1235,16 @@ wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
     return (*this);
 }
 
     return (*this);
 }
 

-// ==========================================================================
-// wxSocketEvent
-// ==========================================================================
-
-wxSocketEvent::wxSocketEvent(int id) : wxEvent(id)
-{
-  SetEventType( (wxEventType)wxEVT_SOCKET );
-}
-
-void wxSocketEvent::CopyObject(wxObject& object_dest) const
-{
-  wxSocketEvent *event = (wxSocketEvent *)&object_dest;
-
-  wxEvent::CopyObject(object_dest);
-
-  event->m_event      = m_event;
-  event->m_clientData = m_clientData;
-}
-
-

 // ==========================================================================
 // wxSocketModule
 // ==========================================================================
 
 // ==========================================================================
 // wxSocketModule
 // ==========================================================================
 

-class WXDLLEXPORT wxSocketModule: public wxModule
+class WXDLLEXPORT wxSocketModule : public wxModule

 {
   DECLARE_DYNAMIC_CLASS(wxSocketModule)
 
 public:
 {
   DECLARE_DYNAMIC_CLASS(wxSocketModule)
 
 public:

-  bool OnInit() { return GSocket_Init(); }
+  bool OnInit() { return GSocket_Init() != 0; }

   void OnExit() { GSocket_Cleanup(); }
 };
 
   void OnExit() { GSocket_Cleanup(); }
 };