Warning fix.

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 52b214cfd4ef27b0baf8623aa3aca1985edd7073..c20c5db3ef2be391b705c7add7321189ac525bc3 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/mgl/utils.cpp

 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,10 +15,14 @@
 #endif
 
 #include "wx/utils.h"
 #endif
 
 #include "wx/utils.h"

-#include "wx/string.h"

 
 

-#include "wx/intl.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/apptrait.h"

 #include "wx/process.h"
 
 #include <stdarg.h>
 #include "wx/process.h"
 
 #include <stdarg.h>


@@ -43,13 +47,23 @@ void wxBell()
     // FIXME_MGL
 }
 
     // FIXME_MGL
 }
 

+bool wxGetKeyState(wxKeyCode key)
+{
+    wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
+        WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
+
+    // TODO
+
+    return false;
+}
+

 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------
 
 void wxDisplaySize(int *width, int *height)
 {
 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------
 
 void wxDisplaySize(int *width, int *height)
 {

-    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
+   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;
 }
     if (width) *width = g_displayDC->sizex()+1;
     if (height) *height = g_displayDC->sizey()+1;
 }


@@ -57,11 +71,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") );

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


@@ -75,7 +92,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 bool wxColourDisplay()
 {
     wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
 bool wxColourDisplay()
 {
     wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );

-    
+

     return (wxDisplayDepth() > 1);
 }
 
     return (wxDisplayDepth() > 1);
 }
 


@@ -86,26 +103,55 @@ 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
+
+#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)
 {
 
 void wxGetMousePosition(int* x, int* y)
 {