fixes for wxFontMapper endless recursion

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index b182548948986108844187eeea2fde85ab44e84e..25ee60d4980ed8783fe70981a81ee6dbb70e7c90 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -20,61 +20,46 @@
 
 #if wxUSE_SOCKETS
 
-#if defined(__WINDOWS__) && defined(WXSOCK_INTERNAL)
-#include <winsock.h>
-
-#elif defined(__UNIX__) && defined(WXSOCK_INTERNAL)
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
 #include "wx/string.h"
+#include "wx/gsocket.h"
+
 
 class WXDLLEXPORT wxSockAddress : public wxObject {
   DECLARE_ABSTRACT_CLASS(wxSockAddress)
 public:
   typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
 
-  wxSockAddress() {};
-  virtual ~wxSockAddress() {};
+  wxSockAddress();
+  virtual ~wxSockAddress();
 
-  virtual void Clear() = 0;
+  virtual void Clear();
+  virtual int Type() = 0;
 
-  virtual void Build(struct sockaddr*& addr, size_t& len) = 0;
-  virtual void Disassemble(struct sockaddr *addr, size_t len) = 0;
-  virtual int SockAddrLen() = 0;
+  GAddress *GetAddress() const { return m_address; }
+  void SetAddress(GAddress *address);
+  const wxSockAddress& operator =(const wxSockAddress& addr);
 
-  virtual int GetFamily() = 0;
-  virtual int Type() = 0;
+  void CopyObject(wxObject& dest) const;
+
+protected:
+  GAddress *m_address;
 };
 
 class WXDLLEXPORT wxIPV4address : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxIPV4address)
-private:
-  struct sockaddr_in *m_addr;
 public:
   wxIPV4address();
   virtual ~wxIPV4address();
 
-  virtual void Clear();
-//  const wxSockAddress& operator =(const wxSockAddress& addr);
-
-  virtual bool Hostname(const wxString& name);
-  virtual bool Hostname(unsigned long addr);
-  virtual bool Service(const wxString& name);
-  virtual bool Service(unsigned short port);
-  virtual bool LocalHost();
+  bool Hostname(const wxString& name);
+  bool Hostname(unsigned long addr);
+  bool Service(const wxString& name);
+  bool Service(unsigned short port);
+  bool LocalHost();
 
   wxString Hostname();
   unsigned short Service();
 
-  void Build(struct sockaddr*& addr, size_t& len);
-  void Disassemble(struct sockaddr *addr, size_t len);
-
-  inline int SockAddrLen();
-  inline int GetFamily();
   inline int Type() { return wxSockAddress::IPV4; }
 };
 
@@ -87,9 +72,6 @@ public:
   wxIPV6address();
   ~wxIPV6address();
 
-  void Clear();
-//  const wxSockAddress& operator =(const wxSockAddress& addr);
-
   bool Hostname(const wxString& name);
   bool Hostname(unsigned char addr[16]);
   bool Service(const wxString& name);
@@ -99,17 +81,15 @@ public:
   wxString Hostname() const;
   unsigned short Service() const;
 
-  void Build(struct sockaddr*& addr, size_t& len);
-  void Disassemble(struct sockaddr *addr, size_t len);
-
-  inline int SockAddrLen();
-  inline int GetFamily();
   inline int Type() { return wxSockAddress::IPV6; }
 };
 #endif
 
 #ifdef __UNIX__
-#include <sys/un.h>
+#include <sys/socket.h>
+#ifndef __VMS__
+# include <sys/un.h>
+#endif
 
 class WXDLLEXPORT wxUNIXaddress : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
@@ -119,17 +99,9 @@ public:
   wxUNIXaddress();
   ~wxUNIXaddress();
 
-  void Clear();
-//  const wxSockAddress& operator =(const wxSockAddress& addr);
-
   void Filename(const wxString& name);
   wxString Filename();
 
-  void Build(struct sockaddr*& addr, size_t& len);
-  void Disassemble(struct sockaddr *addr, size_t len);
-
-  inline int SockAddrLen();
-  inline int GetFamily();
   inline int Type() { return wxSockAddress::UNIX; }
 };
 #endif
@@ -137,6 +109,6 @@ public:
 
 #endif
   // wxUSE_SOCKETS
-  
+
 #endif
   // _WX_NETWORK_ADDRESS_H