X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..fa1c12bdd76acc21ddb45b90bb53b2f58aed946d:/src/common/sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index d3d0d06484..474a0f3092 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
-#if defined(__UNIX__) && !defined(__WXMAC_X__)
+#if defined(__UNIX__) && !defined(__WXMAC__)
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
@@ -72,16 +72,8 @@ const wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr)
   return *this;
 }
 
-void wxSockAddress::CopyObject(wxObject& dest) const
-{
-  wxSockAddress *addr = (wxSockAddress *)&dest;
-
-  wxObject::CopyObject(dest);
-  addr->SetAddress(GetAddress());
-}
-
 void wxSockAddress::Clear()
-{ 
+{
   GAddress_destroy(m_address);
   m_address = GAddress_new();
 }
@@ -102,7 +94,7 @@ wxIPV4address::~wxIPV4address()
 bool wxIPV4address::Hostname(const wxString& name)
 {
   // Some people are sometimes fool.
-  if (name == wxT("")) 
+  if (name == wxT(""))
   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
     return FALSE;
@@ -147,7 +139,7 @@ wxString wxIPV4address::Hostname()
 
 unsigned short wxIPV4address::Service()
 {
-  return GAddress_INET_GetPort(m_address); 
+  return GAddress_INET_GetPort(m_address);
 }
 
 #if 0
@@ -196,12 +188,12 @@ const wxString& wxIPV6address::Hostname()
 
 unsigned short wxIPV6address::Service()
 {
-  return GAddress_INET_GetPort(m_address); 
+  return GAddress_INET_GetPort(m_address);
 }
 
 #endif
 
-#if defined(__UNIX__) && !defined(__WXMAC_X__)
+#if defined(__UNIX__) && !defined(__WXMAC__)
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------
@@ -231,5 +223,5 @@ wxString wxUNIXaddress::Filename()
 
 #endif
 
-#endif 
+#endif
   // wxUSE_SOCKETS