Author: mkestner
Date: 2005-05-04 16:36:55 -0400 (Wed, 04 May 2005)
New Revision: 44046
Modified:
trunk/gtk-sharp/ChangeLog
trunk/gtk-sharp/gdk/Input.custom
trunk/gtk-sharp/glib/Signal.cs
Log:
2005-05-04 Mike Kestner <[EMAIL PROTECTED]>
* glib/Signal.cs : s/DestroyNotify/SignalDestroyNotify to fix mcs 1.0
compilation.
* gdk/Input.custom : ditto.
Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog 2005-05-04 20:32:53 UTC (rev 44045)
+++ trunk/gtk-sharp/ChangeLog 2005-05-04 20:36:55 UTC (rev 44046)
@@ -1,3 +1,9 @@
+2005-05-04 Mike Kestner <[EMAIL PROTECTED]>
+
+ * glib/Signal.cs : s/DestroyNotify/SignalDestroyNotify to fix mcs 1.0
+ compilation.
+ * gdk/Input.custom : ditto.
+
2005-05-04 Todd Berman <[EMAIL PROTECTED]>
* glade/XML.custom: Store the callback wrapper so it doesn't get GC'd.
Modified: trunk/gtk-sharp/gdk/Input.custom
===================================================================
--- trunk/gtk-sharp/gdk/Input.custom 2005-05-04 20:32:53 UTC (rev 44045)
+++ trunk/gtk-sharp/gdk/Input.custom 2005-05-04 20:36:55 UTC (rev 44046)
@@ -21,7 +21,7 @@
// Boston, MA 02111-1307, USA.
[GLib.CDeclCallback]
- delegate void DestroyNotify (IntPtr data);
+ delegate void InputDestroyNotify (IntPtr data);
static void ReleaseGCHandle (IntPtr data)
{
@@ -32,16 +32,16 @@
gch.Free ();
}
- static DestroyNotify release_gchandle;
+ static InputDestroyNotify release_gchandle;
[DllImport("libgdk-win32-2.0-0.dll")]
- static extern int gdk_input_add_full (int source, int
condition, GdkSharp.InputFunctionNative function, IntPtr data, DestroyNotify
destroy);
+ static extern int gdk_input_add_full (int source, int
condition, GdkSharp.InputFunctionNative function, IntPtr data,
InputDestroyNotify destroy);
[Obsolete]
public static int AddFull (int source, Gdk.InputCondition
condition, Gdk.InputFunction function, IntPtr data, Gdk.DestroyNotify destroy)
{
if (release_gchandle == null)
- release_gchandle = new DestroyNotify
(ReleaseGCHandle);
+ release_gchandle = new InputDestroyNotify
(ReleaseGCHandle);
GdkSharp.InputFunctionWrapper function_wrapper = new
GdkSharp.InputFunctionWrapper (function);
GCHandle gch = GCHandle.Alloc (function_wrapper);
return gdk_input_add_full (source, (int) condition,
function_wrapper.NativeDelegate, (IntPtr) gch, release_gchandle);
@@ -51,7 +51,7 @@
public static int Add (int source, Gdk.InputCondition
condition, Gdk.InputFunction function)
{
if (release_gchandle == null)
- release_gchandle = new DestroyNotify
(ReleaseGCHandle);
+ release_gchandle = new InputDestroyNotify
(ReleaseGCHandle);
GdkSharp.InputFunctionWrapper function_wrapper = new
GdkSharp.InputFunctionWrapper (function);
GCHandle gch = GCHandle.Alloc (function_wrapper);
return gdk_input_add_full (source, (int) condition,
function_wrapper.NativeDelegate, (IntPtr) gch, release_gchandle);
Modified: trunk/gtk-sharp/glib/Signal.cs
===================================================================
--- trunk/gtk-sharp/glib/Signal.cs 2005-05-04 20:32:53 UTC (rev 44045)
+++ trunk/gtk-sharp/glib/Signal.cs 2005-05-04 20:36:55 UTC (rev 44046)
@@ -51,9 +51,9 @@
uint after_id = UInt32.MaxValue;
Delegate marshaler;
- static DestroyNotify notify = new DestroyNotify
(OnNativeDestroy);
+ static SignalDestroyNotify notify = new SignalDestroyNotify
(OnNativeDestroy);
[CDeclCallback]
- delegate void DestroyNotify (IntPtr data, IntPtr obj);
+ delegate void SignalDestroyNotify (IntPtr data, IntPtr obj);
static void OnNativeDestroy (IntPtr data, IntPtr obj)
{
GCHandle gch = (GCHandle) data;
@@ -191,7 +191,7 @@
static extern void g_object_set_data (IntPtr instance, IntPtr
key, IntPtr data);
[DllImport("libgobject-2.0-0.dll")]
- static extern void g_object_set_data_full (IntPtr instance,
IntPtr key, IntPtr data, DestroyNotify notify);
+ static extern void g_object_set_data_full (IntPtr instance,
IntPtr key, IntPtr data, SignalDestroyNotify notify);
[DllImport("libgobject-2.0-0.dll")]
static extern uint g_signal_connect_data(IntPtr obj, IntPtr
name, Delegate cb, IntPtr gc_handle, IntPtr dummy, int flags);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
