X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26993c4f64a7551050c597cd5f65e3c7f3066eaa..f0c5ebdc0d881e5478f166bab335265460409ec9:/src/msw/utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index b6bb6443b0..2a9d0a99a4 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -41,7 +41,7 @@
 // #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__)
+#if defined(__WIN32__) && !defined(__TWIN32__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
 extern "C" {
     #include <winsock.h>    // we use socket functions in wxGetFullHostName()
 }
@@ -127,7 +127,7 @@ extern "C" {
 #endif
 
 #  if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
-#  define new new(__FILE__,__LINE__)
+#  define new new(__TFILE__,__LINE__)
 #  endif
 
 #endif
@@ -163,7 +163,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {
-        wxLogLastError("GetComputerName");
+        wxLogLastError(wxT("GetComputerName"));
 
         return FALSE;
     }
@@ -185,7 +185,7 @@ bool wxGetHostName(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 )
@@ -450,7 +450,7 @@ bool wxDirExists(const wxString& dir)
 
     if ( h == INVALID_HANDLE_VALUE )
     {
-        wxLogLastError("FindFirstFile");
+        wxLogLastError(wxT("FindFirstFile"));
 
         return FALSE;
     }
@@ -472,6 +472,47 @@ bool wxDirExists(const wxString& dir)
 #endif // Win32/16
 }
 
+// ----------------------------------------------------------------------------
+// env vars
+// ----------------------------------------------------------------------------
+
+bool wxGetEnv(const wxString& var, wxString *value)
+{
+    // first get the size of the buffer
+    DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0);
+    if ( !dwRet )
+    {
+        // this means that there is no such variable
+        return FALSE;
+    }
+
+    if ( value )
+    {
+        (void)::GetEnvironmentVariable(var, value->GetWriteBuf(dwRet), dwRet);
+        value->UngetWriteBuf();
+    }
+
+    return TRUE;
+}
+
+bool wxSetEnv(const wxString& var, const wxChar *value)
+{
+    // some compilers have putenv() or _putenv() or _wputenv() but it's better
+    // to always use Win32 function directly instead of dealing with them
+#if defined(__WIN32__)
+    if ( !::SetEnvironmentVariable(var, value) )
+    {
+        wxLogLastError(_T("SetEnvironmentVariable"));
+
+        return FALSE;
+    }
+
+    return TRUE;
+#else // no way to set env vars
+    return FALSE;
+#endif
+}
+
 // ----------------------------------------------------------------------------
 // process management
 // ----------------------------------------------------------------------------
@@ -547,7 +588,7 @@ wxString wxGetOsDescription()
 
             case VER_PLATFORM_WIN32_WINDOWS:
                 str.Printf(_("Windows 9%c"),
-                           info.dwMinorVersion == 0 ? _T('5') : _T('9'));
+                           info.dwMinorVersion == 0 ? _T('5') : _T('8'));
                 if ( !wxIsEmpty(info.szCSDVersion) )
                 {
                     str << _T(" (") << info.szCSDVersion << _T(')');
@@ -910,8 +951,6 @@ bool wxCheckForInterrupt(wxWindow *wnd)
     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.
 
@@ -953,6 +992,8 @@ wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourc
 // get display info
 // ----------------------------------------------------------------------------
 
+// See also the wxGetMousePosition in window.cpp
+// Deprecated: use wxPoint wxGetMousePosition() instead
 void wxGetMousePosition( int* x, int* y )
 {
     POINT pt;
@@ -986,6 +1027,15 @@ void wxDisplaySize(int *width, int *height)
     if ( height ) *height = GetDeviceCaps(dc, VERTRES);
 }
 
+void wxDisplaySizeMM(int *width, int *height)
+{
+    ScreenHDC dc;
+
+    if ( width ) *width = GetDeviceCaps(dc, HORZSIZE);
+    if ( height ) *height = GetDeviceCaps(dc, VERTSIZE);
+}
+
+
 // ---------------------------------------------------------------------------
 // window information functions
 // ---------------------------------------------------------------------------
@@ -1052,6 +1102,8 @@ WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
 #endif // Win16/32
 }
 
+#endif // wxUSE_GUI
+
 #if 0
 //------------------------------------------------------------------------
 // wild character routines
@@ -1209,7 +1261,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
     return ((*str == '\0') && (*pattern == '\0'));
 };
 
-#endif
+#endif // 0
 
 #if 0