X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2e178485a2efcc04c88fa107b354a3e14454991..bba35861478a26f5d8c756a9a7fa2bbd19a69cb1:/src/mgl/utils.cpp?ds=sidebyside

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 503914f8a2..114277e970 100644
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -24,6 +24,7 @@
 
 #include "wx/apptrait.h"
 #include "wx/process.h"
+#include "wx/evtloop.h"
 
 #include <stdarg.h>
 #include <string.h>
@@ -42,6 +43,15 @@
 // 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
@@ -103,55 +113,21 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
-#if wxUSE_GUI
-
-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
 {
-    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;
-}
+    if ( verMaj )
+        *verMaj = MGL_RELEASE_MAJOR;
+    if ( verMin )
+        *verMin = MGL_RELEASE_MINOR;
 
-#endif
+    return wxPORT_MGL;
+}
 
-#if 0
-wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
 {
-    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;
+    return new wxEventLoop;
 }
-#endif
+
 
 void wxGetMousePosition(int* x, int* y)
 {
@@ -168,7 +144,23 @@ wxPoint wxGetMousePosition()
 wxMouseState wxGetMouseState()
 {
     wxMouseState ms;
-    // TODO
+    int x, y;
+
+    wxGetMousePosition(&x, &y);
+
+    ms.SetX(x);
+    ms.SetY(y);
+
+    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;
 }