From 723fef9d8dc63b34f675205e0f2e346c319865b8 Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Wed, 26 Jan 2022 00:46:06 +0600 Subject: [PATCH] Use Marshal.GetFunctionPointerForDelegate (#301) This make code more trim friendly Improve #300 --- Source/Libs/GtkSharp/CellRenderer.GetSize.cs | 2 +- Source/Libs/GtkSharp/Container.Forall.cs | 2 +- Source/Tools/GapiCodegen/GObjectVM.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Libs/GtkSharp/CellRenderer.GetSize.cs b/Source/Libs/GtkSharp/CellRenderer.GetSize.cs index d499ae5dd..935b17189 100644 --- a/Source/Libs/GtkSharp/CellRenderer.GetSize.cs +++ b/Source/Libs/GtkSharp/CellRenderer.GetSize.cs @@ -32,7 +32,7 @@ namespace Gtk { unsafe { IntPtr* raw_ptr = (IntPtr*) (((long) gtype.GetClassPtr ()) + (long) class_abi.GetFieldOffset ("get_size")); - *raw_ptr = Marshal.GetFunctionPointerForDelegate ((Delegate) callback); + *raw_ptr = Marshal.GetFunctionPointerForDelegate (callback); } } diff --git a/Source/Libs/GtkSharp/Container.Forall.cs b/Source/Libs/GtkSharp/Container.Forall.cs index a6ade093d..8683c5270 100644 --- a/Source/Libs/GtkSharp/Container.Forall.cs +++ b/Source/Libs/GtkSharp/Container.Forall.cs @@ -41,7 +41,7 @@ namespace Gtk { unsafe { IntPtr* raw_ptr = (IntPtr*) (((long) gtype.GetClassPtr()) + (long) class_abi.GetFieldOffset("forall")); - *raw_ptr = Marshal.GetFunctionPointerForDelegate((Delegate) callback); + *raw_ptr = Marshal.GetFunctionPointerForDelegate(callback); } } diff --git a/Source/Tools/GapiCodegen/GObjectVM.cs b/Source/Tools/GapiCodegen/GObjectVM.cs index 8de8119fd..16fc46fbf 100644 --- a/Source/Tools/GapiCodegen/GObjectVM.cs +++ b/Source/Tools/GapiCodegen/GObjectVM.cs @@ -176,7 +176,7 @@ namespace GtkSharp.Generation { // Override VM; class_offset var is generated by object generatable sw.WriteLine("\t\t\tunsafe {"); sw.WriteLine("\t\t\t\tIntPtr* raw_ptr = (IntPtr*)(((long) gtype.GetClassPtr()) + (long) class_abi.GetFieldOffset(\"{0}\"));", CName); - sw.WriteLine("\t\t\t\t*raw_ptr = Marshal.GetFunctionPointerForDelegate((Delegate) callback);"); + sw.WriteLine("\t\t\t\t*raw_ptr = Marshal.GetFunctionPointerForDelegate(callback);"); sw.WriteLine("\t\t\t}"); sw.WriteLine("\t\t}"); sw.WriteLine ();