refresh cache on size/margins change; expanded cache to contain N elements, not just one

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 6e2a0ae012716c8e3fe7fc621095aecc7c8420aa..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
 // 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
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 #endif
 
 #include "wx/defs.h"


@@ -30,25 +30,33 @@ public:
   typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
 
   wxSockAddress();
   typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
 
   wxSockAddress();

+  wxSockAddress(const wxSockAddress& other);

   virtual ~wxSockAddress();
 
   virtual ~wxSockAddress();
 

+  wxSockAddress& operator=(const wxSockAddress& other);
+

   virtual void Clear();
   virtual int Type() = 0;
 
   GAddress *GetAddress() const { return m_address; }
   void SetAddress(GAddress *address);
   virtual void Clear();
   virtual int Type() = 0;
 
   GAddress *GetAddress() const { return m_address; }
   void SetAddress(GAddress *address);

-  const wxSockAddress& operator =(const wxSockAddress& addr);

 
 

-  void CopyObject(wxObject& dest) const;
+  // we need to be able to create copies of the addresses polymorphically (i.e.
+  // without knowing the exact address class)
+  virtual wxSockAddress *Clone() const = 0;

 
 protected:
   GAddress *m_address;
 
 protected:
   GAddress *m_address;

+
+private:
+  void Init();

 };
 
 class WXDLLEXPORT wxIPV4address : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxIPV4address)
 public:
   wxIPV4address();
 };
 
 class WXDLLEXPORT wxIPV4address : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxIPV4address)
 public:
   wxIPV4address();

+  wxIPV4address(const wxIPV4address& other);

   virtual ~wxIPV4address();
 
   bool Hostname(const wxString& name);
   virtual ~wxIPV4address();
 
   bool Hostname(const wxString& name);


@@ -59,9 +67,14 @@ public:
   bool AnyAddress();
 
   wxString Hostname();
   bool AnyAddress();
 
   wxString Hostname();

+  wxString OrigHostname() { return m_origHostname; }

   unsigned short Service();
 
   unsigned short Service();
 

-  inline int Type() { return wxSockAddress::IPV4; }
+  virtual int Type() { return wxSockAddress::IPV4; }
+  virtual wxSockAddress *Clone() const;
+
+private:
+  wxString m_origHostname;

 };
 
 #ifdef ENABLE_IPV6
 };
 
 #ifdef ENABLE_IPV6


@@ -71,7 +84,8 @@ private:
   struct sockaddr_in6 *m_addr;
 public:
   wxIPV6address();
   struct sockaddr_in6 *m_addr;
 public:
   wxIPV6address();

-  ~wxIPV6address();
+  wxIPV6address(const wxIPV6address& other);
+  virtual ~wxIPV6address();

 
   bool Hostname(const wxString& name);
   bool Hostname(unsigned char addr[16]);
 
   bool Hostname(const wxString& name);
   bool Hostname(unsigned char addr[16]);


@@ -82,11 +96,12 @@ public:
   wxString Hostname() const;
   unsigned short Service() const;
 
   wxString Hostname() const;
   unsigned short Service() const;
 

-  inline int Type() { return wxSockAddress::IPV6; }
+  virtual int Type() { return wxSockAddress::IPV6; }
+  virtual wxSockAddress *Clone() const { return new wxIPV6address(*this); }

 };
 #endif
 
 };
 #endif
 

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

 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>
 #include <sys/socket.h>
 #ifndef __VMS__
 # include <sys/un.h>


@@ -98,12 +113,14 @@ private:
   struct sockaddr_un *m_addr;
 public:
   wxUNIXaddress();
   struct sockaddr_un *m_addr;
 public:
   wxUNIXaddress();

-  ~wxUNIXaddress();
+  wxUNIXaddress(const wxUNIXaddress& other);
+  virtual ~wxUNIXaddress();

 
   void Filename(const wxString& name);
   wxString Filename();
 
 
   void Filename(const wxString& name);
   wxString Filename();
 

-  inline int Type() { return wxSockAddress::UNIX; }
+  virtual int Type() { return wxSockAddress::UNIX; }
+  virtual wxSockAddress *Clone() const { return new wxUNIXaddress(*this); }

 };
 #endif
   // __UNIX__
 };
 #endif
   // __UNIX__