Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 7fad2ad588fa239abbecae6c3179b66991e89ae4..25618fdb3cb528f2f01d661f50d12903a3499663 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


@@ -113,6 +123,12 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
     return wxPORT_MGL;
 }
 
     return wxPORT_MGL;
 }
 

+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop;
+}
+
+

 void wxGetMousePosition(int* x, int* y)
 {
     MS_getPos(x, y);
 void wxGetMousePosition(int* x, int* y)
 {
     MS_getPos(x, y);


@@ -148,21 +164,3 @@ wxMouseState wxGetMouseState()
     return ms;
 }
 
     return ms;
 }
 

-
-#ifdef __UNIX__
-
-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
-{
-    wxFAIL_MSG(wxT("wxAddProcessCallback not implemented in wxMGL!"));
-    return 0;
-#if 0 // FIXME_MGL -do we need it at all?
-    int tag = gdk_input_add(fd,
-                            GDK_INPUT_READ,
-                            GTK_EndProcessDetector,
-                            (gpointer)proc_data);
-
-    return tag;
-#endif
-}
-
-#endif