added IMPLEMENT_APP_CONSOLE

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

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 5cdc79252c5a956433907648c6aff49b94dfabb3..fb165f0885a697df9f39db462f611a216297ff5a 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -6,13 +6,13 @@
 // 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
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "sckaddr.h"
 #endif
 
 #pragma interface "sckaddr.h"
 #endif
 


@@ -24,7 +24,7 @@
 #include "wx/gsocket.h"
 
 
 #include "wx/gsocket.h"
 
 

-class WXDLLEXPORT wxSockAddress : public wxObject {
+class WXDLLIMPEXP_NET wxSockAddress : public wxObject {

   DECLARE_ABSTRACT_CLASS(wxSockAddress)
 public:
   typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;
   DECLARE_ABSTRACT_CLASS(wxSockAddress)
 public:
   typedef enum { IPV4=1, IPV6=2, UNIX=3 } Addr;


@@ -52,7 +52,7 @@ private:
   void Init();
 };
 
   void Init();
 };
 

-class WXDLLEXPORT wxIPV4address : public wxSockAddress {
+class WXDLLIMPEXP_NET wxIPV4address : public wxSockAddress {

   DECLARE_DYNAMIC_CLASS(wxIPV4address)
 public:
   wxIPV4address();
   DECLARE_DYNAMIC_CLASS(wxIPV4address)
 public:
   wxIPV4address();


@@ -69,6 +69,7 @@ public:
   wxString Hostname();
   wxString OrigHostname() { return m_origHostname; }
   unsigned short Service();
   wxString Hostname();
   wxString OrigHostname() { return m_origHostname; }
   unsigned short Service();

+  wxString IPAddress() const;

 
   virtual int Type() { return wxSockAddress::IPV4; }
   virtual wxSockAddress *Clone() const;
 
   virtual int Type() { return wxSockAddress::IPV4; }
   virtual wxSockAddress *Clone() const;


@@ -78,7 +79,7 @@ private:
 };
 
 #ifdef ENABLE_IPV6
 };
 
 #ifdef ENABLE_IPV6

-class WXDLLEXPORT wxIPV6address : public wxSockAddress {
+class WXDLLIMPEXP_NET wxIPV6address : public wxSockAddress {

   DECLARE_DYNAMIC_CLASS(wxIPV6address)
 private:
   struct sockaddr_in6 *m_addr;
   DECLARE_DYNAMIC_CLASS(wxIPV6address)
 private:
   struct sockaddr_in6 *m_addr;


@@ -101,13 +102,13 @@ public:
 };
 #endif
 
 };
 #endif
 

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

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

-class WXDLLEXPORT wxUNIXaddress : public wxSockAddress {
+class WXDLLIMPEXP_NET wxUNIXaddress : public wxSockAddress {

   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
 private:
   struct sockaddr_un *m_addr;
   DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
 private:
   struct sockaddr_un *m_addr;