1. wxGetFullHostName() does return the full host name now under MSW

2. wxGetEmailAddress() doesn't always return empty string...
3. status bar created under MSW is of type wxStatusBar, hence wxWin RTTI
   works for it
4. carsh in IPC sample fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index f577b046f35a7ba33a7225d3c88c242d8fbb16fd..16406abe08a93b40955db2939fd22b8c01c25dcc 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -409,7 +409,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 {
   wxSocketBase *sock = event.GetSocket();
   wxSocketNotify evt = event.GetSocketEvent();
-  wxTCPConnection *connection = (wxTCPConnection *)(event.GetClientData());
+  wxTCPConnection *connection = (wxTCPConnection *)(sock->GetClientData());
 
   // This socket is being deleted; skip this event
   if (!connection)

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 542adadde694ef244212f409361e2d89e02815a1..b2947da8e81de3cf518d23d2cdeb97f27cfef71a 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1242,7 +1242,7 @@ class WXDLLEXPORT wxSocketModule : public wxModule
   DECLARE_DYNAMIC_CLASS(wxSocketModule)
 
 public:
-  bool OnInit() { return GSocket_Init(); }
+  bool OnInit() { return GSocket_Init() != 0; }
   void OnExit() { GSocket_Cleanup(); }
 };
 

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 2ac002dec36b657aa3d378faeba6a93568250149..0eb8453bd6910efdf21285bb297c431057290d96 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1091,14 +1091,13 @@ wxString wxGetEmailAddress()
 {
     wxString email;
 
-    wxString host = wxGetHostName();
+    wxString host = wxGetFullHostName();
     if ( !!host )
     {
         wxString user = wxGetUserId();
         if ( !!user )
         {
-            wxString email(user);
-            email << wxT('@') << host;
+            email << user << wxT('@') << host;
         }
     }
 

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 4e528223ee52d02ea40f6384739fd7e0f0e635b9..ac077260fab72c5c8a5e25b3e23fc693046e4cbe 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -360,30 +360,28 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number,
     wxStatusBar *statusBar = NULL;
 
 #if wxUSE_NATIVE_STATUSBAR
-    if ( UsesNativeStatusBar() )
+    if ( !UsesNativeStatusBar() )
     {
-        statusBar = (wxStatusBar *)new wxStatusBar95(this, id, style);
-
-        statusBar->SetFieldsCount(number);
+        statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style);
     }
     else
 #endif
     {
-        statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style, name);
+        statusBar = new wxStatusBar(this, id, style, name);
+    }
 
-        // Set the height according to the font and the border size
-        wxClientDC dc(statusBar);
-        dc.SetFont(statusBar->GetFont());
+    // Set the height according to the font and the border size
+    wxClientDC dc(statusBar);
+    dc.SetFont(statusBar->GetFont());
 
-        wxCoord y;
-        dc.GetTextExtent(_T("X"), NULL, &y );
+    wxCoord y;
+    dc.GetTextExtent(_T("X"), NULL, &y );
 
-        int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
+    int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
 
-        statusBar->SetSize(-1, -1, -1, height);
+    statusBar->SetSize(-1, -1, -1, height);
 
-        statusBar->SetFieldsCount(number);
-    }
+    statusBar->SetFieldsCount(number);
 
     return statusBar;
 }

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 7126032d69a10c291b13fb363330de093883d310..56413e05239df44eece9145af9a1d9fc4b9029c6 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -32,12 +32,13 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/cursor.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif  //WX_PRECOMP
 
 #include "wx/msw/private.h"     // includes <windows.h>
 
 #include "wx/timer.h"
-#include "wx/intl.h"
 
 #include <ctype.h>
 
@@ -54,14 +55,16 @@
     #include <sys/stat.h>
 #endif  //GNUWIN32
 
-#include "wx/log.h"
-
 #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
                     // this (3.1 I believe) and how to test for it.
                     // If this works for Borland 4.0 as well, then no worries.
     #include <dir.h>
 #endif
 
+#if defined(__WIN32__) && !defined(__TWIN32__)
+    #include <winsock.h> // we use socket functions in wxGetFullHostName()
+#endif
+
 // VZ: there is some code using NetXXX() functions to get the full user name:
 //     I don't think it's a good idea because they don't work under Win95 and
 //     seem to return the same as wxGetUserId() under NT. If you really want
@@ -146,12 +149,10 @@ static const wxChar eUSERID[]    = wxT("UserId");
 // get host name and related
 // ----------------------------------------------------------------------------
 
-// Get full hostname (eg. DoDo.BSn-Germany.crg.de)
+// Get hostname only (without domain name)
 bool wxGetHostName(wxChar *buf, int maxSize)
 {
 #if defined(__WIN32__) && !defined(__TWIN32__)
-    // TODO should use GetComputerNameEx() when available
-
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {
@@ -174,8 +175,48 @@ bool wxGetHostName(wxChar *buf, int maxSize)
 #endif
 }
 
+// get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
+#if defined(__WIN32__) && !defined(__TWIN32__)
+    // TODO should use GetComputerNameEx() when available
+    WSADATA wsa;
+    if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )
+    {
+        wxString host;
+        char bufA[256];
+        if ( gethostname(bufA, WXSIZEOF(bufA)) == 0 )
+        {
+            // gethostname() won't usually include the DNS domain name, for
+            // this we need to work a bit more
+            if ( !strchr(bufA, '.') )
+            {
+                struct hostent *pHostEnt =  gethostbyname(bufA);
+
+                if ( pHostEnt )
+                {
+                    // Windows will use DNS internally now
+                    pHostEnt = gethostbyaddr(pHostEnt->h_addr, 4, PF_INET);
+                }
+
+                if ( pHostEnt )
+                {
+                    host = pHostEnt->h_name;
+                }
+            }
+        }
+
+        WSACleanup();
+
+        if ( !!host )
+        {
+            wxStrncpy(buf, host, maxSize);
+
+            return TRUE;
+        }
+    }
+#endif // Win32
+
     return wxGetHostName(buf, maxSize);
 }