use wxMBConvStrictUTF8 instead of wxMBConvUTF8 in ConvertStr() and mb/wc_str()

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index c6dad8291a9c999e7e5ebd5d544f167c9f81a281..114277e970139d06f4fd1aa776415f2f24e201dd 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -24,6 +24,7 @@
 
 #include "wx/apptrait.h"
 #include "wx/process.h"
 
 #include "wx/apptrait.h"
 #include "wx/process.h"

+#include "wx/evtloop.h"

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


@@ -42,6 +43,15 @@
 // 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


@@ -103,55 +113,21 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
     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)
 {
 
 void wxGetMousePosition(int* x, int* y)
 {