cleanup - reformatting

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 95bc72a9ff5b1d45dfea2ff04debeb9675f8244d..fd2e5c63c73e0c0417e432908cffb3bd905a6c1e 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -3,16 +3,23 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 

+// 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/utils.h"
 #include "wx/string.h"
 
 #include "wx/intl.h"

+#include "wx/apptrait.h"

 #include "wx/log.h"
 #include "wx/log.h"

-

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


@@ -26,6 +33,8 @@
 #include "wx/unix/execute.h"
 #endif
 
 #include "wx/unix/execute.h"
 #endif
 

+#include "wx/mgl/private.h"
+

 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------


@@ -39,52 +48,118 @@ void wxBell()
 // display characterstics
 // ----------------------------------------------------------------------------
 
 // display characterstics
 // ----------------------------------------------------------------------------
 

-extern MGLDevCtx *g_displayDC;
+void wxDisplaySize(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;
+    if (height) *height = g_displayDC->sizey()+1;
+}

 
 

-void wxDisplaySize( int *width, int *height )
+void wxDisplaySizeMM(int *width, int *height)

 {
 {

-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
-    if (width) *width = g_displayDC->sizex();
-    if (height) *height = g_displayDC->sizey();
+    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 wxGetMousePosition( int* x, int* y )
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)

 {
 {

-#if 0 // FIXME_MGL
-    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
-#endif
+    if ( x ) *x = 0;
+    if ( y ) *y = 0;
+    wxDisplaySize(width, height);
+    // FIXME_MGL - windowed version needs different handling

 }
 
 bool wxColourDisplay()
 {
 }
 
 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()
 {
     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();
 }
 
 
     return g_displayDC->getBitsPerPixel();
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+#if wxUSE_GUI
+
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

-#if 0 // FIXME_MGL
-        // FIXME_MGL : wxGetOsVersion, too
-  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
-  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
+    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__)
+    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

 
 

-  return wxGTK;
+#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
 #endif

+
+void wxGetMousePosition(int* x, int* y)
+{
+    MS_getPos(x, y);
+}
+
+wxPoint wxGetMousePosition()
+{
+    wxPoint pt;
+    wxGetMousePosition(&pt.x, &pt.y);
+    return pt;

 }
 
 
 }
 
 

+

 #ifdef __UNIX__
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
 #ifdef __UNIX__
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {

+    wxFAIL_MSG(wxT("wxAddProcessCallback not implemented in wxMGL!"));
+    return 0;

 #if 0 // FIXME_MGL -do we need it at all?
     int tag = gdk_input_add(fd,
                             GDK_INPUT_READ,
 #if 0 // FIXME_MGL -do we need it at all?
     int tag = gdk_input_add(fd,
                             GDK_INPUT_READ,