Moved function from mslu to utils to make the

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 7c138f7e4352468a71e0967c590f6429e1dbadc8..21d02155ad3c37a7a4e1b1c03dd86132adab858c 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -18,6 +18,7 @@
 #include "wx/string.h"
 
 #include "wx/intl.h"
 #include "wx/string.h"
 
 #include "wx/intl.h"

+#include "wx/apptrait.h"

 #include "wx/log.h"
 #include "wx/process.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)
 {
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)
 {

-#ifdef __WATCOMC__ // has putenv()

     wxString s = variable;
     if ( value )
         s << _T('=') << value;
     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;
     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)
 }
 
 const wxChar* wxGetHomeDir(wxString *home)


@@ -151,13 +147,13 @@ int wxKill(long WXUNUSED(pid), wxSignal WXUNUSED(sig), wxKillError *WXUNUSED(rc)
     return 0;
 }
 
     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;
 }
 
 {
     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;
 {
     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") );
 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 ) 
     if ( width ) 

-        *width = (g_displayDC->sizex()+1) * 25/72;
+        *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI);

     if ( height ) 
     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)
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)


@@ -209,26 +208,53 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
     return g_displayDC->getBitsPerPixel();
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
-{
-    if ( majorVsn )
-        *majorVsn = MGL_RELEASE_MAJOR;
-    if ( minorVsn )
-        *minorVsn = MGL_RELEASE_MINOR;
+#if wxUSE_GUI

 
 

+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+{
+    static wxToolkitInfo info;
+    info.shortName = _T("mgluniv");
+    info.name = _T("wxMGL");
+    info.versionMajor = MGL_RELEASE_MAJOR;
+    info.versionMinor = MGL_RELEASE_MINOR;
+    info.os = wxGTK;

 #if defined(__UNIX__)
 #if defined(__UNIX__)

-    return wxMGL_UNIX;
+    info.os = wxMGL_UNIX;

 #elif defined(__OS2__)
 #elif defined(__OS2__)

-    return wxMGL_OS2;
+    info.os = wxMGL_OS2;

 #elif defined(__WIN32__)
 #elif defined(__WIN32__)

-    return wxMGL_WIN32;
+    info.os = wxMGL_WIN32;

 #elif defined(__DOS__)
 #elif defined(__DOS__)

-    return wxMGL_DOS;
+    info.os = wxMGL_DOS;

 #else
     #error Platform not supported by wxMGL!
 #endif
 #else
     #error Platform not supported by wxMGL!
 #endif

+    return info;

 }
 
 }
 

+#endif
+
+wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
+{
+    static wxToolkitInfo info;
+    info.shortName = _T("mglbase");
+    info.versionMajor = MGL_RELEASE_MAJOR;
+    info.versionMinor = MGL_RELEASE_MINOR;
+    info.name = _T("wxBase");
+    info.os = wxGTK;
+#if defined(__UNIX__)
+    info.os = wxMGL_UNIX;
+#elif defined(__OS2__)
+    info.os = wxMGL_OS2;
+#elif defined(__WIN32__)
+    info.os = wxMGL_WIN32;
+#elif defined(__DOS__)
+    info.os = wxMGL_DOS;
+#else
+    #error Platform not supported by wxMGL!
+#endif
+    return info;
+}

 
 void wxGetMousePosition(int* x, int* y)
 {
 
 void wxGetMousePosition(int* x, int* y)
 {