X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9210a48a337fc34dd00dc4c69d4afd0df862f508..0a2f5c7bc59906224f8ff93940e0bda33214c963:/src/mgl/utils.cpp?ds=sidebyside

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 7c138f7e43..a5c2f93497 100644
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,6 +18,7 @@
 #include "wx/string.h"
 
 #include "wx/intl.h"
+#include "wx/apptrait.h"
 #include "wx/log.h"
 #include "wx/process.h"
 
@@ -74,7 +75,6 @@ bool wxGetEnv(const wxString& var, wxString *value)
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)
 {
-#ifdef __WATCOMC__ // has putenv()
     wxString s = variable;
     if ( value )
         s << _T('=') << value;
@@ -87,10 +87,6 @@ bool wxSetEnv(const wxString& variable, const wxChar *value)
     strcpy(buf, p);
 
     return putenv(buf) == 0;
-#else // no way to set an env var
-    #error "Don't know how to implement wxSetEnv on this platform!"
-    return FALSE;
-#endif
 }
 
 const wxChar* wxGetHomeDir(wxString *home)
@@ -151,13 +147,13 @@ int wxKill(long WXUNUSED(pid), wxSignal WXUNUSED(sig), wxKillError *WXUNUSED(rc)
     return 0;
 }
 
-long wxExecute(const wxString& WXUNUSED(command), bool WXUNUSED(sync), wxProcess *WXUNUSED(process))
+long wxExecute(const wxString& WXUNUSED(command), int WXUNUSED(flags), wxProcess *WXUNUSED(process))
 {
     wxFAIL_MSG( wxT("wxExecute not implemented under MS-DOS!") );
     return 0;
 }
 
-long wxExecute(wxChar **WXUNUSED(argv), bool WXUNUSED(sync), wxProcess *WXUNUSED(process))
+long wxExecute(char **WXUNUSED(argv), int WXUNUSED(flags), wxProcess *WXUNUSED(process))
 {
     wxFAIL_MSG( wxT("wxExecute not implemented under MS-DOS!") );
     return 0;
@@ -180,11 +176,14 @@ void wxDisplaySize(int *width, int *height)
 void wxDisplaySizeMM(int *width, int *height)
 {
     wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
+
+    int xDPI, yDPI;
+    MGL_getDotsPerInch(&xDPI, &yDPI);    
+    
     if ( width ) 
-        *width = (g_displayDC->sizex()+1) * 25/72;
+        *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI);
     if ( height ) 
-        *height = (g_displayDC->sizey()+1) * 25/72;
-    // FIXME_MGL -- what about returning *real* monitor dimensions?
+        *height = (int)((g_displayDC->sizey()+1) * 25.4 / yDPI);
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
@@ -209,7 +208,7 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
 {
     if ( majorVsn )
         *majorVsn = MGL_RELEASE_MAJOR;