activating DrawRectangle optimization

[wxWidgets.git] / include / wx / private / sckaddr.h

diff --git a/include/wx/private/sckaddr.h b/include/wx/private/sckaddr.h
index a4971fd4aab9fc956a43734f497d272bbea493c0..bb6b30c6798502c1c29e527d544d4bee442a2608 100644 (file)
--- a/include/wx/private/sckaddr.h
+++ b/include/wx/private/sckaddr.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/private/sockaddr.h
+// Name:        wx/private/sckaddr.h

 // Purpose:     wxSockAddressImpl
 // Author:      Vadim Zeitlin
 // Created:     2008-12-28
 // Purpose:     wxSockAddressImpl
 // Author:      Vadim Zeitlin
 // Created:     2008-12-28


@@ -11,7 +11,7 @@
 #ifndef _WX_PRIVATE_SOCKADDR_H_
 #define _WX_PRIVATE_SOCKADDR_H_
 
 #ifndef _WX_PRIVATE_SOCKADDR_H_
 #define _WX_PRIVATE_SOCKADDR_H_
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     #include "wx/msw/wrapwin.h"
 
     #if wxUSE_IPV6
     #include "wx/msw/wrapwin.h"
 
     #if wxUSE_IPV6


@@ -137,10 +137,11 @@ public:
 
     wxSockAddressImpl& operator=(const wxSockAddressImpl& other)
     {
 
     wxSockAddressImpl& operator=(const wxSockAddressImpl& other)
     {

-        free(m_addr);
-
-        InitFromOther(other);
-
+        if (this != &other)
+        {
+            free(m_addr);
+            InitFromOther(other);
+        }

         return *this;
     }
 
         return *this;
     }
 


@@ -178,13 +179,13 @@ public:
             case FAMILY_INET6:
                 CreateINET6();
                 break;
             case FAMILY_INET6:
                 CreateINET6();
                 break;

-#endif
+#endif // wxUSE_IPV6

 
 #ifdef wxHAS_UNIX_DOMAIN_SOCKETS
             case FAMILY_UNIX:
 
 #ifdef wxHAS_UNIX_DOMAIN_SOCKETS
             case FAMILY_UNIX:

-#endif

                 CreateUnix();
                 break;
                 CreateUnix();
                 break;

+#endif // wxHAS_UNIX_DOMAIN_SOCKETS

 
             default:
                 wxFAIL_MSG( "unsupported socket address family" );
 
             default:
                 wxFAIL_MSG( "unsupported socket address family" );