First step in background erase optimization

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

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 05ab817ac5f02c9e6109fd5ca33f10d336d98cd2..f87227bc38346b4e64eaaf8475ad33e3d3a08ae8 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -18,16 +18,18 @@
 #include "wx/hashmap.h"
 #include "wx/protocol/protocol.h"
 
-WX_DECLARE_EXPORTED_STRING_HASH_MAP( wxString, wxStringToStringHashMap );
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap,
+                                      class WXDLLIMPEXP_NET );
 
-class WXDLLIMPEXP_BASE wxHTTP : public wxProtocol
+class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
 {
 public:
   wxHTTP();
   ~wxHTTP();
 
-  bool Connect(const wxString& host, unsigned short port = 0);
-  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; }
@@ -39,6 +41,8 @@ public:
 
   void SetProxyMode(bool on);
 
+  int GetResponse() { return m_http_response; }
+
 protected:
   enum wxHTTP_Req
   {
@@ -48,13 +52,15 @@ protected:
   };
 
   typedef wxStringToStringHashMap::iterator wxHeaderIterator;
+  typedef wxStringToStringHashMap::const_iterator wxHeaderConstIterator;
 
   bool BuildRequest(const wxString& path, wxHTTP_Req req);
   void SendHeaders();
   bool ParseHeaders();
 
   // find the header in m_headers
-  wxHeaderIterator FindHeader(const wxString& header) const;
+  wxHeaderIterator FindHeader(const wxString& header);
+  wxHeaderConstIterator FindHeader(const wxString& header) const;
 
   // deletes the header value strings
   void ClearHeaders();
@@ -65,6 +71,7 @@ protected:
        m_proxy_mode;
   wxSockAddress *m_addr;
   wxString m_post_buf;
+  int m_http_response;
 
   DECLARE_DYNAMIC_CLASS(wxHTTP)
   DECLARE_PROTOCOL(wxHTTP)