X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce22d615fe940444602cf4c167f9ad29361a5d25..878711c01c1b9ad5b97d35f379a048b8ce1bfb49:/src/common/sckaddr.cpp?ds=inline diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 4fd8ce90ed..66d12c2bd1 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -6,7 +6,7 @@ // Created: 26/04/97 // RCS-ID: $Id$ // Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -22,19 +22,23 @@ #if wxUSE_SOCKETS -#include -#include -#include +#ifndef WX_PRECOMP + #include "wx/defs.h" + #include "wx/object.h" + #include "wx/log.h" + #include "wx/intl.h" -#if !defined(__MWERKS__) && !defined(__SALFORDC__) -#include -#endif + #include + #include + #include + + #if !defined(__MWERKS__) && !defined(__SALFORDC__) + #include + #endif +#endif // !WX_PRECOMP -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/log.h" -#include "wx/intl.h" #include "wx/gsocket.h" +#include "wx/socket.h" #include "wx/sckaddr.h" IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject) @@ -42,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress) #ifdef ENABLE_IPV6 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress) #endif -#if defined(__UNIX__) && !defined(__WXMAC__) +#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif @@ -50,13 +54,27 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) // wxIPV4address // --------------------------------------------------------------------------- +void wxSockAddress::Init() +{ + if ( !wxSocketBase::IsInitialized() ) + { + // we must do it before using GAddress_XXX functions + (void)wxSocketBase::Initialize(); + } +} + wxSockAddress::wxSockAddress() { - m_address = GAddress_new(); + Init(); + + m_address = GAddress_new(); } wxSockAddress::wxSockAddress(const wxSockAddress& other) + : wxObject() { + Init(); + m_address = GAddress_copy(other.m_address); } @@ -118,7 +136,7 @@ bool wxIPV4address::Hostname(unsigned long addr) if (rv) m_origHostname = Hostname(); else - m_origHostname = ""; + m_origHostname = wxEmptyString; return rv; } @@ -148,7 +166,7 @@ wxString wxIPV4address::Hostname() hostname[0] = 0; GAddress_INET_GetHostName(m_address, hostname, 1024); - return wxString(hostname); + return wxString::FromAscii(hostname); } unsigned short wxIPV4address::Service() @@ -219,7 +237,7 @@ unsigned short wxIPV6address::Service() #endif // 0 -#if defined(__UNIX__) && !defined(__WXMAC__) +#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) // --------------------------------------------------------------------------- // wxUNIXaddress @@ -250,7 +268,8 @@ wxString wxUNIXaddress::Filename() path[0] = 0; GAddress_UNIX_GetPath(m_address, path, 1024); - return wxString(path); + + return wxString::FromAscii(path); } #endif // __UNIX__