Fixed notebook redraw problems when using XP theme with Classic appearance.

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 8e638c353710d87a4a61db2ffa37eea61e009bcd..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
 // 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
 
   #pragma implementation "sckaddr.h"
 #endif
 


@@ -22,19 +22,23 @@
 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#ifndef WX_PRECOMP
+    #include "wx/defs.h"
+    #include "wx/object.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"

 
 

-#if !defined(__MWERKS__) && !defined(__SALFORDC__)
-#include <memory.h>
-#endif
+    #include <stdio.h>
+    #include <stdlib.h>
+    #include <ctype.h>
+
+    #if !defined(__MWERKS__) && !defined(__SALFORDC__)
+        #include <memory.h>
+    #endif
+#endif // !WX_PRECOMP

 
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/log.h"
-#include "wx/intl.h"

 #include "wx/gsocket.h"
 #include "wx/gsocket.h"

+#include "wx/socket.h"

 #include "wx/sckaddr.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
 #include "wx/sckaddr.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)


@@ -42,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif

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

 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 


@@ -50,13 +54,27 @@ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 // wxIPV4address
 // ---------------------------------------------------------------------------
 
 // wxIPV4address
 // ---------------------------------------------------------------------------
 

+void wxSockAddress::Init()
+{
+    if ( !wxSocketBase::IsInitialized() )
+    {
+        // we must do it before using GAddress_XXX functions
+        (void)wxSocketBase::Initialize();
+    }
+}
+

 wxSockAddress::wxSockAddress()
 {
 wxSockAddress::wxSockAddress()
 {

-  m_address = GAddress_new();
+    Init();
+
+    m_address = GAddress_new();

 }
 
 wxSockAddress::wxSockAddress(const wxSockAddress& other)
 }
 
 wxSockAddress::wxSockAddress(const wxSockAddress& other)

+    : wxObject()

 {
 {

+    Init();
+

     m_address = GAddress_copy(other.m_address);
 }
 
     m_address = GAddress_copy(other.m_address);
 }
 


@@ -108,13 +126,18 @@ bool wxIPV4address::Hostname(const wxString& name)
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
     return FALSE;
   }
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
     return FALSE;
   }

-
+  m_origHostname = name;

   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::Hostname(unsigned long addr)
 {
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::Hostname(unsigned long addr)
 {

-  return (GAddress_INET_SetHostAddress(m_address, addr) == GSOCK_NOERROR);
+  bool rv = (GAddress_INET_SetHostAddress(m_address, addr) == GSOCK_NOERROR);
+  if (rv)
+      m_origHostname = Hostname();
+  else
+      m_origHostname = wxEmptyString;
+  return rv;

 }
 
 bool wxIPV4address::Service(const wxString& name)
 }
 
 bool wxIPV4address::Service(const wxString& name)


@@ -143,7 +166,7 @@ wxString wxIPV4address::Hostname()
 
    hostname[0] = 0;
    GAddress_INET_GetHostName(m_address, hostname, 1024);
 
    hostname[0] = 0;
    GAddress_INET_GetHostName(m_address, hostname, 1024);

-   return wxString(hostname);
+   return wxString::FromAscii(hostname);

 }
 
 unsigned short wxIPV4address::Service()
 }
 
 unsigned short wxIPV4address::Service()


@@ -151,6 +174,25 @@ unsigned short wxIPV4address::Service()
   return GAddress_INET_GetPort(m_address);
 }
 
   return GAddress_INET_GetPort(m_address);
 }
 

+wxSockAddress *wxIPV4address::Clone() const
+{
+    wxIPV4address *addr = new wxIPV4address(*this);
+    addr->m_origHostname = m_origHostname;
+    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
 #if 0
 // ---------------------------------------------------------------------------
 // wxIPV6address


@@ -207,7 +249,7 @@ unsigned short wxIPV6address::Service()
 
 #endif // 0
 
 
 #endif // 0
 

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

 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 
 // ---------------------------------------------------------------------------
 // wxUNIXaddress


@@ -238,7 +280,8 @@ wxString wxUNIXaddress::Filename()
 
   path[0] = 0;
   GAddress_UNIX_GetPath(m_address, path, 1024);
 
   path[0] = 0;
   GAddress_UNIX_GetPath(m_address, path, 1024);

-  return wxString(path);
+  
+  return wxString::FromAscii(path);

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