fixed warnings after GetFont prototype change

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

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index ff8a2935b58f3ca853f38cdb53e634db8424066e..f87227bc38346b4e64eaaf8475ad33e3d3a08ae8 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -6,44 +6,79 @@
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_HTTP_H
 #define _WX_HTTP_H
 
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_HTTP_H
 #define _WX_HTTP_H
 

-#include "wx/list.h"
+#include "wx/defs.h"
+
+#if wxUSE_PROTOCOL_HTTP
+
+#include "wx/hashmap.h"

 #include "wx/protocol/protocol.h"
 
 #include "wx/protocol/protocol.h"
 

-class WXDLLEXPORT wxHTTP : public wxProtocol {
-  DECLARE_DYNAMIC_CLASS(wxHTTP)
-  DECLARE_PROTOCOL(wxHTTP)
-protected:
-  wxProtocolError m_perr;
-  wxList m_headers;
-  bool m_read;
-  wxSockAddress *m_addr;
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap,
+                                      class WXDLLIMPEXP_NET );
+
+class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
+{

 public:
   wxHTTP();
   ~wxHTTP();
 
 public:
   wxHTTP();
   ~wxHTTP();
 

-  bool Connect(const wxString& host);
-  bool Connect(wxSockAddress& addr, bool wait);
+  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);

   bool Abort();
   wxInputStream *GetInputStream(const wxString& path);
   inline wxProtocolError GetError() { return m_perr; }
   wxString GetContentType();
 
   void SetHeader(const wxString& header, const wxString& h_data);
   bool Abort();
   wxInputStream *GetInputStream(const wxString& path);
   inline wxProtocolError GetError() { return m_perr; }
   wxString GetContentType();
 
   void SetHeader(const wxString& header, const wxString& h_data);

-  wxString GetHeader(const wxString& header);
+  wxString GetHeader(const wxString& header) const;
+  void SetPostBuffer(const wxString& post_buf);
+
+  void SetProxyMode(bool on);
+
+  int GetResponse() { return m_http_response; }

 
 protected:
 
 protected:

-  typedef enum {
+  enum wxHTTP_Req
+  {

     wxHTTP_GET,
     wxHTTP_GET,

+    wxHTTP_POST,

     wxHTTP_HEAD
     wxHTTP_HEAD

-  } wxHTTP_Req;
+  };
+
+  typedef wxStringToStringHashMap::iterator wxHeaderIterator;
+  typedef wxStringToStringHashMap::const_iterator wxHeaderConstIterator;
+

   bool BuildRequest(const wxString& path, wxHTTP_Req req);
   void SendHeaders();
   bool ParseHeaders();
   bool BuildRequest(const wxString& path, wxHTTP_Req req);
   void SendHeaders();
   bool ParseHeaders();

+
+  // find the header in m_headers
+  wxHeaderIterator FindHeader(const wxString& header);
+  wxHeaderConstIterator FindHeader(const wxString& header) const;
+
+  // deletes the header value strings
+  void ClearHeaders();
+
+  wxProtocolError m_perr;
+  wxStringToStringHashMap m_headers;
+  bool m_read,
+       m_proxy_mode;
+  wxSockAddress *m_addr;
+  wxString m_post_buf;
+  int m_http_response;
+
+  DECLARE_DYNAMIC_CLASS(wxHTTP)
+  DECLARE_PROTOCOL(wxHTTP)
+  DECLARE_NO_COPY_CLASS(wxHTTP)

 };
 
 };
 

-#endif
+#endif // wxUSE_PROTOCOL_HTTP
+
+#endif // _WX_HTTP_H
+