documented the wxDCBrushChanger, wxDCPenChanger, wxDCTextColourChanger; introduced...

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 6826063517a1e61a425dded4ebf63c2c10cf3c8f..2487fddcfb76b08aa7408bf97d807a8975cd4609 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -210,6 +210,15 @@ GSocketBase::~GSocketBase()
     GSocketManager::Get()->Destroy_Socket(static_cast<GSocket *>(this));
 }
 
+void GSocketBase::Close()
+{
+    if ( m_fd != INVALID_SOCKET )
+    {
+        GSocketManager::Get()->Close_Socket(static_cast<GSocket *>(this));
+        m_fd = INVALID_SOCKET;
+    }
+}
+
 /* GSocket_Shutdown:
  *  Disallow further read/write operations on this socket, close
  *  the fd and disable all callbacks.
@@ -231,12 +240,8 @@ void GSocketBase::Shutdown()
  */
 void GSocketBase::SetTimeout(unsigned long millis)
 {
-#ifdef __WXMSW__
     m_timeout.tv_sec  = (millis / 1000);
     m_timeout.tv_usec = (millis % 1000) * 1000;
-#else
-    m_timeout = millis;
-#endif
 }
 
 void GSocketBase::NotifyOnStateChange(GSocketEvent event)