Allow entering minus sign in wxMSW wxSpinCtrl if needed.

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 0bb79b219f3baa8b5aa621196c91a5a8cf0d2bfb..7e1aafd4a200e82cd4ea6665fee8e28bf7669d2d 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1355,8 +1355,10 @@ wxSocketBase::DoWait(long timeout, wxSocketEventFlags flags)
 {
     wxCHECK_MSG( m_impl, -1, "can't wait on invalid socket" );
 
-    // we're never going to become ready if we're not connected (any more)
-    if ( !m_connected && !m_establishing )
+    // we're never going to become ready in a client if we're not connected any
+    // more (OTOH a server can call this to precisely wait for a connection so
+    // do wait for it in this case)
+    if ( !m_impl->IsServer() && !m_connected && !m_establishing )
         return -1;
 
     // This can be set to true from Interrupt() to exit this function a.s.a.p.
@@ -2079,4 +2081,9 @@ wxFORCE_LINK_MODULE( socketiohandler )
     wxFORCE_LINK_MODULE( mswsocket )
 #endif
 
+// and for OSXManagerSetter in the OS X one
+#ifdef __WXMAC__
+    wxFORCE_LINK_MODULE( osxsocket )
+#endif
+
 #endif // wxUSE_SOCKETS