Author: miguel
Date: 2007-07-23 01:32:42 -0400 (Mon, 23 Jul 2007)
New Revision: 82461

Modified:
   trunk/olive/class/ChangeLog
   trunk/olive/class/System.Silverlight/System.Windows.Browser/ChangeLog
   trunk/olive/class/System.Silverlight/System.Windows.Browser/HtmlTimer.cs
   trunk/olive/class/agmono/Mono/NativeMethods.cs
Log:
The managed side

Modified: trunk/olive/class/ChangeLog
===================================================================
--- trunk/olive/class/ChangeLog 2007-07-23 05:29:44 UTC (rev 82460)
+++ trunk/olive/class/ChangeLog 2007-07-23 05:32:42 UTC (rev 82461)
@@ -1,3 +1,8 @@
+2007-07-23  Miguel de Icaza  <[EMAIL PROTECTED]>
+
+       * Add System.Windows.Interop/PluginHost.cs to expose the plugin
+       handle to other assemblies (System.Silverlight).
+
 2007-06-15  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * Makefile : we can add agclr here. It's mostly stable.

Modified: trunk/olive/class/System.Silverlight/System.Windows.Browser/ChangeLog
===================================================================
--- trunk/olive/class/System.Silverlight/System.Windows.Browser/ChangeLog       
2007-07-23 05:29:44 UTC (rev 82460)
+++ trunk/olive/class/System.Silverlight/System.Windows.Browser/ChangeLog       
2007-07-23 05:32:42 UTC (rev 82461)
@@ -1,3 +1,7 @@
+2007-07-23  Miguel de Icaza  <[EMAIL PROTECTED]>
+
+       * HtmlTimer.cs: Use the plugin functions, pass the plugin handle 
+
 2007-07-20  Miguel de Icaza  <[EMAIL PROTECTED]>
 
        * HtmlTimer.cs: Implement.

Modified: 
trunk/olive/class/System.Silverlight/System.Windows.Browser/HtmlTimer.cs
===================================================================
--- trunk/olive/class/System.Silverlight/System.Windows.Browser/HtmlTimer.cs    
2007-07-23 05:29:44 UTC (rev 82460)
+++ trunk/olive/class/System.Silverlight/System.Windows.Browser/HtmlTimer.cs    
2007-07-23 05:32:42 UTC (rev 82461)
@@ -27,6 +27,7 @@
 //
 using System;
 using Mono;
+using System.Windows.Interop;
 
 namespace System.Windows.Browser
 {
@@ -40,7 +41,6 @@
                {
                }
 
-               [MonoTODO]
                public bool Enabled {
                        set {
                                if (value)
@@ -86,7 +86,7 @@
                                return;
 
                        callback = new NativeMethods.GSourceFunc 
(timer_callback);
-                       source_id = NativeMethods.html_timer_timeout_add 
(interval, callback, IntPtr.Zero);
+                       source_id = NativeMethods.plugin_html_timer_timeout_add 
(PluginHost.Handle, interval, callback, IntPtr.Zero);
                }
 
                public void Stop ()
@@ -94,7 +94,7 @@
                        if (source_id == 0)
                                return;
 
-                       NativeMethods.html_timer_timeout_stop (source_id);
+                       NativeMethods.plugin_html_timer_timeout_stop 
(PluginHost.Handle, source_id);
                        source_id = 0;
                        callback = null;
                }

Modified: trunk/olive/class/agmono/Mono/NativeMethods.cs
===================================================================
--- trunk/olive/class/agmono/Mono/NativeMethods.cs      2007-07-23 05:29:44 UTC 
(rev 82460)
+++ trunk/olive/class/agmono/Mono/NativeMethods.cs      2007-07-23 05:32:42 UTC 
(rev 82461)
@@ -579,11 +579,11 @@
 #region HtmlTimer
                public delegate bool GSourceFunc  (IntPtr data);
                
-               [DllImport("moon")]
-               public extern static uint html_timer_timeout_add (int interval, 
GSourceFunc callback, IntPtr data);
+               [DllImport("moonplugin")]
+               public extern static uint plugin_html_timer_timeout_add (IntPtr 
plugin_handle, int interval, GSourceFunc callback, IntPtr data);
                
-               [DllImport("moon")]
-               public extern static void html_timer_timeout_stop (uint 
source_id);
+               [DllImport("moonplugin")]
+               public extern static void plugin_html_timer_timeout_stop 
(IntPtr plugin_handle, uint source_id);
 #endregion
                
 #region EventObject

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to