Acutally use the m_maxChars parameter value instead of ignoring it

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 6d1b87409edb7e1f6f0288d7fd0d458d467039dd..b70c6226894ab52b15e5d372f5e33140d06cf18d 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -180,6 +180,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
     // 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 )
     {
@@ -215,6 +216,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
             return TRUE;
         }
     }
+
 #endif // wxUSE_SOCKETS
 
 #endif // Win32
@@ -1009,7 +1011,7 @@ wxString wxGetOsDescription()
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
-#if defined(__WIN32__) && !defined(__SC__)
+#if defined(__WIN32__) 
     static int ver = -1, major = -1, minor = -1;
 
     if ( ver == -1 )
@@ -1314,7 +1316,11 @@ static HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
 static HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
 static int gs_wxBusyCursorCount = 0;
 
+#ifdef __DIGITALMARS__
+extern "C" HCURSOR wxGetCurrentBusyCursor()
+#else
 extern HCURSOR wxGetCurrentBusyCursor()
+#endif
 {
     return gs_wxBusyCursor;
 }