Check accelerators before sending EVT_CHAR

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 8f667937dc82057736a9f2725ed021c94622e437..37ad7cf8b1a7ea89aa8c60089d307061d01298e5 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -42,16 +42,17 @@
 #include "wx/sckaddr.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
 #include "wx/sckaddr.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)

-IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
-#ifdef ENABLE_IPV6
-IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
+IMPLEMENT_ABSTRACT_CLASS(wxIPaddress, wxSockAddress)
+IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress)
+#if wxUSE_IPV6
+IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)

 #endif
 #if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 // ---------------------------------------------------------------------------
 #endif
 #if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__))
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
 // ---------------------------------------------------------------------------

-// wxIPV4address
+// wxSockAddress

 // ---------------------------------------------------------------------------
 
 void wxSockAddress::Init()
 // ---------------------------------------------------------------------------
 
 void wxSockAddress::Init()


@@ -101,16 +102,35 @@ void wxSockAddress::Clear()
   m_address = GAddress_new();
 }
 
   m_address = GAddress_new();
 }
 

+// ---------------------------------------------------------------------------
+// wxIPaddress
+// ---------------------------------------------------------------------------
+
+wxIPaddress::wxIPaddress()
+            : wxSockAddress()
+{
+}
+
+wxIPaddress::wxIPaddress(const wxIPaddress& other)
+            : wxSockAddress(other)
+{
+}
+
+wxIPaddress::~wxIPaddress()
+{
+}
+

 // ---------------------------------------------------------------------------
 // wxIPV4address
 // ---------------------------------------------------------------------------
 
 wxIPV4address::wxIPV4address()
 // ---------------------------------------------------------------------------
 // wxIPV4address
 // ---------------------------------------------------------------------------
 
 wxIPV4address::wxIPV4address()

+             : wxIPaddress()

 {
 }
 
 wxIPV4address::wxIPV4address(const wxIPV4address& other)
 {
 }
 
 wxIPV4address::wxIPV4address(const wxIPV4address& other)

-             : wxSockAddress(other)
+             : wxIPaddress(other)

 {
 }
 
 {
 }
 


@@ -121,10 +141,10 @@ wxIPV4address::~wxIPV4address()
 bool wxIPV4address::Hostname(const wxString& name)
 {
   // Some people are sometimes fool.
 bool wxIPV4address::Hostname(const wxString& name)
 {
   // Some people are sometimes fool.

-  if (name == wxT(""))
+  if (name.empty())

   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
   {
     wxLogWarning( _("Trying to solve a NULL hostname: giving up") );

-    return FALSE;
+    return false;

   }
   m_origHostname = name;
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
   }
   m_origHostname = name;
   return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);


@@ -155,12 +175,17 @@ bool wxIPV4address::LocalHost()
   return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR);
 }
 
   return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR);
 }
 

+bool wxIPV4address::IsLocalHost() const
+{
+  return (Hostname() == wxT("localhost") || IPAddress() == wxT("127.0.0.1"));
+}
+

 bool wxIPV4address::AnyAddress()
 {
   return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::AnyAddress()
 {
   return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR);
 }
 

-wxString wxIPV4address::Hostname()
+wxString wxIPV4address::Hostname() const

 {
    char hostname[1024];
 
 {
    char hostname[1024];
 


@@ -169,7 +194,7 @@ wxString wxIPV4address::Hostname()
    return wxString::FromAscii(hostname);
 }
 
    return wxString::FromAscii(hostname);
 }
 

-unsigned short wxIPV4address::Service()
+unsigned short wxIPV4address::Service() const

 {
   return GAddress_INET_GetPort(m_address);
 }
 {
   return GAddress_INET_GetPort(m_address);
 }


@@ -182,35 +207,35 @@ wxSockAddress *wxIPV4address::Clone() const
 }
 
 wxString wxIPV4address::IPAddress() const
 }
 
 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)
-               );
+{
+    unsigned long raw =  GAddress_INET_GetHostAddress(m_address);
+    return wxString::Format(
+        _T("%u.%u.%u.%u"),
+        (unsigned char)((raw>>24) & 0xff),
+        (unsigned char)((raw>>16) & 0xff),
+        (unsigned char)((raw>>8) & 0xff),
+        (unsigned char)(raw & 0xff)
+        );

 }
 
 bool wxIPV4address::operator==(wxIPV4address& addr)
 {
 }
 
 bool wxIPV4address::operator==(wxIPV4address& addr)
 {

-       if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true;
-       return false;
+    if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true;
+    return false;

 }
 
 }
 

-#if 0
+#if wxUSE_IPV6

 // ---------------------------------------------------------------------------
 // wxIPV6address
 // ---------------------------------------------------------------------------
 
 wxIPV6address::wxIPV6address()
 // ---------------------------------------------------------------------------
 // wxIPV6address
 // ---------------------------------------------------------------------------
 
 wxIPV6address::wxIPV6address()

-  : wxSockAddress()
+  : wxIPaddress()

 {
 }
 
 wxIPV6address::wxIPV6address(const wxIPV6address& other)
 {
 }
 
 wxIPV6address::wxIPV6address(const wxIPV6address& other)

-             : wxSockAddress(other)
+             : wxIPaddress(other)

 {
 }
 
 {
 }
 


@@ -220,17 +245,22 @@ wxIPV6address::~wxIPV6address()
 
 bool wxIPV6address::Hostname(const wxString& name)
 {
 
 bool wxIPV6address::Hostname(const wxString& name)
 {

-  return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR);
+  if (name.empty())
+  {
+    wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
+    return false;
+  }
+  return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);

 }
 
 }
 

-bool wxIPV6address::Hostname(unsigned char addr[16])
+bool wxIPV6address::Hostname(unsigned char[16] WXUNUSED(addr))

 {
 {

-  return TRUE;
+  return true;

 }
 
 }
 

-bool wxIPV6address::Service(const char *name)
+bool wxIPV6address::Service(const wxString& name)

 {
 {

-  return (GAddress_INET_SetPortName(m_address, name.fn_str()) == GSOCK_NOERROR);
+  return (GAddress_INET_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR);

 }
 
 bool wxIPV6address::Service(unsigned short port)
 }
 
 bool wxIPV6address::Service(unsigned short port)


@@ -243,17 +273,43 @@ bool wxIPV6address::LocalHost()
   return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR);
 }
 
   return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR);
 }
 

-const wxString& wxIPV6address::Hostname()
+bool wxIPV6address::IsLocalHost() const
+{
+  return (Hostname() == wxT("localhost") || IPAddress() == wxT("127.0.0.1"));
+}
+
+bool wxIPV6address::AnyAddress()
+{
+  return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR);
+}
+
+wxString wxIPV6address::IPAddress() const

 {
 {

-  return wxString(GAddress_INET_GetHostName(m_address));
+    unsigned long raw =  GAddress_INET_GetHostAddress(m_address);
+    return wxString::Format(
+        _T("%u.%u.%u.%u"),
+        (unsigned char)((raw>>24) & 0xff),
+        (unsigned char)((raw>>16) & 0xff),
+        (unsigned char)((raw>>8) & 0xff),
+        (unsigned char)(raw & 0xff)
+        );
+}
+
+wxString wxIPV6address::Hostname() const
+{
+   char hostname[1024];
+
+   hostname[0] = 0;
+   GAddress_INET_GetHostName(m_address, hostname, 1024);
+   return wxString::FromAscii(hostname);

 }
 
 }
 

-unsigned short wxIPV6address::Service()
+unsigned short wxIPV6address::Service() const

 {
   return GAddress_INET_GetPort(m_address);
 }
 
 {
   return GAddress_INET_GetPort(m_address);
 }
 

-#endif // 0
+#endif // wxUSE_IPV6

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


@@ -286,7 +342,7 @@ 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::FromAscii(path);
 }
 
   return wxString::FromAscii(path);
 }