Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 048fe30407062d7cb71e4c528a9b4e5333b39b95..e90a3b7cb57f95bdd4f687691dc49200e70d1128 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -32,14 +32,14 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/timer.h"
+    #include "wx/module.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"

-#include "wx/timer.h"
-#include "wx/module.h"

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

-#include "wx/datetime.h"
+#include "wx/stopwatch.h"

 
 // DLL options compatibility check:
 #include "wx/build.h"
 
 // DLL options compatibility check:
 #include "wx/build.h"


@@ -330,11 +330,9 @@ wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
 
   // Return now in one of the following cases:
   // - the socket is invalid,
 
   // 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.
+  // - we got all the data

   if ( !m_socket ||
   if ( !m_socket ||

-       !nbytes ||
-       ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )
+       !nbytes )

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


@@ -682,7 +680,7 @@ bool wxSocketBase::_Wait(long seconds,
                          wxSocketEventFlags flags)
 {
   GSocketEventFlags result;
                          wxSocketEventFlags flags)
 {
   GSocketEventFlags result;

-  long timeout;
+  long timeout; // in ms

 
   // Set this to true to interrupt ongoing waits
   m_interrupt = false;
 
   // Set this to true to interrupt ongoing waits
   m_interrupt = false;


@@ -709,8 +707,7 @@ bool wxSocketBase::_Wait(long seconds,
   // 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.
 

-  wxDateTime current_time = wxDateTime::UNow();
-  unsigned int time_limit = (current_time.GetTicks() * 1000) + current_time.GetMillisecond() + timeout;
+  const wxMilliClock_t time_limit = wxGetLocalTimeMillis() + timeout;

   bool done = false;
   bool valid_result = false;
 
   bool done = false;
   bool valid_result = false;
 


@@ -754,8 +751,7 @@ bool wxSocketBase::_Wait(long seconds,
     }
 
     // Wait more?
     }
 
     // Wait more?

-    current_time = wxDateTime::UNow();
-    int time_left = time_limit - ((current_time.GetTicks() * 1000) + current_time.GetMillisecond());
+    long time_left = wxMilliClockToLong(time_limit - wxGetLocalTimeMillis());

     if ((!timeout) || (time_left <= 0) || (m_interrupt))
       done = true;
     else
     if ((!timeout) || (time_left <= 0) || (m_interrupt))
       done = true;
     else


@@ -1107,6 +1103,12 @@ wxSocketServer::wxSocketServer(const wxSockAddress& addr_man,
     if (GetFlags() & wxSOCKET_REUSEADDR) {
         m_socket->SetReusable();
     }
     if (GetFlags() & wxSOCKET_REUSEADDR) {
         m_socket->SetReusable();
     }

+    if (GetFlags() & wxSOCKET_BROADCAST) {
+        m_socket->SetBroadcast();
+    }
+    if (GetFlags() & wxSOCKET_NOBIND) {
+        m_socket->DontDoBind();
+    }

 
     if (m_socket->SetServer() != GSOCK_NOERROR)
     {
 
     if (m_socket->SetServer() != GSOCK_NOERROR)
     {


@@ -1277,6 +1279,14 @@ bool wxSocketClient::DoConnect(wxSockAddress& addr_man, wxSockAddress* local, bo
   {
     m_socket->SetReusable();
   }
   {
     m_socket->SetReusable();
   }

+  if (GetFlags() & wxSOCKET_BROADCAST)
+  {
+    m_socket->SetBroadcast();
+  }
+  if (GetFlags() & wxSOCKET_NOBIND)
+  {
+    m_socket->DontDoBind();
+  }

 
   // If no local address was passed and one has been set, use the one that was Set
   if (!local && m_localAddress.GetAddress())
 
   // If no local address was passed and one has been set, use the one that was Set
   if (!local && m_localAddress.GetAddress())


@@ -1346,14 +1356,26 @@ wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr,
     // Create the socket
     m_socket = GSocket_new();
 
     // Create the socket
     m_socket = GSocket_new();
 

-    if(!m_socket)
+    if (!m_socket)

     {
         wxFAIL_MSG( _T("datagram socket not new'd") );
         return;
     }
     // Setup the socket as non connection oriented
     m_socket->SetLocal(addr.GetAddress());
     {
         wxFAIL_MSG( _T("datagram socket not new'd") );
         return;
     }
     // Setup the socket as non connection oriented
     m_socket->SetLocal(addr.GetAddress());

-    if( m_socket->SetNonOriented() != GSOCK_NOERROR )
+    if (flags & wxSOCKET_REUSEADDR)
+    {
+        m_socket->SetReusable();
+    }
+    if (GetFlags() & wxSOCKET_BROADCAST)
+    {
+        m_socket->SetBroadcast();
+    }
+    if (GetFlags() & wxSOCKET_NOBIND)
+    {
+        m_socket->DontDoBind();
+    }
+    if ( m_socket->SetNonOriented() != GSOCK_NOERROR )

     {
         delete m_socket;
         m_socket = NULL;
     {
         delete m_socket;
         m_socket = NULL;