Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 52b214cfd4ef27b0baf8623aa3aca1985edd7073..25618fdb3cb528f2f01d661f50d12903a3499663 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,11 +15,16 @@
 #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 "wx/process.h"

+#include "wx/evtloop.h"

 
 #include <stdarg.h>
 #include <string.h>
 
 #include <stdarg.h>
 #include <string.h>


@@ -38,18 +43,37 @@
 // misc.
 //----------------------------------------------------------------------------
 
 // misc.
 //----------------------------------------------------------------------------
 

+// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
+wxMemorySize wxGetFreeMemory()
+{
+    // TODO - probably should be extracted to
+    //        src/msdos/utilsdos.cpp and src/unix/utilsunx.cpp
+    //        to avoid code duplication
+    return -1;
+}
+

 void wxBell()
 {
     // FIXME_MGL
 }
 
 void wxBell()
 {
     // 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 +81,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 +102,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,24 +113,19 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
     return g_displayDC->getBitsPerPixel();
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const

 {
 {

-    if ( majorVsn )
-        *majorVsn = MGL_RELEASE_MAJOR;
-    if ( minorVsn )
-        *minorVsn = MGL_RELEASE_MINOR;
-
-#if defined(__UNIX__)
-    return wxMGL_UNIX;
-#elif defined(__OS2__)
-    return wxMGL_OS2;
-#elif defined(__WIN32__)
-    return wxMGL_WIN32;
-#elif defined(__DOS__)
-    return wxMGL_DOS;
-#else
-    #error Platform not supported by wxMGL!
-#endif
+    if ( verMaj )
+        *verMaj = MGL_RELEASE_MAJOR;
+    if ( verMin )
+        *verMin = MGL_RELEASE_MINOR;
+
+    return wxPORT_MGL;
+}
+
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop;

 }
 
 
 }
 
 


@@ -119,22 +141,26 @@ wxPoint wxGetMousePosition()
     return pt;
 }
 
     return pt;
 }
 

+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    int x, y;

 
 

+    wxGetMousePosition(&x, &y);

 
 

-#ifdef __UNIX__
+    ms.SetX(x);
+    ms.SetY(y);

 
 

-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,
-                            GTK_EndProcessDetector,
-                            (gpointer)proc_data);
-
-    return tag;
-#endif
+    extern unsigned long g_buttonState;
+    ms.SetLeftDown(g_buttonState & EVT_LEFTBUT);
+    ms.SetMiddleDown(g_buttonState & EVT_MIDDLEBUT);
+    ms.SetRightDown(g_buttonState & EVT_RIGHTBUT);
+
+    ms.SetControlDown(EVT_isKeyDown(KB_leftCtrl) || EVT_isKeyDown(KB_rightCtrl));
+    ms.SetShiftDown(EVT_isKeyDown(KB_leftShift) || EVT_isKeyDown(KB_rightShift));
+    ms.SetAltDown(EVT_isKeyDown(KB_leftAlt));
+    ms.SetMetaDown(EVT_isKeyDown(KB_rightAlt));
+
+    return ms;

 }
 
 }
 

-#endif