Added wxBitmap::Rescale() from 2_4

[wxWidgets.git] / src / common / sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index b75ac6efb58944d1f24182fe48221774694bb062..33b51d153d4db502e9739307b9e9734e36d7a2b8 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -6,10 +6,10 @@
 // Created:     26/04/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma implementation "sckaddr.h"
 #endif
 
@@ -46,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
-#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
@@ -181,6 +181,18 @@ wxSockAddress *wxIPV4address::Clone() const
     return addr;
 }
 
+wxString wxIPV4address::IPAddress() const
+{      
+       unsigned long raw =  GAddress_INET_GetHostAddress(m_address);
+       return wxString::Format(
+               _T("%u.%u.%u.%u"),
+               (unsigned char)(raw & 0xff),
+               (unsigned char)((raw>>8) & 0xff),
+               (unsigned char)((raw>>16) & 0xff),
+               (unsigned char)((raw>>24) & 0xff)
+               );
+}
+
 #if 0
 // ---------------------------------------------------------------------------
 // wxIPV6address
@@ -237,7 +249,7 @@ unsigned short wxIPV6address::Service()
 
 #endif // 0
 
-#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__))
+#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress