Made wxLayoutAlgorithm more general (copes with nested sash windows)

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 221dddb8761458a9f0736cc8b599884fda71abce..80c8bf09e848954e5edeb23e38cfc7595d2a29f6 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -88,7 +88,7 @@ wxString wxHTTP::GetHeader(const wxString& header)
 {
   wxNode *node = m_headers.Find(header);
   if (!node)
-    return (char *)NULL;
+    return wxEmptyString;
 
   return *((wxString *)node->Data());
 }
@@ -166,7 +166,7 @@ bool wxHTTP::Connect(const wxString& host)
   return TRUE;
 }
 
-bool wxHTTP::Connect(wxSockAddress& addr)
+bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
   struct sockaddr *raw_addr;
   size_t len;