Fix wxFileSystem::FileNameToURL() for Unicode file names.

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 923dff0d490483b0af896cfb918b2203f35157d4..228fe79a28d64f10c1ab23ed31520131e77621d4 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1109,6 +1109,9 @@ wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
 {
     wxSocketReadGuard read(this);
 
+    // Peek() should never block
+    wxSocketWaitModeChanger changeFlags(this, wxSOCKET_NOWAIT);
+
     m_lcount = DoRead(buffer, nbytes);
 
     Pushback(buffer, m_lcount);
@@ -2096,7 +2099,7 @@ wxFORCE_LINK_MODULE( socketiohandler )
 #endif
 
 // and for OSXManagerSetter in the OS X one
-#ifdef __WXMAC__
+#ifdef __WXOSX__
     wxFORCE_LINK_MODULE( osxsocket )
 #endif