Added wxTreebook:

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index bc472331c9917de8d8a27d3195bc5412b022670d..98e1c0d4e7b592c28b91a963e91a8b2353737fee 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -12,10 +12,6 @@
 #ifndef _WX_NETWORK_ADDRESS_H
 #define _WX_NETWORK_ADDRESS_H
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "sckaddr.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_SOCKETS
@@ -107,13 +103,19 @@ public:
 
   virtual int Type() { return wxSockAddress::IPV4; }
   virtual wxSockAddress *Clone() const;
-  
-  bool operator==(wxIPV4address& addr);
+
+  bool operator==(const wxIPV4address& addr) const;
 
 private:
   wxString m_origHostname;
 };
 
+
+// the IPv6 code probably doesn't work, untested -- set to 1 at your own risk
+#ifndef wxUSE_IPV6
+    #define wxUSE_IPV6 0
+#endif
+
 #if wxUSE_IPV6
 
 // Experimental Only:
@@ -131,7 +133,7 @@ public:
   // IPV6 name formats
   //
   //                          hostname
-  //                          3ffe:ffff:0100:f101:0210:a4ff:fee3:9566 
+  //                          3ffe:ffff:0100:f101:0210:a4ff:fee3:9566
   // compact (base85)         Itu&-ZQ82s>J%s99FJXT
   // compressed format        ::1
   // ipv4 mapped              ::ffff:1.2.3.4
@@ -148,7 +150,7 @@ public:
   // any (0000:0000:0000:0000:0000:0000:0000:0000 (::))
   virtual bool AnyAddress();
 
-  // 3ffe:ffff:0100:f101:0210:a4ff:fee3:9566 
+  // 3ffe:ffff:0100:f101:0210:a4ff:fee3:9566
   virtual wxString IPAddress() const;
 
   virtual wxString Hostname() const;
@@ -160,7 +162,7 @@ public:
 
 #endif // wxUSE_IPV6
 
-#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) && !defined(__WXMSW__)
 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>