applied patch for compilation with gcc 3.0

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index e32d27860f15b1adbd680f66d8649695cdc91923..8e907f1bd26f027d5c67d4abd90755c9102c480e 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -463,6 +463,16 @@ bool wxDirExists(const wxString& dir)
 
 bool wxGetEnv(const wxString& var, wxString *value)
 {
+#ifdef __WIN16__
+    const wxChar* ret = wxGetenv(var);
+    if (ret)
+    {
+        *value = ret;
+        return TRUE;
+    }
+    else
+        return FALSE;
+#else
     // first get the size of the buffer
     DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0);
     if ( !dwRet )
@@ -478,6 +488,7 @@ bool wxGetEnv(const wxString& var, wxString *value)
     }
 
     return TRUE;
+#endif
 }
 
 bool wxSetEnv(const wxString& var, const wxChar *value)
@@ -1034,14 +1045,20 @@ void wxDisplaySizeMM(int *width, int *height)
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
+#ifdef __WIN16__
+    *x = 0; *y = 0;
+    wxDisplaySize(width, height);
+#else
     // Determine the desktop dimensions minus the taskbar and any other
     // special decorations...
     RECT r;
+
     SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
     if (x)      *x = r.left;
     if (y)      *y = r.top;
     if (width)  *width = r.right - r.left;
     if (height) *height = r.bottom - r.top;
+#endif
 }