X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c058d771426b4843f9096f68f919f5630b6f5879..bd5dd95757ce697f95a39cfc6f346fe93421bc36:/include/wx/protocol/protocol.h

diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index d0126a922b..f9d105406d 100644
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -53,7 +53,7 @@ protected:
 
   friend class wxURL;
 public:
-  wxProtoInfo(const char *name, const char *serv_name, const bool need_host1,
+  wxProtoInfo(const wxChar *name, const wxChar *serv_name, const bool need_host1,
               wxClassInfo *info);
 };
 
@@ -63,13 +63,13 @@ public:
   wxProtocol();
 
   bool Reconnect();
-  virtual bool Connect( const wxString& WXUNUSED(host) ) { return FALSE; } 
-  virtual bool Connect( wxSockAddress& addr) { return wxSocketClient::Connect(addr); }
+  virtual bool Connect( const wxString& WXUNUSED(host) ) { return FALSE; }
+  virtual bool Connect( wxSockAddress& addr, bool WXUNUSED(wait) = TRUE) { return wxSocketClient::Connect(addr); }
 
   virtual bool Abort() = 0;
   virtual wxInputStream *GetInputStream(const wxString& path) = 0;
   virtual wxProtocolError GetError() = 0;
-  virtual wxString GetContentType() { return (char *)NULL; }
+  virtual wxString GetContentType() { return wxEmptyString; }
   virtual void SetUser(const wxString& WXUNUSED(user)) {}
   virtual void SetPassword(const wxString& WXUNUSED(passwd) ) {}
 };