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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 209597e140..ec8ed4ff07 100644
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -51,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)
 {
@@ -141,7 +145,7 @@ 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;
@@ -208,6 +212,8 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
+#if wxUSE_GUI
+
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
@@ -230,6 +236,29 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
     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)
 {