make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook...

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 89ac01b97d58cfafbfeec60345a28a0c99de206e..4d98262d3015f5d04cb0403656c8c9b1699c05b5 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -6,14 +6,14 @@
 // Copyright:  (C) 1999-1997, Guilhem Lavaux
 //             (C) 2000-1999, Guillermo Rodriguez Garcia
 // RCS_ID:     $Id$
 // Copyright:  (C) 1999-1997, Guilhem Lavaux
 //             (C) 2000-1999, Guillermo Rodriguez Garcia
 // RCS_ID:     $Id$

-// License:    see wxWindows license
+// License:    see wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ==========================================================================
 // Declarations
 // ==========================================================================
 
 /////////////////////////////////////////////////////////////////////////////
 
 // ==========================================================================
 // Declarations
 // ==========================================================================
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -27,6 +27,7 @@
 #if wxUSE_SOCKETS
 
 #include "wx/app.h"
 #if wxUSE_SOCKETS
 
 #include "wx/app.h"

+#include "wx/apptrait.h"

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


@@ -37,13 +38,13 @@
 #include "wx/intl.h"
 #include "wx/event.h"
 
 #include "wx/intl.h"
 #include "wx/event.h"
 

-#if wxUSE_GUI
-  #include "wx/gdicmn.h"      // for wxPendingDelete
-#endif // wxUSE_GUI
-

 #include "wx/sckaddr.h"
 #include "wx/socket.h"
 
 #include "wx/sckaddr.h"
 #include "wx/socket.h"
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxNet")
+

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


@@ -51,12 +52,26 @@
 // discard buffer
 #define MAX_DISCARD_SIZE (10 * 1024)
 
 // discard buffer
 #define MAX_DISCARD_SIZE (10 * 1024)
 

-// what to do within waits
-#if wxUSE_GUI
-  #define PROCESS_EVENTS() wxYield()
-#else
-  #define PROCESS_EVENTS()
-#endif
+// what to do within waits: 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 wxWidgets) 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_THREADS
+    #define PROCESS_EVENTS()        \
+    {                               \
+        if ( wxThread::IsMain() )   \
+            wxYield();              \
+        else                        \
+            wxThread::Yield();      \
+    }
+#else // !wxUSE_THREADS
+    #define PROCESS_EVENTS() wxYield()
+#endif // wxUSE_THREADS/!wxUSE_THREADS
+
+#define wxTRACE_Socket _T("wxSocket")

 
 // --------------------------------------------------------------------------
 // wxWin macros
 
 // --------------------------------------------------------------------------
 // wxWin macros


@@ -79,19 +94,80 @@ public:
   wxSocketEventFlags       m_eventmask;
   bool                     m_notify;
   void                    *m_clientData;
   wxSocketEventFlags       m_eventmask;
   bool                     m_notify;
   void                    *m_clientData;

-#if WXWIN_COMPATIBILITY
-  wxSocketBase::wxSockCbk  m_cbk;
-  char                    *m_cdata;
-#endif // WXWIN_COMPATIBILITY

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

+
+    DECLARE_NO_COPY_CLASS(wxSocketState)

 };
 
 // ==========================================================================
 // wxSocketBase
 // ==========================================================================
 
 };
 
 // ==========================================================================
 // wxSocketBase
 // ==========================================================================
 

+// --------------------------------------------------------------------------
+// Initialization and shutdown
+// --------------------------------------------------------------------------
+
+// FIXME-MT: all this is MT-unsafe, of course, we should protect all accesses
+//           to m_countInit with a crit section
+size_t wxSocketBase::m_countInit = 0;
+
+bool wxSocketBase::IsInitialized()
+{
+    return m_countInit > 0;
+}
+
+bool wxSocketBase::Initialize()
+{
+    if ( !m_countInit++ )
+    {
+        /*
+            Details: Initialize() creates a hidden window as a sink for socket
+            events, such as 'read completed'. wxMSW has only one message loop
+            for the main thread. If Initialize is called in a secondary thread,
+            the socket window will be created for the secondary thread, but
+            since there is no message loop on this thread, it will never
+            receive events and all socket operations will time out.
+            BTW, the main thread must not be stopped using sleep or block
+            on a semaphore (a bad idea in any case) or socket operations
+            will time out.
+
+            On the Mac side, Initialize() stores a pointer to the CFRunLoop for
+            the main thread. Because secondary threads do not have run loops,
+            adding event notifications to the "Current" loop would have no
+            effect at all, events would never fire.
+        */
+        wxASSERT_MSG( wxIsMainThread(),
+            wxT("Call wxSocketBase::Initialize() from the main thread first!"));
+
+        wxAppTraits *traits = wxAppConsole::GetInstance() ?
+                              wxAppConsole::GetInstance()->GetTraits() : NULL;
+        GSocketGUIFunctionsTable *functions =
+            traits ? traits->GetSocketGUIFunctionsTable() : NULL;
+        GSocket_SetGUIFunctions(functions);
+
+        if ( !GSocket_Init() )
+        {
+            m_countInit--;
+
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void wxSocketBase::Shutdown()
+{
+    // we should be initialized
+    wxASSERT_MSG( m_countInit, _T("extra call to Shutdown()") );
+    if ( !--m_countInit )
+    {
+        GSocket_Cleanup();
+    }
+}
+

 // --------------------------------------------------------------------------
 // Ctor and dtor
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // Ctor and dtor
 // --------------------------------------------------------------------------


@@ -107,10 +183,10 @@ void wxSocketBase::Init()
   m_establishing =
   m_reading      =
   m_writing      =
   m_establishing =
   m_reading      =
   m_writing      =

-  m_error        = FALSE;
+  m_error        = false;

   m_lcount       = 0;
   m_timeout      = 600;
   m_lcount       = 0;
   m_timeout      = 600;

-  m_beingDeleted = FALSE;
+  m_beingDeleted = false;

 
   // pushback buffer
   m_unread       = NULL;
 
   // pushback buffer
   m_unread       = NULL;


@@ -118,15 +194,18 @@ void wxSocketBase::Init()
   m_unrd_cur     = 0;
 
   // events
   m_unrd_cur     = 0;
 
   // events

-  m_id           = -1;
+  m_id           = wxID_ANY;

   m_handler      = NULL;
   m_clientData   = NULL;
   m_handler      = NULL;
   m_clientData   = NULL;

-  m_notify       = FALSE;
+  m_notify       = false;

   m_eventmask    = 0;
   m_eventmask    = 0;

-#if WXWIN_COMPATIBILITY
-  m_cbk          = NULL;
-  m_cdata        = NULL;
-#endif // WXWIN_COMPATIBILITY
+
+  if ( !IsInitialized() )
+  {
+      // this Initialize() will be undone by wxSocketModule::OnExit(), all the
+      // other calls to it should be matched by a call to Shutdown()
+      Initialize();
+  }

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


@@ -146,9 +225,9 @@ wxSocketBase::~wxSocketBase()
 {
   // Just in case the app called Destroy() *and* then deleted
   // the socket immediately: don't leave dangling pointers.
 {
   // Just in case the app called Destroy() *and* then deleted
   // the socket immediately: don't leave dangling pointers.

-#if wxUSE_GUI
-  wxPendingDelete.DeleteObject(this);
-#endif
+  wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+  if ( traits )
+      traits->RemoveFromPendingDelete(this);

 
   // Shutdown and close the socket
   if (!m_beingDeleted)
 
   // Shutdown and close the socket
   if (!m_beingDeleted)


@@ -156,7 +235,7 @@ wxSocketBase::~wxSocketBase()
 
   // Destroy the GSocket object
   if (m_socket)
 
   // Destroy the GSocket object
   if (m_socket)

-    GSocket_destroy(m_socket);
+    delete m_socket;

 
   // Free the pushback buffer
   if (m_unread)
 
   // Free the pushback buffer
   if (m_unread)


@@ -168,22 +247,28 @@ bool wxSocketBase::Destroy()
   // Delayed destruction: the socket will be deleted during the next
   // idle loop iteration. This ensures that all pending events have
   // been processed.
   // Delayed destruction: the socket will be deleted during the next
   // idle loop iteration. This ensures that all pending events have
   // been processed.

-  m_beingDeleted = TRUE;
+  m_beingDeleted = true;

 
   // Shutdown and close the socket
   Close();
 
   // Supress events from now on
 
   // Shutdown and close the socket
   Close();
 
   // Supress events from now on

-  Notify(FALSE);
+  Notify(false);

 
 

-#if wxUSE_GUI
-  if ( !wxPendingDelete.Member(this) )
-    wxPendingDelete.Append(this);
-#else
-  delete this;
-#endif
+  // schedule this object for deletion
+  wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+  if ( traits )
+  {
+      // let the traits object decide what to do with us
+      traits->ScheduleForDestroy(this);
+  }
+  else // no app or no traits
+  {
+      // in wxBase we might have no app object at all, don't leak memory
+      delete this;
+  }

 
 

-  return TRUE;
+  return true;

 }
 
 // --------------------------------------------------------------------------
 }
 
 // --------------------------------------------------------------------------


@@ -203,22 +288,22 @@ bool wxSocketBase::Close()
   if (m_socket)
   {
     // Disable callbacks
   if (m_socket)
   {
     // Disable callbacks

-    GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+    m_socket->UnsetCallback(GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |

                                     GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
 
     // Shutdown the connection
                                     GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
 
     // Shutdown the connection

-    GSocket_Shutdown(m_socket);
+    m_socket->Shutdown();

   }
 
   }
 

-  m_connected = FALSE;
-  m_establishing = FALSE;
-  return TRUE;
+  m_connected = false;
+  m_establishing = false;
+  return true;

 }
 
 wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)
 {
   // Mask read events
 }
 
 wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)
 {
   // Mask read events

-  m_reading = TRUE;
+  m_reading = true;

 
   m_lcount = _Read(buffer, nbytes);
 
 
   m_lcount = _Read(buffer, nbytes);
 


@@ -229,7 +314,7 @@ wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)
     m_error = (m_lcount == 0);
 
   // Allow read events from now on
     m_error = (m_lcount == 0);
 
   // Allow read events from now on

-  m_reading = FALSE;
+  m_reading = false;

 
   return *this;
 }
 
   return *this;
 }


@@ -237,41 +322,47 @@ wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)
 wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
 {
   int total;
 wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
 {
   int total;

-  int ret = 1;

 
   // Try the pushback buffer first
 
   // Try the pushback buffer first

-  total = GetPushback(buffer, nbytes, FALSE);
+  total = GetPushback(buffer, nbytes, false);

   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
   //
   // wxSOCKET_BLOCK
   // wxSOCKET_NONE
   //

+  int ret;

   if (m_flags & wxSOCKET_NOWAIT)
   {
   if (m_flags & wxSOCKET_NOWAIT)
   {

-    GSocket_SetNonBlocking(m_socket, TRUE);
-    ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
-    GSocket_SetNonBlocking(m_socket, FALSE);
+    m_socket->SetNonBlocking(1);
+    ret = m_socket->Read((char *)buffer, nbytes);
+    m_socket->SetNonBlocking(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 = m_socket->Read((char *)buffer, nbytes);

 
       if (ret > 0)
       {
 
       if (ret > 0)
       {


@@ -279,16 +370,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));

     }
   }
 
     }
   }
 


@@ -307,10 +394,10 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
   } msg;
 
   // Mask read events
   } msg;
 
   // Mask read events

-  m_reading = TRUE;
+  m_reading = true;

 
   total = 0;
 
   total = 0;

-  error = TRUE;
+  error = true;

   old_flags = m_flags;
   SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
 
   old_flags = m_flags;
   SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
 


@@ -324,7 +411,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;
   }
 


@@ -378,17 +465,17 @@ 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;
   }
 
   // everything was OK
     goto exit;
   }
 
   // everything was OK

-  error = FALSE;
+  error = false;

 
 exit:
   m_error = error;
   m_lcount = total;
 
 exit:
   m_error = error;
   m_lcount = total;

-  m_reading = FALSE;
+  m_reading = false;

   SetFlags(old_flags);
 
   return *this;
   SetFlags(old_flags);
 
   return *this;


@@ -397,7 +484,7 @@ exit:
 wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
 {
   // Mask read events
 wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
 {
   // Mask read events

-  m_reading = TRUE;
+  m_reading = true;

 
   m_lcount = _Read(buffer, nbytes);
   Pushback(buffer, m_lcount);
 
   m_lcount = _Read(buffer, nbytes);
   Pushback(buffer, m_lcount);


@@ -409,7 +496,7 @@ wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
     m_error = (m_lcount == 0);
 
   // Allow read events again
     m_error = (m_lcount == 0);
 
   // Allow read events again

-  m_reading = FALSE;
+  m_reading = false;

 
   return *this;
 }
 
   return *this;
 }


@@ -417,7 +504,7 @@ wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
 wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)
 {
   // Mask write events
 wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)
 {
   // Mask write events

-  m_writing = TRUE;
+  m_writing = true;

 
   m_lcount = _Write(buffer, nbytes);
 
 
   m_lcount = _Write(buffer, nbytes);
 


@@ -428,7 +515,7 @@ wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)
     m_error = (m_lcount == 0);
 
   // Allow write events again
     m_error = (m_lcount == 0);
 
   // Allow write events again

-  m_writing = FALSE;
+  m_writing = false;

 
   return *this;
 }
 
   return *this;
 }


@@ -436,36 +523,37 @@ wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)
 wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
 {
   wxUint32 total = 0;
 wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
 {
   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
   //
   // wxSOCKET_BLOCK
   // wxSOCKET_NONE
   //

+  int ret;

   if (m_flags & wxSOCKET_NOWAIT)
   {
   if (m_flags & wxSOCKET_NOWAIT)
   {

-    GSocket_SetNonBlocking(m_socket, TRUE);
-    ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
-    GSocket_SetNonBlocking(m_socket, FALSE);
+    m_socket->SetNonBlocking(1);
+    ret = m_socket->Write((const char *)buffer, nbytes);
+    m_socket->SetNonBlocking(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 = m_socket->Write((const char *)buffer, nbytes);

 
       if (ret > 0)
       {
 
       if (ret > 0)
       {


@@ -473,16 +561,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));

     }
   }
 
     }
   }
 


@@ -493,7 +577,6 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
 {
   wxUint32 total;
   bool error;
 {
   wxUint32 total;
   bool error;

-  int old_flags;

   struct
   {
     unsigned char sig[4];
   struct
   {
     unsigned char sig[4];


@@ -501,11 +584,10 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
   } msg;
 
   // Mask write events
   } msg;
 
   // Mask write events

-  m_writing = TRUE;
+  m_writing = true;

 
 

-  error = TRUE;
+  error = true;

   total = 0;
   total = 0;

-  old_flags = m_flags;

   SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
 
   msg.sig[0] = (unsigned char) 0xad;
   SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
 
   msg.sig[0] = (unsigned char) 0xad;


@@ -536,12 +618,12 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
     goto exit;
 
   // everything was OK
     goto exit;
 
   // everything was OK

-  error = FALSE;
+  error = false;

 
 exit:
   m_error = error;
   m_lcount = total;
 
 exit:
   m_error = error;
   m_lcount = total;

-  m_writing = FALSE;
+  m_writing = false;

 
   return *this;
 }
 
   return *this;
 }


@@ -551,7 +633,7 @@ wxSocketBase& wxSocketBase::Unread(const void *buffer, wxUint32 nbytes)
   if (nbytes != 0)
     Pushback(buffer, nbytes);
 
   if (nbytes != 0)
     Pushback(buffer, nbytes);
 

-  m_error = FALSE;
+  m_error = false;

   m_lcount = nbytes;
 
   return *this;
   m_lcount = nbytes;
 
   return *this;


@@ -559,15 +641,13 @@ wxSocketBase& wxSocketBase::Unread(const void *buffer, wxUint32 nbytes)
 
 wxSocketBase& wxSocketBase::Discard()
 {
 
 wxSocketBase& wxSocketBase::Discard()
 {

-  int old_flags;

   char *buffer = new char[MAX_DISCARD_SIZE];
   wxUint32 ret;
   wxUint32 total = 0;
 
   // Mask read events
   char *buffer = new char[MAX_DISCARD_SIZE];
   wxUint32 ret;
   wxUint32 total = 0;
 
   // Mask read events

-  m_reading = TRUE;
+  m_reading = true;

 
 

-  old_flags = m_flags;

   SetFlags(wxSOCKET_NOWAIT);
 
   do
   SetFlags(wxSOCKET_NOWAIT);
 
   do


@@ -579,10 +659,10 @@ wxSocketBase& wxSocketBase::Discard()
 
   delete[] buffer;
   m_lcount = total;
 
   delete[] buffer;
   m_lcount = total;

-  m_error  = FALSE;
+  m_error  = false;

 
   // Allow read events again
 
   // Allow read events again

-  m_reading = FALSE;
+  m_reading = false;

 
   return *this;
 }
 
   return *this;
 }


@@ -604,12 +684,12 @@ bool wxSocketBase::_Wait(long seconds,
   GSocketEventFlags result;
   long timeout;
 
   GSocketEventFlags result;
   long timeout;
 

-  // Set this to TRUE to interrupt ongoing waits
-  m_interrupt = FALSE;
+  // Set this to true to interrupt ongoing waits
+  m_interrupt = false;

 
   // Check for valid socket
   if (!m_socket)
 
   // Check for valid socket
   if (!m_socket)

-    return FALSE;
+    return false;

 
   // Check for valid timeout value.
   if (seconds != -1)
 
   // Check for valid timeout value.
   if (seconds != -1)


@@ -617,6 +697,10 @@ bool wxSocketBase::_Wait(long seconds,
   else
     timeout = m_timeout * 1000;
 
   else
     timeout = m_timeout * 1000;
 

+#if !defined(wxUSE_GUI) || !wxUSE_GUI
+  m_socket->SetTimeout(timeout);
+#endif
+

   // Wait in an active polling loop.
   //
   // NOTE: We duplicate some of the code in OnRequest, but this doesn't
   // Wait in an active polling loop.
   //
   // NOTE: We duplicate some of the code in OnRequest, but this doesn't


@@ -628,42 +712,42 @@ bool wxSocketBase::_Wait(long seconds,
   // we are just polling). Also, if just polling, do not yield.
 
   wxStopWatch chrono;
   // we are just polling). Also, if just polling, do not yield.
 
   wxStopWatch chrono;

-  bool done = FALSE;
+  bool done = false;

 
   while (!done)
   {
 
   while (!done)
   {

-    result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);
+    result = m_socket->Select(flags | GSOCK_LOST_FLAG);

 
     // Incoming connection (server) or connection established (client)
     if (result & GSOCK_CONNECTION_FLAG)
     {
 
     // Incoming connection (server) or connection established (client)
     if (result & GSOCK_CONNECTION_FLAG)
     {

-      m_connected = TRUE;
-      m_establishing = FALSE;
-      return TRUE;
+      m_connected = true;
+      m_establishing = false;
+      return true;

     }
 
     // Data available or output buffer ready
     if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
     {
     }
 
     // Data available or output buffer ready
     if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
     {

-      return TRUE;
+      return true;

     }
 
     // Connection lost
     if (result & GSOCK_LOST_FLAG)
     {
     }
 
     // Connection lost
     if (result & GSOCK_LOST_FLAG)
     {

-      m_connected = FALSE;
-      m_establishing = FALSE;
+      m_connected = false;
+      m_establishing = false;

       return (flags & GSOCK_LOST_FLAG) != 0;
     }
 
     // Wait more?
     if ((!timeout) || (chrono.Time() > timeout) || (m_interrupt))
       return (flags & GSOCK_LOST_FLAG) != 0;
     }
 
     // Wait more?
     if ((!timeout) || (chrono.Time() > timeout) || (m_interrupt))

-      done = TRUE;
+      done = true;

     else
       PROCESS_EVENTS();
   }
 
     else
       PROCESS_EVENTS();
   }
 

-  return FALSE;
+  return false;

 }
 
 bool wxSocketBase::Wait(long seconds, long milliseconds)
 }
 
 bool wxSocketBase::Wait(long seconds, long milliseconds)


@@ -678,17 +762,18 @@ bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
 {
   // Check pushback buffer before entering _Wait
   if (m_unread)
 {
   // Check pushback buffer before entering _Wait
   if (m_unread)

-    return TRUE;
+    return true;

 
   // Note that GSOCK_INPUT_LOST has to be explicitly passed to
   // _Wait becuase of the semantics of WaitForRead: a return
 
   // Note that GSOCK_INPUT_LOST has to be explicitly passed to
   // _Wait becuase of the semantics of WaitForRead: a return

-  // value of TRUE means that a GSocket_Read call will return
+  // value of true means that a GSocket_Read call will return

   // immediately, not that there is actually data to read.
 
   return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
                                       GSOCK_LOST_FLAG);
 }
 
   // immediately, not that there is actually data to read.
 
   return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
                                       GSOCK_LOST_FLAG);
 }
 

+

 bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
 {
   return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);
 bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
 {
   return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);


@@ -712,13 +797,19 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
   GAddress *peer;
 
   if (!m_socket)
   GAddress *peer;
 
   if (!m_socket)

-    return FALSE;
+    return false;
+
+  peer = m_socket->GetPeer();
+
+    // copying a null address would just trigger an assert anyway
+
+  if (!peer)
+    return false;

 
 

-  peer = GSocket_GetPeer(m_socket);

   addr_man.SetAddress(peer);
   GAddress_destroy(peer);
 
   addr_man.SetAddress(peer);
   GAddress_destroy(peer);
 

-  return TRUE;
+  return true;

 }
 
 bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 }
 
 bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const


@@ -726,13 +817,13 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
   GAddress *local;
 
   if (!m_socket)
   GAddress *local;
 
   if (!m_socket)

-    return FALSE;
+    return false;

 
 

-  local = GSocket_GetLocal(m_socket);
+  local = m_socket->GetLocal();

   addr_man.SetAddress(local);
   GAddress_destroy(local);
 
   addr_man.SetAddress(local);
   GAddress_destroy(local);
 

-  return TRUE;
+  return true;

 }
 
 //
 }
 
 //


@@ -749,35 +840,27 @@ void wxSocketBase::SaveState()
   state->m_notify     = m_notify;
   state->m_eventmask  = m_eventmask;
   state->m_clientData = m_clientData;
   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);
 }
 
 void wxSocketBase::RestoreState()
 {
 
   m_states.Append(state);
 }
 
 void wxSocketBase::RestoreState()
 {

-  wxNode *node;
+  wxList::compatibility_iterator node;

   wxSocketState *state;
 
   wxSocketState *state;
 

-  node = m_states.Last();
+  node = m_states.GetLast();

   if (!node)
     return;
 
   if (!node)
     return;
 

-  state = (wxSocketState *)node->Data();
+  state = (wxSocketState *)node->GetData();

 
   m_flags      = state->m_flags;
   m_notify     = state->m_notify;
   m_eventmask  = state->m_eventmask;
   m_clientData = state->m_clientData;
 
   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;
+  m_states.Erase(node);

   delete state;
 }
 
   delete state;
 }
 


@@ -790,7 +873,7 @@ void wxSocketBase::SetTimeout(long seconds)
   m_timeout = seconds;
 
   if (m_socket)
   m_timeout = seconds;
 
   if (m_socket)

-    GSocket_SetTimeout(m_socket, m_timeout * 1000);
+    m_socket->SetTimeout(m_timeout * 1000);

 }
 
 void wxSocketBase::SetFlags(wxSocketFlags flags)
 }
 
 void wxSocketBase::SetFlags(wxSocketFlags flags)


@@ -799,30 +882,6 @@ void wxSocketBase::SetFlags(wxSocketFlags flags)
 }
 
 
 }
 
 

-// --------------------------------------------------------------------------
-// Callbacks (now obsolete - use events instead)
-// --------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY
-
-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
-{
-  wxSockCbk old_cbk = cbk_;
-
-  m_cbk = cbk_;
-  return old_cbk;
-}
-
-char *wxSocketBase::CallbackData(char *data)
-{
-  char *old_data = m_cdata;
-
-  m_cdata = data;
-  return old_data;
-}
-
-#endif // WXWIN_COMPATIBILITY
-

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


@@ -845,9 +904,10 @@ char *wxSocketBase::CallbackData(char *data)
 // decoupled from wx_socket_callback and thus they suffer from a variety
 // of problems. Avoid them where possible and use events instead.
 
 // 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),
-                                           GSocketEvent notification,
-                                           char *cdata)
+extern "C"
+void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
+                                    GSocketEvent notification,
+                                    char *cdata)

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


@@ -864,8 +924,8 @@ void wxSocketBase::OnRequest(wxSocketNotify notification)
   switch(notification)
   {
     case wxSOCKET_CONNECTION:
   switch(notification)
   {
     case wxSOCKET_CONNECTION:

-      m_establishing = FALSE;
-      m_connected = TRUE;
+      m_establishing = false;
+      m_connected = true;

       break;
 
     // If we are in the middle of a R/W operation, do not
       break;
 
     // If we are in the middle of a R/W operation, do not


@@ -873,18 +933,18 @@ void wxSocketBase::OnRequest(wxSocketNotify notification)
     // which are no longer valid.
 
     case wxSOCKET_INPUT:
     // which are no longer valid.
 
     case wxSOCKET_INPUT:

-      if (m_reading || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
+      if (m_reading || !m_socket->Select(GSOCK_INPUT_FLAG))

         return;
       break;
 
     case wxSOCKET_OUTPUT:
         return;
       break;
 
     case wxSOCKET_OUTPUT:

-      if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
+      if (m_writing || !m_socket->Select(GSOCK_OUTPUT_FLAG))

         return;
       break;
 
     case wxSOCKET_LOST:
         return;
       break;
 
     case wxSOCKET_LOST:

-      m_connected = FALSE;
-      m_establishing = FALSE;
+      m_connected = false;
+      m_establishing = false;

       break;
 
     default:
       break;
 
     default:


@@ -893,13 +953,17 @@ void wxSocketBase::OnRequest(wxSocketNotify notification)
 
   // Schedule the event
 
 
   // Schedule the event
 

-  wxSocketEventFlags flag = -1;
+  wxSocketEventFlags flag = 0;
+  wxUnusedVar(flag);

   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;
   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;

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

   }
 
   if (((m_eventmask & flag) == flag) && m_notify)
   }
 
   if (((m_eventmask & flag) == flag) && m_notify)


@@ -913,11 +977,6 @@ void wxSocketBase::OnRequest(wxSocketNotify notification)
 
       m_handler->AddPendingEvent(event);
     }
 
       m_handler->AddPendingEvent(event);
     }

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

   }
 }
 
   }
 }
 


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

-// wxSocketServer                             
+// wxSocketServer

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


@@ -1001,26 +1060,37 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
                                wxSocketFlags flags)
               : wxSocketBase(flags, wxSOCKET_SERVER)
 {
                                wxSocketFlags flags)
               : wxSocketBase(flags, wxSOCKET_SERVER)
 {

-  // Create the socket
-  m_socket = GSocket_new();
+    wxLogTrace( wxTRACE_Socket, _T("Opening wxSocketServer") );

 
 

-  if (!m_socket)
-    return;
+    m_socket = GSocket_new();

 
 

-  // Setup the socket as server
-  GSocket_SetLocal(m_socket, addr_man.GetAddress());
-  if (GSocket_SetServer(m_socket) != GSOCK_NOERROR)
-  {
-    GSocket_destroy(m_socket);
-    m_socket = NULL;
-    return;
-  }
+    if (!m_socket)
+    {
+        wxLogTrace( wxTRACE_Socket, _T("*** GSocket_new failed") );
+        return;
+    }

 
 

-  GSocket_SetTimeout(m_socket, m_timeout * 1000);
-  GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
-                                wx_socket_callback, (char *)this);
+        // Setup the socket as server
+
+    m_socket->SetLocal(addr_man.GetAddress());
+
+    if (GetFlags() & wxSOCKET_REUSEADDR) {
+        m_socket->SetReusable();
+    }
+
+    if (m_socket->SetServer() != GSOCK_NOERROR)
+    {
+        delete m_socket;
+        m_socket = NULL;
+
+        wxLogTrace( wxTRACE_Socket, _T("*** GSocket_SetServer failed") );
+        return;
+    }

 
 

+    m_socket->SetTimeout(m_timeout * 1000);
+    m_socket->SetCallback(GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                  GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+                                  wx_socket_callback, (char *)this);

 }
 
 // --------------------------------------------------------------------------
 }
 
 // --------------------------------------------------------------------------


@@ -1032,33 +1102,33 @@ bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
   GSocket *child_socket;
 
   if (!m_socket)
   GSocket *child_socket;
 
   if (!m_socket)

-    return FALSE;
+    return false;

 
 

-  // If wait == FALSE, then the call should be nonblocking.
+  // If wait == false, then the call should be nonblocking.

   // When we are finished, we put the socket to blocking mode
   // again.
 
   if (!wait)
   // When we are finished, we put the socket to blocking mode
   // again.
 
   if (!wait)

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

 
 

-  child_socket = GSocket_WaitConnection(m_socket);
+  child_socket = m_socket->WaitConnection();

 
   if (!wait)
 
   if (!wait)

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

 
   if (!child_socket)
 
   if (!child_socket)

-    return FALSE;
+    return false;

 
   sock.m_type = wxSOCKET_BASE;
   sock.m_socket = child_socket;
 
   sock.m_type = wxSOCKET_BASE;
   sock.m_socket = child_socket;

-  sock.m_connected = TRUE;
+  sock.m_connected = true;

 
 

-  GSocket_SetTimeout(sock.m_socket, sock.m_timeout * 1000);
-  GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+  sock.m_socket->SetTimeout(sock.m_timeout * 1000);
+  sock.m_socket->SetCallback(GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |

                                      GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                      wx_socket_callback, (char *)&sock);
 
                                      GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                      wx_socket_callback, (char *)&sock);
 

-  return TRUE;
+  return true;

 }
 
 wxSocketBase *wxSocketServer::Accept(bool wait)
 }
 
 wxSocketBase *wxSocketServer::Accept(bool wait)


@@ -1068,7 +1138,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;
 }


@@ -1078,6 +1151,27 @@ bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
   return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
 }
 
   return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
 }
 

+bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)
+{
+    if (m_socket->GetSockOpt(level, optname, optval, optlen)
+        != GSOCK_NOERROR)
+    {
+        return false;
+    }
+    return true;
+}
+
+bool wxSocketBase::SetOption(int level, int optname, const void *optval,
+                              int optlen)
+{
+    if (m_socket->SetSockOpt(level, optname, optval, optlen)
+        != GSOCK_NOERROR)
+    {
+        return false;
+    }
+    return true;
+}
+

 // ==========================================================================
 // wxSocketClient
 // ==========================================================================
 // ==========================================================================
 // wxSocketClient
 // ==========================================================================


@@ -1107,53 +1201,53 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
   {
     // Shutdown and destroy the socket
     Close();
   {
     // Shutdown and destroy the socket
     Close();

-    GSocket_destroy(m_socket);
+    delete m_socket;

   }
 
   m_socket = GSocket_new();
   }
 
   m_socket = GSocket_new();

-  m_connected = FALSE;
-  m_establishing = FALSE;
+  m_connected = false;
+  m_establishing = false;

 
   if (!m_socket)
 
   if (!m_socket)

-    return FALSE;
+    return false;

 
 

-  GSocket_SetTimeout(m_socket, m_timeout * 1000);
-  GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+  m_socket->SetTimeout(m_timeout * 1000);
+  m_socket->SetCallback(GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |

                                 GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                 wx_socket_callback, (char *)this);
 
                                 GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                 wx_socket_callback, (char *)this);
 

-  // If wait == FALSE, then the call should be nonblocking.
+  // If wait == false, then the call should be nonblocking.

   // When we are finished, we put the socket to blocking mode
   // again.
 
   if (!wait)
   // When we are finished, we put the socket to blocking mode
   // again.
 
   if (!wait)

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

 
 

-  GSocket_SetPeer(m_socket, addr_man.GetAddress());
-  err = GSocket_Connect(m_socket, GSOCK_STREAMED);
+  m_socket->SetPeer(addr_man.GetAddress());
+  err = m_socket->Connect(GSOCK_STREAMED);

 
   if (!wait)
 
   if (!wait)

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

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

-      m_establishing = TRUE;
+      m_establishing = true;

 
 

-    return FALSE;
+    return false;

   }
 
   }
 

-  m_connected = TRUE;
-  return TRUE;
+  m_connected = true;
+  return true;

 }
 
 bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {
   if (m_connected)                      // Already connected
 }
 
 bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {
   if (m_connected)                      // Already connected

-    return TRUE;
+    return true;

 
   if (!m_establishing || !m_socket)     // No connection in progress
 
   if (!m_establishing || !m_socket)     // No connection in progress

-    return FALSE;
+    return false;

 
   return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG |
                                       GSOCK_LOST_FLAG);
 
   return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG |
                                       GSOCK_LOST_FLAG);


@@ -1173,22 +1267,24 @@ wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr,
   m_socket = GSocket_new();
 
   if(!m_socket)
   m_socket = GSocket_new();
 
   if(!m_socket)

+  {
+    wxASSERT_MSG( 0, _T("datagram socket not new'd") );

     return;
     return;

-
+  }

   // Setup the socket as non connection oriented
   // Setup the socket as non connection oriented

-  GSocket_SetLocal(m_socket, addr.GetAddress());
-  if( GSocket_SetNonOriented(m_socket) != GSOCK_NOERROR )
+  m_socket->SetLocal(addr.GetAddress());
+  if( m_socket->SetNonOriented() != GSOCK_NOERROR )

   {
   {

-    GSocket_destroy(m_socket);
+    delete m_socket;

     m_socket = NULL;
     return;
   }
 
   // Initialize all stuff
     m_socket = NULL;
     return;
   }
 
   // Initialize all stuff

-  m_connected = FALSE;
-  m_establishing = FALSE;
-  GSocket_SetTimeout( m_socket, m_timeout );
-  GSocket_SetCallback( m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+  m_connected = false;
+  m_establishing = false;
+  m_socket->SetTimeout( m_timeout );
+  m_socket->SetCallback( GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |

                                  GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                  wx_socket_callback, (char*)this );
 
                                  GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                  wx_socket_callback, (char*)this );
 


@@ -1207,44 +1303,37 @@ wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
                                             const void* buf,
                                             wxUint32 nBytes )
 {
                                             const void* buf,
                                             wxUint32 nBytes )
 {

-    GSocket_SetPeer(m_socket, addr.GetAddress());
+    m_socket->SetPeer(addr.GetAddress());

     Write(buf, nBytes);
     return (*this);
 }
 
     Write(buf, nBytes);
     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 wxSocketModule : public wxModule

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxSocketModule)
-

 public:
 public:

-  bool OnInit() { return GSocket_Init(); }
-  void OnExit() { GSocket_Cleanup(); }
+    virtual bool OnInit()
+    {
+        // wxSocketBase will call GSocket_Init() itself when/if needed
+        return true;
+    }
+
+    virtual void OnExit()
+    {
+        if ( wxSocketBase::IsInitialized() )
+            wxSocketBase::Shutdown();
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSocketModule)

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
 
 #endif
   // wxUSE_SOCKETS
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
 
 #endif
   // wxUSE_SOCKETS

+
+// vi:sts=4:sw=4:et