controls can now be put in the toolbars (MSW only so far, preliminary version)

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

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index e6f63b2ca39d6af83c38a96f952612f3c9664d6c..398a3cf016bc8ca893a8ab4d6509aeabf3a4f4bf 100644 (file)
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -30,10 +30,11 @@
 #include <memory.h>
 #endif
 
 #include <memory.h>
 #endif
 

-#include <wx/defs.h>
-#include <wx/object.h>
-#include <wx/gsocket.h>
-#include <wx/sckaddr.h>
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/log.h"
+#include "wx/gsocket.h"
+#include "wx/sckaddr.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)


@@ -101,18 +102,23 @@ wxIPV4address::~wxIPV4address()
 
 bool wxIPV4address::Hostname(const wxString& name)
 {
 
 bool wxIPV4address::Hostname(const wxString& name)
 {

+  // Some people are sometimes fool.
+  if (name == wxT("")) {
+    wxLogWarning( wxT("Trying to solve a NULL hostname: giving up") );
+    return FALSE;
+  }
+

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

-  /* Need API */
-  return TRUE;
+  return (GAddress_INET_SetHostAddress(m_address, addr) == GSOCK_NOERROR);

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

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

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


@@ -139,7 +145,7 @@ unsigned short wxIPV4address::Service()
   return GAddress_INET_GetPort(m_address); 
 }
 
   return GAddress_INET_GetPort(m_address); 
 }
 

-#ifdef IPV6_ENABLE
+#if 0

 // ---------------------------------------------------------------------------
 // wxIPV6address
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxIPV6address
 // ---------------------------------------------------------------------------