Compilation fixes for wxMGL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 9e38dd0ef5a31bc43a4170f4d77a99a2e85578b7..b76b94ddd5b61373222b5228421aad88403e1984 100644 (file)
--- 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"
 #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"
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/log.h"


@@ -30,6 +29,7 @@
 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"

+#include "wx/evtloop.h"

 #include "wx/fontutil.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.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 21d02155ad3c37a7a4e1b1c03dd86132adab858c..d9e31e8b67fc8d2fc9c9f29a4ae3af9e0a50eab3 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -54,11 +54,15 @@ void wxSleep(int nSecs)
     wxUsleep(1000 * nSecs);
 }
 
     wxUsleep(1000 * nSecs);
 }
 

-void wxUsleep(unsigned long milliseconds)
+void wxMilliSleep(unsigned long milliseconds)

 {
     PM_sleep(milliseconds);
 }
 
 {
     PM_sleep(milliseconds);
 }
 

+void wxMicroSleep(unsigned long microseconds)
+{
+    wxMilliSleep(microseconds/1000);
+}

 
 bool wxGetEnv(const wxString& var, wxString *value)
 {
 
 bool wxGetEnv(const wxString& var, wxString *value)
 {


@@ -141,7 +145,7 @@ bool wxGetFullHostName(wxChar *WXUNUSED(buf), int WXUNUSED(sz))
     return FALSE;
 }
 
     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;
 {
     wxFAIL_MSG( wxT("wxKill not implemented under MS-DOS!") );
     return 0;

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 560a55b51471f1e1f4b190a3c7c8ec49107821ff..17646da080aaadcb80abf7226bd424e3a63ac372 100644 (file)
--- 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/utils.h"
     #include "wx/app.h"
     #include "wx/panel.h"

-    #include "wx/caret.h"

 #endif
 
 #if wxUSE_DRAG_AND_DROP
 #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/mgl/private.h"
 #include "wx/intl.h"
 #include "wx/dcscreen.h"

+#include "wx/caret.h"

 
 #include <mgraph.hpp>
 
 
 #include <mgraph.hpp>