[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index cfc65703f25c05c9fac7f5a38ef3ab971e9c63df..a3b1c1767fbfa3fff895f1dc776200a45e0fe838 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -1,29 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sckaddr.cpp
+// Name:        src/common/sckaddr.cpp

 // Purpose:     Network address manager
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     26/04/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Purpose:     Network address manager
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     26/04/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "sckaddr.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_SOCKETS
 
 #ifndef WX_PRECOMP
 #endif
 
 #if wxUSE_SOCKETS
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/object.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/object.h"
     #include "wx/log.h"
     #include "wx/intl.h"


@@ -47,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress)
 #if wxUSE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)
 #endif
 #if wxUSE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)
 #endif

-#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))

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


@@ -86,8 +81,11 @@ wxSockAddress::~wxSockAddress()
 
 void wxSockAddress::SetAddress(GAddress *address)
 {
 
 void wxSockAddress::SetAddress(GAddress *address)
 {

-  GAddress_destroy(m_address);
-  m_address = GAddress_copy(address);
+    if ( address != m_address )
+    {
+        GAddress_destroy(m_address);
+        m_address = GAddress_copy(address);
+    }

 }
 
 wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr)
 }
 
 wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr)


@@ -141,10 +139,10 @@ wxIPV4address::~wxIPV4address()
 bool wxIPV4address::Hostname(const wxString& name)
 {
   // Some people are sometimes fool.
 bool wxIPV4address::Hostname(const wxString& name)
 {
   // Some people are sometimes fool.

-  if (name == wxT(""))
+  if (name.empty())

   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );

-    return FALSE;
+    return false;

   }
   m_origHostname = name;
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
   }
   m_origHostname = name;
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);


@@ -207,21 +205,20 @@ wxSockAddress *wxIPV4address::Clone() const
 }
 
 wxString wxIPV4address::IPAddress() const
 }
 
 wxString wxIPV4address::IPAddress() const

-{      
-       unsigned long raw =  GAddress_INET_GetHostAddress(m_address);
-       return wxString::Format(
-               _T("%u.%u.%u.%u"),
-               (unsigned char)((raw>>24) & 0xff),
-               (unsigned char)((raw>>16) & 0xff),
-               (unsigned char)((raw>>8) & 0xff),
-               (unsigned char)(raw & 0xff)
-               );
+{
+    unsigned long raw =  GAddress_INET_GetHostAddress(m_address);
+    return wxString::Format(_T("%lu.%lu.%lu.%lu"),
+                (raw>>24) & 0xff,
+                (raw>>16) & 0xff,
+                (raw>>8) & 0xff,
+                raw & 0xff
+        );

 }
 
 }
 

-bool wxIPV4address::operator==(wxIPV4address& addr)
+bool wxIPV4address::operator==(const wxIPV4address& addr) const

 {
 {

-       if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true;
-       return false;
+    return Hostname().Cmp(addr.Hostname().c_str()) == 0 &&
+            Service() == addr.Service();

 }
 
 #if wxUSE_IPV6
 }
 
 #if wxUSE_IPV6


@@ -245,17 +242,17 @@ wxIPV6address::~wxIPV6address()
 
 bool wxIPV6address::Hostname(const wxString& name)
 {
 
 bool wxIPV6address::Hostname(const wxString& name)
 {

-  if (name == wxT(""))
+  if (name.empty())

   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );

-    return FALSE;
+    return false;

   }
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV6address::Hostname(unsigned char[16] WXUNUSED(addr))
 {
   }
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV6address::Hostname(unsigned char[16] WXUNUSED(addr))
 {

-  return TRUE;
+  return true;

 }
 
 bool wxIPV6address::Service(const wxString& name)
 }
 
 bool wxIPV6address::Service(const wxString& name)


@@ -284,15 +281,15 @@ bool wxIPV6address::AnyAddress()
 }
 
 wxString wxIPV6address::IPAddress() const
 }
 
 wxString wxIPV6address::IPAddress() const

-{      
-       unsigned long raw =  GAddress_INET_GetHostAddress(m_address);
-       return wxString::Format(
-               _T("%u.%u.%u.%u"),
-               (unsigned char)((raw>>24) & 0xff),
-               (unsigned char)((raw>>16) & 0xff),
-               (unsigned char)((raw>>8) & 0xff),
-               (unsigned char)(raw & 0xff)
-               );
+{
+    unsigned long raw =  GAddress_INET_GetHostAddress(m_address);
+    return wxString::Format(
+        _T("%u.%u.%u.%u"),
+        (unsigned char)((raw>>24) & 0xff),
+        (unsigned char)((raw>>16) & 0xff),
+        (unsigned char)((raw>>8) & 0xff),
+        (unsigned char)(raw & 0xff)
+        );

 }
 
 wxString wxIPV6address::Hostname() const
 }
 
 wxString wxIPV6address::Hostname() const


@@ -311,7 +308,7 @@ unsigned short wxIPV6address::Service() const
 
 #endif // wxUSE_IPV6
 
 
 #endif // wxUSE_IPV6
 

-#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))

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


@@ -342,7 +339,7 @@ wxString wxUNIXaddress::Filename()
 
   path[0] = 0;
   GAddress_UNIX_GetPath(m_address, path, 1024);
 
   path[0] = 0;
   GAddress_UNIX_GetPath(m_address, path, 1024);

-  
+

   return wxString::FromAscii(path);
 }
 
   return wxString::FromAscii(path);
 }