- Added wxAddProcessCallbackForPid function

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 8f175f4f45f1d63dc44f35a154968bd8af2be5cb..d3cbf185a6a29cf1560dcadd65f251da9f31d864 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -6,14 +6,14 @@
 // Created:     26/04/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_NETWORK_ADDRESS_H
 #define _WX_NETWORK_ADDRESS_H
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "sckaddr.h"
 #endif
 
 #include "wx/defs.h"
@@ -42,11 +42,14 @@ public:
   void SetAddress(GAddress *address);
 
   // we need to be able to create copies of the addresses polymorphically (i.e.
-  // wihtout knowing the exact address class)
+  // without knowing the exact address class)
   virtual wxSockAddress *Clone() const = 0;
 
 protected:
   GAddress *m_address;
+
+private:
+  void Init();
 };
 
 class WXDLLEXPORT wxIPV4address : public wxSockAddress {
@@ -64,10 +67,14 @@ public:
   bool AnyAddress();
 
   wxString Hostname();
+  wxString OrigHostname() { return m_origHostname; }
   unsigned short Service();
 
   virtual int Type() { return wxSockAddress::IPV4; }
-  virtual wxSockAddress *Clone() const { return new wxIPV4address(*this); }
+  virtual wxSockAddress *Clone() const;
+
+private:
+  wxString m_origHostname;
 };
 
 #ifdef ENABLE_IPV6
@@ -94,7 +101,7 @@ public:
 };
 #endif
 
-#if defined(__UNIX__) && !defined(__WXMAC__)
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>