add GetSize also to wxGDIImage since wxBitmap under some ports derives from wxGDIImag...

[wxWidgets.git] / include / wx / protocol / http.h

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 89b805ad62a9a3a548b3097854c8f0a381bbd2ab..29f727451f86eb67c8c9db610a1839c59370fb0c 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -2,11 +2,11 @@
 // Name:        http.h
 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux
-// Modified by:
+// Modified by: Simo Virokannas (authentication, Dec 2005)
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_HTTP_H
 #define _WX_HTTP_H
@@ -25,11 +25,11 @@ class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
 {
 public:
   wxHTTP();
-  ~wxHTTP();
+  virtual ~wxHTTP();
 
   virtual bool Connect(const wxString& host, unsigned short port);
   virtual bool Connect(const wxString& host) { return Connect(host, 0); }
-  virtual bool Connect(wxSockAddress& addr, bool wait);
+  virtual bool Connect(const wxSockAddress& addr, bool wait);
   bool Abort();
   wxInputStream *GetInputStream(const wxString& path);
   inline wxProtocolError GetError() { return m_perr; }
@@ -43,6 +43,9 @@ public:
 
   int GetResponse() { return m_http_response; }
 
+  virtual void SetUser(const wxString& user) { m_username = user; }
+  virtual void SetPassword(const wxString& passwd ) { m_password = passwd; }
+
 protected:
   enum wxHTTP_Req
   {
@@ -58,6 +61,8 @@ protected:
   void SendHeaders();
   bool ParseHeaders();
 
+  wxString GenerateAuthString(const wxString& user, const wxString& pass) const;
+
   // find the header in m_headers
   wxHeaderIterator FindHeader(const wxString& header);
   wxHeaderConstIterator FindHeader(const wxString& header) const;
@@ -72,6 +77,8 @@ protected:
   wxSockAddress *m_addr;
   wxString m_post_buf;
   int m_http_response;
+  wxString m_username;
+  wxString m_password;
 
   DECLARE_DYNAMIC_CLASS(wxHTTP)
   DECLARE_PROTOCOL(wxHTTP)