Author: jackson
Date: 2007-08-23 15:27:49 -0400 (Thu, 23 Aug 2007)
New Revision: 84739
Modified:
trunk/olive/class/agclr/Mono/ChangeLog
trunk/olive/class/agclr/Mono/Events.cs
trunk/olive/class/agmono/Mono/ChangeLog
trunk/olive/class/agmono/Mono/NativeMethods.cs
Log:
* Events.cs: Resize is now a proper event.
* NativeMethods.cs: add/remove handler methods have been
* renamed.
Modified: trunk/olive/class/agclr/Mono/ChangeLog
===================================================================
--- trunk/olive/class/agclr/Mono/ChangeLog 2007-08-23 19:27:12 UTC (rev
84738)
+++ trunk/olive/class/agclr/Mono/ChangeLog 2007-08-23 19:27:49 UTC (rev
84739)
@@ -1,3 +1,7 @@
+2007-08-23 Jackson Harper <[EMAIL PROTECTED]>
+
+ * Events.cs: Resize is now a proper event.
+
2007-08-20 Jb Evain <[EMAIL PROTECTED]>
* Events.cs: use methods in [agmono]Mono.Helper to avoid calling
Modified: trunk/olive/class/agclr/Mono/Events.cs
===================================================================
--- trunk/olive/class/agclr/Mono/Events.cs 2007-08-23 19:27:12 UTC (rev
84738)
+++ trunk/olive/class/agclr/Mono/Events.cs 2007-08-23 19:27:49 UTC (rev
84739)
@@ -58,9 +58,8 @@
internal static UnmanagedEventHandler lost_focus = new
UnmanagedEventHandler (lost_focus_callback);
internal static UnmanagedEventHandler loaded = new
UnmanagedEventHandler (loaded_callback);
internal static UnmanagedEventHandler mouse_leave = new
UnmanagedEventHandler (mouse_leave_callback);
+ internal static UnmanagedEventHandler surface_resized = new
UnmanagedEventHandler (surface_resized_callback);
- static PlainEvent surface_resized = new PlainEvent
(surface_resized_callback);
-
static void got_focus_callback (IntPtr target, IntPtr calldata,
IntPtr closure)
{
UIElement e = (UIElement)Helper.GCHandleFromIntPtr
(closure).Target;
@@ -137,7 +136,7 @@
e.InvokeMouseEnter (MarshalMouseEventArgs (calldata));
}
- static void surface_resized_callback (IntPtr target)
+ static void surface_resized_callback (IntPtr target, IntPtr
calldata, IntPtr clozure)
{
// Parameter ignored
@@ -146,17 +145,18 @@
internal static void InitSurface (IntPtr surface)
{
- NativeMethods.surface_register_events (surface,
surface_resized);
+ // We don't really need a closure for this event
+ NativeMethods.event_object_add_event_handler (surface,
"Resize", surface_resized, new GCHandle ());
}
internal static void AddHandler (DependencyObject obj, string
eventName, UnmanagedEventHandler handler)
{
- NativeMethods.dependency_object_add_event_handler
(obj.native, eventName, handler, obj.GCHandle);
+ NativeMethods.event_object_add_event_handler
(obj.native, eventName, handler, obj.GCHandle);
}
internal static void RemoveHandler (DependencyObject obj,
string eventName, UnmanagedEventHandler handler)
{
- NativeMethods.dependency_object_remove_event_handler
(obj.native, eventName, handler, obj.GCHandle);
+ NativeMethods.event_object_remove_event_handler
(obj.native, eventName, handler, obj.GCHandle);
}
}
}
Modified: trunk/olive/class/agmono/Mono/ChangeLog
===================================================================
--- trunk/olive/class/agmono/Mono/ChangeLog 2007-08-23 19:27:12 UTC (rev
84738)
+++ trunk/olive/class/agmono/Mono/ChangeLog 2007-08-23 19:27:49 UTC (rev
84739)
@@ -1,3 +1,7 @@
+2007-08-23 Jackson Harper <[EMAIL PROTECTED]>
+
+ * NativeMethods.cs: add/remove handler methods have been renamed.
+
2007-08-20 Jb Evain <[EMAIL PROTECTED]>
* Helper.cs: Add helper methods used in agclr.
Modified: trunk/olive/class/agmono/Mono/NativeMethods.cs
===================================================================
--- trunk/olive/class/agmono/Mono/NativeMethods.cs 2007-08-23 19:27:12 UTC
(rev 84738)
+++ trunk/olive/class/agmono/Mono/NativeMethods.cs 2007-08-23 19:27:49 UTC
(rev 84739)
@@ -607,10 +607,10 @@
#region EventObject
[DllImport("moon")]
- public extern static void dependency_object_add_event_handler
(IntPtr handle, string eventName, UnmanagedEventHandler handler, GCHandle
closure);
+ public extern static void event_object_add_event_handler
(IntPtr handle, string eventName, UnmanagedEventHandler handler, GCHandle
closure);
[DllImport("moon")]
- public extern static void
dependency_object_remove_event_handler (IntPtr handle, string eventName,
UnmanagedEventHandler handler, GCHandle closure);
+ public extern static void event_object_remove_event_handler
(IntPtr handle, string eventName, UnmanagedEventHandler handler, GCHandle
closure);
#endregion
#region plugin
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
