don't use toupper() with non-ASCII key codes

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 4525cfa2d7acf51f3c292aab5d5dd95960abc214..05f337bfc370080d6a159340fe1cc35f3ac183bd 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -694,6 +694,8 @@ bool wxSocketBase::_Wait(long seconds,
   else
     timeout = m_timeout * 1000;
 
   else
     timeout = m_timeout * 1000;
 

+  bool has_event_loop = wxTheApp ? (wxTheApp->GetTraits() ? true : false) : false;
+

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


@@ -709,14 +711,15 @@ bool wxSocketBase::_Wait(long seconds,
   bool done = false;
   bool valid_result = false;
 
   bool done = false;
   bool valid_result = false;
 

-#if !defined(wxUSE_GUI) || !wxUSE_GUI
+  if (!has_event_loop) 
+  {

     // This is used to avoid a busy loop on wxBase - having a select
     // timeout of 50 ms per iteration should be enough.
     if (timeout > 50)
       m_socket->SetTimeout(50);
     else
       m_socket->SetTimeout(timeout);
     // This is used to avoid a busy loop on wxBase - having a select
     // timeout of 50 ms per iteration should be enough.
     if (timeout > 50)
       m_socket->SetTimeout(50);
     else
       m_socket->SetTimeout(timeout);

-#endif 
+  }

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


@@ -754,20 +757,22 @@ bool wxSocketBase::_Wait(long seconds,
       done = true;
     else
     {
       done = true;
     else
     {

-#if !defined(wxUSE_GUI) || !wxUSE_GUI
+      if (has_event_loop) 
+      {
+          PROCESS_EVENTS();
+      }
+      else 
+      {

         // If there's less than 50 ms left, just call select with that timeout.
         if (time_left < 50)
           m_socket->SetTimeout(time_left);
         // If there's less than 50 ms left, just call select with that timeout.
         if (time_left < 50)
           m_socket->SetTimeout(time_left);

-#else
-        PROCESS_EVENTS();
-#endif
-     }
+      }
+    }

   }
 
   // Set timeout back to original value (we overwrote it for polling)
   }
 
   // Set timeout back to original value (we overwrote it for polling)

-#if !defined(wxUSE_GUI) || !wxUSE_GUI
-  m_socket->SetTimeout(m_timeout*1000);
-#endif
+  if (!has_event_loop)
+    m_socket->SetTimeout(m_timeout*1000);

 
   return valid_result;
 }
 
   return valid_result;
 }


@@ -1198,13 +1203,14 @@ bool wxSocketBase::SetOption(int level, int optname, const void *optval,
     return true;
 }
 
     return true;
 }
 

-bool wxSocketBase::SetLocal(wxSockAddress& local)
+bool wxSocketBase::SetLocal(wxIPV4address& local)

 {
   GAddress* la = local.GetAddress();
 
 {
   GAddress* la = local.GetAddress();
 

+  // If the address is valid, save it for use when we call Connect

   if (la && la->m_addr)
   {
   if (la && la->m_addr)
   {

-    m_socket->SetLocal(la);
+    m_localAddress = local;

 
     return true;
   }
 
     return true;
   }


@@ -1269,6 +1275,12 @@ bool wxSocketClient::DoConnect(wxSockAddress& addr_man, wxSockAddress* local, bo
     m_socket->SetReusable();
   }
 
     m_socket->SetReusable();
   }
 

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

   // Bind to the local IP address and port, when provided
   if (local)
   {
   // Bind to the local IP address and port, when provided
   if (local)
   {