Missed defs.h inclusion.

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

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 4abcaf5951db5a7788cccc1c6860b0928ef04afc..f87227bc38346b4e64eaaf8475ad33e3d3a08ae8 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -18,48 +18,64 @@
 #include "wx/hashmap.h"
 #include "wx/protocol/protocol.h"
 
 #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 {
-  DECLARE_DYNAMIC_CLASS(wxHTTP)
-  DECLARE_PROTOCOL(wxHTTP)
-protected:
-  wxProtocolError m_perr;
-  wxStringToStringHashMap m_headers;
-  bool m_read, m_proxy_mode;
-  wxSockAddress *m_addr;
-  wxString m_post_buf;
+class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
+{

 public:
   wxHTTP();
   ~wxHTTP();
 
 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; }
   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);
 
   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_POST,
     wxHTTP_HEAD
     wxHTTP_GET,
     wxHTTP_POST,
     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();
 
   // deletes the header value strings
   void ClearHeaders();
 

-    DECLARE_NO_COPY_CLASS(wxHTTP)
+  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 // wxUSE_PROTOCOL_HTTP
 };
 
 #endif // wxUSE_PROTOCOL_HTTP