X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9bccf239c1506c7eea0bddea44d9e4b76ad1d93..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/private/sckaddr.h diff --git a/include/wx/private/sckaddr.h b/include/wx/private/sckaddr.h index eafa8fdccb..bb6b30c679 100644 --- a/include/wx/private/sckaddr.h +++ b/include/wx/private/sckaddr.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/private/sockaddr.h +// Name: wx/private/sckaddr.h // Purpose: wxSockAddressImpl // Author: Vadim Zeitlin // Created: 2008-12-28 @@ -11,8 +11,12 @@ #ifndef _WX_PRIVATE_SOCKADDR_H_ #define _WX_PRIVATE_SOCKADDR_H_ -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" + + #if wxUSE_IPV6 + #include + #endif #elif defined(__VMS__) #include @@ -22,6 +26,7 @@ u_char sun_family; /* AF_UNIX */ char sun_path[108]; /* path name (gag) */ }; + #include #else // generic Unix #include #include @@ -132,10 +137,11 @@ public: wxSockAddressImpl& operator=(const wxSockAddressImpl& other) { - free(m_addr); - - InitFromOther(other); - + if (this != &other) + { + free(m_addr); + InitFromOther(other); + } return *this; } @@ -161,6 +167,30 @@ public: #ifdef wxHAS_UNIX_DOMAIN_SOCKETS void CreateUnix(); #endif // wxHAS_UNIX_DOMAIN_SOCKETS + void Create(Family family) + { + switch ( family ) + { + case FAMILY_INET: + CreateINET(); + break; + +#if wxUSE_IPV6 + case FAMILY_INET6: + CreateINET6(); + break; +#endif // wxUSE_IPV6 + +#ifdef wxHAS_UNIX_DOMAIN_SOCKETS + case FAMILY_UNIX: + CreateUnix(); + break; +#endif // wxHAS_UNIX_DOMAIN_SOCKETS + + default: + wxFAIL_MSG( "unsupported socket address family" ); + } + } // simple accessors Family GetFamily() const { return m_family; }