Some Unicode compilation fixes. This Unicode stuff in file functions is

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 75a6079af4a3a9205aebe802ae04cf9c5747673d..d3d0d064840cef51f11caa89caaa5d5a8453ea76 100644 (file)
--- 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
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC_X__)

 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 


@@ -108,7 +108,7 @@ bool wxIPV4address::Hostname(const wxString& name)
     return FALSE;
   }
 
     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)
 }
 
 bool wxIPV4address::Hostname(unsigned long addr)


@@ -118,7 +118,7 @@ bool wxIPV4address::Hostname(unsigned long addr)
 
 bool wxIPV4address::Service(const wxString& name)
 {
 
 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)
 }
 
 bool wxIPV4address::Service(unsigned short port)


@@ -131,6 +131,11 @@ bool wxIPV4address::LocalHost()
   return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR);
 }
 
   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];
 wxString wxIPV4address::Hostname()
 {
    char hostname[1024];


@@ -196,7 +201,7 @@ unsigned short wxIPV6address::Service()
 
 #endif
 
 
 #endif
 

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC_X__)

 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------