install wxUniv headers in make install and include wxUniv sources in make dist

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 1e126d81afc988d951dd6d5855648791295f187e..8e638c353710d87a4a61db2ffa37eea61e009bcd 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -30,21 +30,21 @@
 #include <memory.h>
 #endif
 
-#include <wx/defs.h>
-#include <wx/object.h>
-#include <wx/gsocket.h>
-#include <wx/sckaddr.h>
+#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
@@ -55,6 +55,11 @@ wxSockAddress::wxSockAddress()
   m_address = GAddress_new();
 }
 
+wxSockAddress::wxSockAddress(const wxSockAddress& other)
+{
+    m_address = GAddress_copy(other.m_address);
+}
+
 wxSockAddress::~wxSockAddress()
 {
   GAddress_destroy(m_address);
@@ -66,22 +71,14 @@ void wxSockAddress::SetAddress(GAddress *address)
   m_address = GAddress_copy(address);
 }
 
-const wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr)
+wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr)
 {
   SetAddress(addr.GetAddress());
   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();
 }
@@ -91,7 +88,11 @@ void wxSockAddress::Clear()
 // ---------------------------------------------------------------------------
 
 wxIPV4address::wxIPV4address()
-  : wxSockAddress()
+{
+}
+
+wxIPV4address::wxIPV4address(const wxIPV4address& other)
+             : wxSockAddress(other)
 {
 }
 
@@ -101,7 +102,14 @@ wxIPV4address::~wxIPV4address()
 
 bool wxIPV4address::Hostname(const wxString& name)
 {
-  return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR);
+  // Some people are sometimes fool.
+  if (name == wxT(""))
+  {
+    wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
+    return FALSE;
+  }
+
+  return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::Hostname(unsigned long addr)
@@ -111,7 +119,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)
@@ -124,6 +132,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];
@@ -135,7 +148,7 @@ wxString wxIPV4address::Hostname()
 
 unsigned short wxIPV4address::Service()
 {
-  return GAddress_INET_GetPort(m_address); 
+  return GAddress_INET_GetPort(m_address);
 }
 
 #if 0
@@ -148,6 +161,11 @@ wxIPV6address::wxIPV6address()
 {
 }
 
+wxIPV6address::wxIPV6address(const wxIPV6address& other)
+             : wxSockAddress(other)
+{
+}
+
 wxIPV6address::~wxIPV6address()
 {
 }
@@ -184,18 +202,24 @@ const wxString& wxIPV6address::Hostname()
 
 unsigned short wxIPV6address::Service()
 {
-  return GAddress_INET_GetPort(m_address); 
+  return GAddress_INET_GetPort(m_address);
 }
 
-#endif
+#endif // 0
+
+#if defined(__UNIX__) && !defined(__WXMAC__)
 
-#ifdef __UNIX__
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------
 
 wxUNIXaddress::wxUNIXaddress()
-  : wxSockAddress()
+             : wxSockAddress()
+{
+}
+
+wxUNIXaddress::wxUNIXaddress(const wxUNIXaddress& other)
+             : wxSockAddress(other)
 {
 }
 
@@ -217,7 +241,7 @@ wxString wxUNIXaddress::Filename()
   return wxString(path);
 }
 
-#endif
+#endif // __UNIX__
 
-#endif 
+#endif
   // wxUSE_SOCKETS