Added chapter on collection and container classes to contents

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 56413e05239df44eece9145af9a1d9fc4b9029c6..14346f1413a844fae01abfe845b3cf9fd6b70b58 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -36,6 +36,17 @@
     #include "wx/log.h"
 #endif  //WX_PRECOMP
 
     #include "wx/log.h"
 #endif  //WX_PRECOMP
 

+// In some mingws there is a missing extern "C" int the winsock header,
+// so we put it here just to be safe. Note that this must appear _before_
+// #include "wx/msw/private.h" which itself includes <windows.h>, as this 
+// one in turn includes <winsock.h> unless we define WIN32_LEAN_AND_MEAN.
+//
+#if defined(__WIN32__) && !defined(__TWIN32__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
+extern "C" {
+    #include <winsock.h>    // we use socket functions in wxGetFullHostName()
+}
+#endif
+

 #include "wx/msw/private.h"     // includes <windows.h>
 
 #include "wx/timer.h"
 #include "wx/msw/private.h"     // includes <windows.h>
 
 #include "wx/timer.h"


@@ -61,10 +72,6 @@
     #include <dir.h>
 #endif
 
     #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
 // 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


@@ -120,7 +127,7 @@
 #endif
 
 #  if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
 #endif
 
 #  if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS

-#  define new new(__FILE__,__LINE__)
+#  define new new(__TFILE__,__LINE__)

 #  endif
 
 #endif
 #  endif
 
 #endif


@@ -156,7 +163,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {

-        wxLogLastError("GetComputerName");
+        wxLogLastError(wxT("GetComputerName"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -178,7 +185,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {

-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__) && !defined(__TWIN32__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))

     // TODO should use GetComputerNameEx() when available
     WSADATA wsa;
     if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )
     // TODO should use GetComputerNameEx() when available
     WSADATA wsa;
     if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )


@@ -443,7 +450,7 @@ bool wxDirExists(const wxString& dir)
 
     if ( h == INVALID_HANDLE_VALUE )
     {
 
     if ( h == INVALID_HANDLE_VALUE )
     {

-        wxLogLastError("FindFirstFile");
+        wxLogLastError(wxT("FindFirstFile"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -584,7 +591,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
             *majorVsn = info.dwMajorVersion;
         if (minorVsn)
             *minorVsn = info.dwMinorVersion;
             *majorVsn = info.dwMajorVersion;
         if (minorVsn)
             *minorVsn = info.dwMinorVersion;

-
+        

         switch ( info.dwPlatformId )
         {
             case VER_PLATFORM_WIN32s:
         switch ( info.dwPlatformId )
         {
             case VER_PLATFORM_WIN32s:


@@ -903,8 +910,6 @@ bool wxCheckForInterrupt(wxWindow *wnd)
     return TRUE;
 }
 
     return TRUE;
 }
 

-#endif // wxUSE_GUI
-

 // MSW only: get user-defined resource from the .res file.
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.
 
 // MSW only: get user-defined resource from the .res file.
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.
 


@@ -1045,6 +1050,8 @@ WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
 #endif // Win16/32
 }
 
 #endif // Win16/32
 }
 

+#endif // wxUSE_GUI
+

 #if 0
 //------------------------------------------------------------------------
 // wild character routines
 #if 0
 //------------------------------------------------------------------------
 // wild character routines


@@ -1202,7 +1209,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
     return ((*str == '\0') && (*pattern == '\0'));
 };
 
     return ((*str == '\0') && (*pattern == '\0'));
 };
 

-#endif
+#endif // 0

 
 #if 0
 
 
 #if 0