moved some more stuff from .cpp files to here

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index da59b9412818d3095fb6dfed6207127132979c31..8e7067b0863b73fb3cbcd5fa72a43f193532ab87 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -24,7 +24,7 @@
 #include "wx/gsocket.h"
 
 
-class WXDLLEXPORT_BASE wxSockAddress : public wxObject {
+class WXDLLIMPEXP_NET wxSockAddress : public wxObject {
   DECLARE_ABSTRACT_CLASS(wxSockAddress)
 public:
   typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
@@ -52,7 +52,7 @@ private:
   void Init();
 };
 
-class WXDLLEXPORT_BASE wxIPV4address : public wxSockAddress {
+class WXDLLIMPEXP_NET wxIPV4address : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxIPV4address)
 public:
   wxIPV4address();
@@ -69,6 +69,7 @@ public:
   wxString Hostname();
   wxString OrigHostname() { return m_origHostname; }
   unsigned short Service();
+  wxString IPAddress() const;
 
   virtual int Type() { return wxSockAddress::IPV4; }
   virtual wxSockAddress *Clone() const;
@@ -78,7 +79,7 @@ private:
 };
 
 #ifdef ENABLE_IPV6
-class WXDLLEXPORT_BASE wxIPV6address : public wxSockAddress {
+class WXDLLIMPEXP_NET wxIPV6address : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxIPV6address)
 private:
   struct sockaddr_in6 *m_addr;
@@ -107,7 +108,7 @@ public:
 # include <sys/un.h>
 #endif
 
-class WXDLLEXPORT_BASE wxUNIXaddress : public wxSockAddress {
+class WXDLLIMPEXP_NET wxUNIXaddress : public wxSockAddress {
   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
 private:
   struct sockaddr_un *m_addr;