X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39578f9cfcf6447a3805c96c46573a6e9a577150..a6140a4c171601c75c8ab91e8c79bc7f28df8266:/src/mgl/utils.cpp

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 34930515df..ec8ed4ff07 100644
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -18,6 +18,7 @@
 #include "wx/string.h"
 
 #include "wx/intl.h"
+#include "wx/apptrait.h"
 #include "wx/log.h"
 #include "wx/process.h"
 
@@ -50,14 +51,18 @@ void wxBell()
 
 void wxSleep(int nSecs)
 {
-    wxUsleep(1000 * nSecs);
+    wxMilliSleep(1000 * nSecs);
 }
 
-void wxUsleep(unsigned long milliseconds)
+void wxMilliSleep(unsigned long milliseconds)
 {
     PM_sleep(milliseconds);
 }
 
+void wxMicroSleep(unsigned long microseconds)
+{
+    wxMilliSleep(microseconds/1000);
+}
 
 bool wxGetEnv(const wxString& var, wxString *value)
 {
@@ -140,19 +145,19 @@ bool wxGetFullHostName(wxChar *WXUNUSED(buf), int WXUNUSED(sz))
     return FALSE;
 }
 
-int wxKill(long WXUNUSED(pid), wxSignal WXUNUSED(sig), wxKillError *WXUNUSED(rc))
+int wxKill(long WXUNUSED(pid), wxSignal WXUNUSED(sig), wxKillError *WXUNUSED(rc), int WXUNUSED(flags))
 {
     wxFAIL_MSG( wxT("wxKill not implemented under MS-DOS!") );
     return 0;
 }
 
-long wxExecute(const wxString& WXUNUSED(command), bool WXUNUSED(sync), wxProcess *WXUNUSED(process))
+long wxExecute(const wxString& WXUNUSED(command), int WXUNUSED(flags), wxProcess *WXUNUSED(process))
 {
     wxFAIL_MSG( wxT("wxExecute not implemented under MS-DOS!") );
     return 0;
 }
 
-long wxExecute(wxChar **WXUNUSED(argv), bool WXUNUSED(sync), wxProcess *WXUNUSED(process))
+long wxExecute(char **WXUNUSED(argv), int WXUNUSED(flags), wxProcess *WXUNUSED(process))
 {
     wxFAIL_MSG( wxT("wxExecute not implemented under MS-DOS!") );
     return 0;
@@ -207,26 +212,53 @@ int wxDisplayDepth()
     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__)
-    return wxMGL_UNIX;
+    info.os = wxMGL_UNIX;
 #elif defined(__OS2__)
-    return wxMGL_OS2;
+    info.os = wxMGL_OS2;
 #elif defined(__WIN32__)
-    return wxMGL_WIN32;
+    info.os = wxMGL_WIN32;
 #elif defined(__DOS__)
-    return wxMGL_DOS;
+    info.os = wxMGL_DOS;
 #else
     #error Platform not supported by wxMGL!
 #endif
+    return info;
 }
 
+#endif
+
+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;
+}
 
 void wxGetMousePosition(int* x, int* y)
 {