X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..e6adf05834e880312efa3d59914ecc1d4f5f78a6:/src/common/sckaddr.cpp diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index fff40bef7d..93e0ab3266 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -30,22 +30,21 @@ #include #endif -#include -#include -#include -#include -#include +#include "wx/defs.h" +#include "wx/object.h" +#include "wx/log.h" +#include "wx/intl.h" +#include "wx/gsocket.h" +#include "wx/sckaddr.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress) #ifdef ENABLE_IPV6 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress) #endif -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__WXMAC__) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif -#endif // --------------------------------------------------------------------------- // wxIPV4address @@ -103,12 +102,13 @@ wxIPV4address::~wxIPV4address() bool wxIPV4address::Hostname(const wxString& name) { // Some people are sometimes fool. - if (name == wxT("")) { - wxLogWarning( wxT("Trying to solve a NULL hostname: giving up") ); + if (name == wxT("")) + { + wxLogWarning( _("Trying to solve a NULL hostname: giving up") ); return FALSE; } - return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR); + return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR); } bool wxIPV4address::Hostname(unsigned long addr) @@ -118,7 +118,7 @@ bool wxIPV4address::Hostname(unsigned long addr) bool wxIPV4address::Service(const wxString& name) { - return (GAddress_INET_SetPortName(m_address, name.fn_str(), "tcp") == GSOCK_NOERROR); + return (GAddress_INET_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR); } bool wxIPV4address::Service(unsigned short port) @@ -131,6 +131,11 @@ bool wxIPV4address::LocalHost() return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR); } +bool wxIPV4address::AnyAddress() +{ + return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR); +} + wxString wxIPV4address::Hostname() { char hostname[1024]; @@ -196,7 +201,7 @@ unsigned short wxIPV6address::Service() #endif -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__WXMAC__) // --------------------------------------------------------------------------- // wxUNIXaddress // ---------------------------------------------------------------------------