recognize ESC[APE] in menu accel strings (patch 733967)

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index c941c45a574b2416ebc06cde4e5250a54f73cae7..b70c6226894ab52b15e5d372f5e33140d06cf18d 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -180,9 +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
-    //FIXME __DIGITALMARS__ why is using sockets not properly turned off in setup.h ??
-    // find which library should contain sockets for Digital Mars CE April 2003
-#ifndef __DIGITALMARS__
+
     WSADATA wsa;
     if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )
     {
@@ -218,7 +216,6 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
             return TRUE;
         }
     }
-#endif //__DIGITALMARS__
 
 #endif // wxUSE_SOCKETS
 
@@ -1319,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;
 }