wxComboControl and wxOwnerDrawnComboBox (patch 1479938)

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 8e87adb874b6f2ef0f66b4db40d965b390c55373..048fe30407062d7cb71e4c528a9b4e5333b39b95 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -17,24 +17,28 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_SOCKETS
 
-#include "wx/app.h"
+#include "wx/socket.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+#endif
+
 #include "wx/apptrait.h"
-#include "wx/object.h"
-#include "wx/string.h"
 #include "wx/timer.h"
-#include "wx/utils.h"
 #include "wx/module.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/event.h"
 
 #include "wx/sckaddr.h"
-#include "wx/socket.h"
 #include "wx/datetime.h"
 
 // DLL options compatibility check:
@@ -693,7 +697,7 @@ bool wxSocketBase::_Wait(long seconds,
   else
     timeout = m_timeout * 1000;
 
-  bool has_event_loop = wxTheApp ? (wxTheApp->GetTraits() ? true : false) : false;
+  bool has_event_loop = wxTheApp->GetTraits() ? (wxTheApp->GetTraits()->GetSocketGUIFunctionsTable() ? true : false) : false;
 
   // Wait in an active polling loop.
   //
@@ -710,7 +714,7 @@ bool wxSocketBase::_Wait(long seconds,
   bool done = false;
   bool valid_result = false;
 
-  if (!has_event_loop) 
+  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.
@@ -756,11 +760,11 @@ bool wxSocketBase::_Wait(long seconds,
       done = true;
     else
     {
-      if (has_event_loop) 
+      if (has_event_loop)
       {
           PROCESS_EVENTS();
       }
-      else 
+      else
       {
         // If there's less than 50 ms left, just call select with that timeout.
         if (time_left < 50)
@@ -1193,7 +1197,7 @@ bool wxSocketBase::SetOption(int level, int optname, const void *optval,
                               int optlen)
 {
     wxASSERT_MSG( m_socket, _T("Socket not initialised") );
-    
+
     if (m_socket->SetSockOpt(level, optname, optval, optlen)
         != GSOCK_NOERROR)
     {
@@ -1379,7 +1383,7 @@ wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr,
                                             wxUint32 nBytes )
 {
     wxASSERT_MSG( m_socket, _T("Socket not initialised") );
-    
+
     m_socket->SetPeer(addr.GetAddress());
     Write(buf, nBytes);
     return (*this);