From 90eb13e62eb92049da20ca45ff1456e38808a37a Mon Sep 17 00:00:00 2001
From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Fri, 22 Apr 2005 13:25:35 +0000
Subject: [PATCH] Compilation fixes for wxMGL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mgl/app.cpp    | 2 +-
 src/mgl/utils.cpp  | 8 ++++++--
 src/mgl/window.cpp | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 9e38dd0ef5..b76b94ddd5 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -22,7 +22,6 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/module.h"
-    #include "wx/evtloop.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
@@ -30,6 +29,7 @@
 #endif
 
 #include "wx/app.h"
+#include "wx/evtloop.h"
 #include "wx/fontutil.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 21d02155ad..d9e31e8b67 100644
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -54,11 +54,15 @@ void wxSleep(int nSecs)
     wxUsleep(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;
diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 560a55b514..17646da080 100644
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -37,7 +37,6 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/panel.h"
-    #include "wx/caret.h"
 #endif
 
 #if wxUSE_DRAG_AND_DROP
@@ -49,6 +48,7 @@
 #include "wx/mgl/private.h"
 #include "wx/intl.h"
 #include "wx/dcscreen.h"
+#include "wx/caret.h"
 
 #include <mgraph.hpp>
 
-- 
2.47.2