X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1c70641a30f79b0b318dea5944ccfde6451d780..138618acb91e2a879a735c5806f9f728220f14df:/include/wx/sckaddr.h?ds=inline diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h index 25ee60d498..a780b3a716 100644 --- a/include/wx/sckaddr.h +++ b/include/wx/sckaddr.h @@ -12,8 +12,8 @@ #ifndef _WX_NETWORK_ADDRESS_H #define _WX_NETWORK_ADDRESS_H -#ifdef __GNUG__ -#pragma interface +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma interface "sckaddr.h" #endif #include "wx/defs.h" @@ -30,25 +30,33 @@ public: typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr; wxSockAddress(); + wxSockAddress(const wxSockAddress& other); virtual ~wxSockAddress(); + wxSockAddress& operator=(const wxSockAddress& other); + virtual void Clear(); virtual int Type() = 0; GAddress *GetAddress() const { return m_address; } void SetAddress(GAddress *address); - const wxSockAddress& operator =(const wxSockAddress& addr); - void CopyObject(wxObject& dest) const; + // we need to be able to create copies of the addresses polymorphically (i.e. + // without knowing the exact address class) + virtual wxSockAddress *Clone() const = 0; protected: GAddress *m_address; + +private: + void Init(); }; class WXDLLEXPORT wxIPV4address : public wxSockAddress { DECLARE_DYNAMIC_CLASS(wxIPV4address) public: wxIPV4address(); + wxIPV4address(const wxIPV4address& other); virtual ~wxIPV4address(); bool Hostname(const wxString& name); @@ -56,11 +64,17 @@ public: bool Service(const wxString& name); bool Service(unsigned short port); bool LocalHost(); + bool AnyAddress(); wxString Hostname(); + wxString OrigHostname() { return m_origHostname; } unsigned short Service(); - inline int Type() { return wxSockAddress::IPV4; } + virtual int Type() { return wxSockAddress::IPV4; } + virtual wxSockAddress *Clone() const; + +private: + wxString m_origHostname; }; #ifdef ENABLE_IPV6 @@ -70,7 +84,8 @@ private: struct sockaddr_in6 *m_addr; public: wxIPV6address(); - ~wxIPV6address(); + wxIPV6address(const wxIPV6address& other); + virtual ~wxIPV6address(); bool Hostname(const wxString& name); bool Hostname(unsigned char addr[16]); @@ -81,11 +96,12 @@ public: wxString Hostname() const; unsigned short Service() const; - inline int Type() { return wxSockAddress::IPV6; } + virtual int Type() { return wxSockAddress::IPV6; } + virtual wxSockAddress *Clone() const { return new wxIPV6address(*this); } }; #endif -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) #include #ifndef __VMS__ # include @@ -97,12 +113,14 @@ private: struct sockaddr_un *m_addr; public: wxUNIXaddress(); - ~wxUNIXaddress(); + wxUNIXaddress(const wxUNIXaddress& other); + virtual ~wxUNIXaddress(); void Filename(const wxString& name); wxString Filename(); - inline int Type() { return wxSockAddress::UNIX; } + virtual int Type() { return wxSockAddress::UNIX; } + virtual wxSockAddress *Clone() const { return new wxUNIXaddress(*this); } }; #endif // __UNIX__