merged 2 overloaded functions into a single membersections

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index ff8739c79dc340adbff69ad42faf1d16e40959da..66d12c2bd1da272f46e300bcdecdc5b4bd1d1fa6 100644 (file)
--- 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__
@@ -46,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
-#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
@@ -136,7 +136,7 @@ bool wxIPV4address::Hostname(unsigned long addr)
   if (rv)
       m_origHostname = Hostname();
   else
-      m_origHostname = "";
+      m_origHostname = wxEmptyString;
   return rv;
 }
 
@@ -166,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()
@@ -237,7 +237,7 @@ unsigned short wxIPV6address::Service()
 
 #endif // 0
 
-#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
@@ -268,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__