projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert Ron's removal of the reserved functions.
[wxWidgets.git]
/
include
/
wx
/
url.h
diff --git
a/include/wx/url.h
b/include/wx/url.h
index 59d8428060fdcaa038e872d5b85bf82d09d473e1..d242169b3339e9d7ce5d1ba2d5210eacc3ddfeb0 100644
(file)
--- a/
include/wx/url.h
+++ b/
include/wx/url.h
@@
-2,7
+2,7
@@
// Name: url.h
// Purpose: URL parser
// Author: Guilhem Lavaux
// Name: url.h
// Purpose: URL parser
// Author: Guilhem Lavaux
-// Modified by:
+// Modified by:
Ryan Norton
// Created: 20/07/1997
// RCS-ID: $Id$
// Copyright: (c) 1997, 1998 Guilhem Lavaux
// Created: 20/07/1997
// RCS-ID: $Id$
// Copyright: (c) 1997, 1998 Guilhem Lavaux
@@
-20,7
+20,7
@@
#if wxUSE_URL
#if wxUSE_URL
-#include "wx/
object
.h"
+#include "wx/
uri
.h"
#include "wx/protocol/protocol.h"
#if wxUSE_PROTOCOL_HTTP
#include "wx/protocol/protocol.h"
#if wxUSE_PROTOCOL_HTTP
@@
-48,46
+48,57
@@
public:
};
#endif // wxUSE_URL_NATIVE
};
#endif // wxUSE_URL_NATIVE
-class WXDLLIMPEXP_NET wxURL : public wx
Object
+class WXDLLIMPEXP_NET wxURL : public wx
URI
{
public:
{
public:
- wxURL(const wxString& url);
+ wxURL(const wxString& sUrl);
+ wxURL(const wxURI& url);
virtual ~wxURL();
virtual ~wxURL();
- wx
String GetProtocolName() const { return m_protoinfo->m_protoname; }
- wx
String GetHostName() const { return m_hostname; }
- wxString GetURL() const { return m_url; }
+ wx
URL& operator = (const wxString& url);
+ wx
URL& operator = (const wxURI& url);
+
wxProtocol& GetProtocol() { return *m_protocol; }
wxURLError GetError() const { return m_error; }
wxProtocol& GetProtocol() { return *m_protocol; }
wxURLError GetError() const { return m_error; }
- wxString Get
Path() const { return m_path
; }
+ wxString Get
URL() const { return m_url
; }
wxInputStream *GetInputStream();
wxInputStream *GetInputStream();
-#if wxUSE_
SOCKETS
+#if wxUSE_
PROTOCOL_HTTP
static void SetDefaultProxy(const wxString& url_proxy);
void SetProxy(const wxString& url_proxy);
static void SetDefaultProxy(const wxString& url_proxy);
void SetProxy(const wxString& url_proxy);
-#endif // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
+
+#if WXWIN_COMPATIBILITY_2_4
+ //Use the proper wxURI accessors instead
+ wxDEPRECATED( wxString GetProtocolName() const );
+ wxDEPRECATED( wxString GetHostName() const );
+ wxDEPRECATED( wxString GetPath() const );
- static wxString ConvertToValidURI(
+ //Use wxURI instead - this does not work that well
+ wxDEPRECATED( static wxString ConvertToValidURI(
const wxString& uri,
const wxChar* delims = wxT(";/?:@&=+$,")
const wxString& uri,
const wxChar* delims = wxT(";/?:@&=+$,")
- );
- static wxString ConvertFromURI(const wxString& uri);
+ ) );
+
+ //Use wxURI::Unescape instead
+ wxDEPRECATED( static wxString ConvertFromURI(const wxString& uri) );
+#endif
protected:
static wxProtoInfo *ms_protocols;
protected:
static wxProtoInfo *ms_protocols;
-#if wxUSE_
SOCKETS
+#if wxUSE_
PROTOCOL_HTTP
static wxHTTP *ms_proxyDefault;
static bool ms_useDefaultProxy;
wxHTTP *m_proxy;
static wxHTTP *ms_proxyDefault;
static bool ms_useDefaultProxy;
wxHTTP *m_proxy;
-#endif // wxUSE_
SOCKETS
+#endif // wxUSE_
PROTOCOL_HTTP
#if wxUSE_URL_NATIVE
friend class wxURLNativeImp;
// pointer to a native URL implementation object
wxURLNativeImp *m_nativeImp;
#if wxUSE_URL_NATIVE
friend class wxURLNativeImp;
// pointer to a native URL implementation object
wxURLNativeImp *m_nativeImp;
- // Creates on the heap and returns a native
+ // Creates on the heap and returns a native
// implementation object for the current platform.
static wxURLNativeImp *CreateNativeImpObject();
#endif
// implementation object for the current platform.
static wxURLNativeImp *CreateNativeImpObject();
#endif
@@
-95,13
+106,10
@@
protected:
wxProtocol *m_protocol;
wxURLError m_error;
wxProtocol *m_protocol;
wxURLError m_error;
- wxString m_protoname, m_hostname, m_servname, m_path, m_url;
- wxString m_user, m_password;
+ wxString m_url;
bool m_useProxy;
bool m_useProxy;
- bool PrepProto(wxString& url);
- bool PrepHost(wxString& url);
- bool PrepPath(wxString& url);
+ void Init(const wxString&);
bool ParseURL();
void CleanData();
bool FetchProtocol();
bool ParseURL();
void CleanData();
bool FetchProtocol();
@@
-110,10
+118,6
@@
protected:
friend class wxURLModule;
private:
friend class wxURLModule;
private:
- // VZ: can't use default copy ctor for this class, should write a correct
- // one! (TODO)
- DECLARE_NO_COPY_CLASS(wxURL)
-
DECLARE_DYNAMIC_CLASS(wxURL)
};
DECLARE_DYNAMIC_CLASS(wxURL)
};