Added some tentative wxMotif clipboard code; did some file formatting

[wxWidgets.git] / include / wx / url.h

diff --git a/include/wx/url.h b/include/wx/url.h
index dae1c6ec308b1fdaea6bb31e93d60080d4d8d456..f37d4a9d9097a2a246b28a16ec80d75b2f217ded 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -36,12 +36,13 @@ class WXDLLEXPORT wxURL : public wxObject {
   DECLARE_DYNAMIC_CLASS(wxURL)
 protected:
   static wxProtoInfo *g_protocols;
   DECLARE_DYNAMIC_CLASS(wxURL)
 protected:
   static wxProtoInfo *g_protocols;

-  static wxHTTP g_proxy;
+  static wxHTTP *g_proxy;

   wxProtoInfo *m_protoinfo;
   wxProtocol *m_protocol;
   wxHTTP m_proxy;
   wxURLError m_error;
   wxString m_protoname, m_hostname, m_servname, m_path, m_url;
   wxProtoInfo *m_protoinfo;
   wxProtocol *m_protocol;
   wxHTTP m_proxy;
   wxURLError m_error;
   wxString m_protoname, m_hostname, m_servname, m_path, m_url;

+  wxString m_user, m_password;

 
   bool PrepProto(wxString& url);
   bool PrepHost(wxString& url);
 
   bool PrepProto(wxString& url);
   bool PrepHost(wxString& url);


@@ -51,6 +52,7 @@ protected:
   bool FetchProtocol();
 
   friend class wxProtoInfo;
   bool FetchProtocol();
 
   friend class wxProtoInfo;

+  friend class wxProtocolModule;

 public:
 
   wxURL(const wxString& url);
 public:
 
   wxURL(const wxString& url);