added support for ellipsization and markup in wxStaticText (modified patch 1629946)

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index d7c77768b74e4cd981a9f8dc73f178224c5a0d80..81bafbdf717e8216e03dcf125743f53aa3e27380 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sckaddr.cpp
+// Name:        src/common/sckaddr.cpp
 // Purpose:     Network address manager
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -13,13 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_SOCKETS
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/object.h"
     #include "wx/log.h"
     #include "wx/intl.h"
@@ -82,8 +81,11 @@ wxSockAddress::~wxSockAddress()
 
 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)
@@ -205,19 +207,18 @@ wxSockAddress *wxIPV4address::Clone() 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)
+    return wxString::Format(_T("%lu.%lu.%lu.%lu"),
+                (raw>>24) & 0xff,
+                (raw>>16) & 0xff,
+                (raw>>8) & 0xff,
+                raw & 0xff
         );
 }
 
 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()) == 0 &&
+           Service() == addr.Service();
 }
 
 #if wxUSE_IPV6