cleanup - reformatting

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 2b189d5056cc0c0233b1f4441707eff9f7f0e9da..fd2e5c63c73e0c0417e432908cffb3bd905a6c1e 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -3,14 +3,22 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/utils.h"
 #include "wx/string.h"
 
 #include "wx/intl.h"
+#include "wx/apptrait.h"
 #include "wx/log.h"
 #include "wx/process.h"
 
@@ -42,19 +50,22 @@ void wxBell()
 
 void wxDisplaySize(int *width, int *height)
 {
-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+   wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
     if (width) *width = g_displayDC->sizex()+1;
     if (height) *height = g_displayDC->sizey()+1;
 }
 
 void wxDisplaySizeMM(int *width, int *height)
 {
-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
-    if ( width ) 
-        *width = (g_displayDC->sizex()+1) * 25/72;
-    if ( height ) 
-        *height = (g_displayDC->sizey()+1) * 25/72;
-    // FIXME_MGL -- what about returning *real* monitor dimensions?
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
+
+    int xDPI, yDPI;
+    MGL_getDotsPerInch(&xDPI, &yDPI);
+
+    if ( width )
+        *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI);
+    if ( height )
+        *height = (int)((g_displayDC->sizey()+1) * 25.4 / yDPI);
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
@@ -67,34 +78,67 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 
 bool wxColourDisplay()
 {
-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
-    
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
+
     return (wxDisplayDepth() > 1);
 }
 
 int wxDisplayDepth()
 {
-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
 
     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__)
-  return wxMGL_UNIX;
+    info.os = wxMGL_UNIX;
 #elif defined(__OS2__)
-  return wxMGL_OS2;
+    info.os = wxMGL_OS2;
 #elif defined(__WIN32__)
-  return wxMGL_WIN32;
+    info.os = wxMGL_WIN32;
+#elif defined(__DOS__)
+    info.os = wxMGL_DOS;
+#else
+    #error Platform not supported by wxMGL!
 #endif
+    return info;
 }
 
+#endif
+
+#if 0
+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;
+}
+#endif
 
 void wxGetMousePosition(int* x, int* y)
 {