fixed WM_GETDLGCODE processing to include the bits returned by the DefWindowProc...

[wxWidgets.git] / src / msw / utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 8c8e1086504f70830dc2480b2c1a89f580a85ae2..2256d8fc5e7872f363ec6e200284974606c1c784 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -178,6 +178,11 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
 #if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
     // TODO should use GetComputerNameEx() when available
+
+    // the idea is that if someone had set wxUSE_SOCKETS to 0 the code
+    // shouldn't use winsock.dll (a.k.a. ws2_32.dll) at all so only use this
+    // code if we link with it anyhow
+#if wxUSE_SOCKETS
     WSADATA wsa;
     if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )
     {
@@ -206,13 +211,15 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 
         WSACleanup();
 
-        if ( !!host )
+        if ( !host.empty() )
         {
             wxStrncpy(buf, host, maxSize);
 
             return TRUE;
         }
     }
+#endif // wxUSE_SOCKETS
+
 #endif // Win32
 
     return wxGetHostName(buf, maxSize);
@@ -1592,7 +1599,7 @@ extern long wxCharsetToCodepage(const wxChar *name)
     if ( !name )
         return -1;
 
-    wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(name, FALSE);
+    wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(name, FALSE);
     if ( enc == wxFONTENCODING_SYSTEM )
         return -1;