ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-03-01 04:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-10-16 Mike Kestner <mkestner@novell.com>

Browse source 
* gtk/CellRenderer.custom : marshal GTypes as IntPtr like the
	generator does.
	* gtk/Container.custom : ditto.  [Fixes comment #8 on 327058]

svn path=/trunk/gtk-sharp/; revision=87601
This commit is contained in:
Mike Kestner 2007-10-16 16:52:11 +00:00
parent 3341e20c13
commit ed158bd493
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-10-16 Mike Kestner <mkestner@novell.com>
* gtk/CellRenderer.custom : marshal GTypes as IntPtr like the
generator does.
* gtk/Container.custom : ditto. [Fixes comment #8 on 327058]
2007-10-15 Mike Kestner <mkestner@novell.com> 2007-10-15 Mike Kestner <mkestner@novell.com>
* generator/InterfaceGen.cs : gen Handle props as overrides. * generator/InterfaceGen.cs : gen Handle props as overrides.

12
gtk/CellRenderer.custom
View file

@ -29,7 +29,7 @@
static extern void gtksharp_cellrenderer_base_get_size (IntPtr handle, IntPtr widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height); static extern void gtksharp_cellrenderer_base_get_size (IntPtr handle, IntPtr widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height);
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_cellrenderer_override_get_size (GLib.GType gtype, GetSizeDelegate cb); static extern void gtksharp_cellrenderer_override_get_size (IntPtr gtype, GetSizeDelegate cb);
[GLib.CDeclCallback] [GLib.CDeclCallback]
delegate void GetSizeDelegate (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height); delegate void GetSizeDelegate (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height);
@ -62,7 +62,7 @@
{ {
if (GetSizeCallback == null) if (GetSizeCallback == null)
GetSizeCallback = new GetSizeDelegate (GetSize_cb); GetSizeCallback = new GetSizeDelegate (GetSize_cb);
gtksharp_cellrenderer_override_get_size (gtype, GetSizeCallback); gtksharp_cellrenderer_override_get_size (gtype.Val, GetSizeCallback);
} }
[GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideGetSize")] [GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideGetSize")]
@ -83,7 +83,7 @@
static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags); static extern void gtksharp_cellrenderer_base_render (IntPtr handle, IntPtr window, IntPtr widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_cellrenderer_override_render (GLib.GType gtype, RenderDelegate cb); static extern void gtksharp_cellrenderer_override_render (IntPtr gtype, RenderDelegate cb);
[GLib.CDeclCallback] [GLib.CDeclCallback]
delegate void RenderDelegate (IntPtr item, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags); delegate void RenderDelegate (IntPtr item, IntPtr window, IntPtr widget, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, Gtk.CellRendererState flags);
@ -106,7 +106,7 @@
{ {
if (RenderCallback == null) if (RenderCallback == null)
RenderCallback = new RenderDelegate (Render_cb); RenderCallback = new RenderDelegate (Render_cb);
gtksharp_cellrenderer_override_render (gtype, RenderCallback); gtksharp_cellrenderer_override_render (gtype.Val, RenderCallback);
} }
[GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideRender")] [GLib.DefaultSignalHandler (Type=typeof(Gtk.CellRenderer), ConnectionMethod="OverrideRender")]
@ -124,7 +124,7 @@
} }
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_cellrenderer_override_start_editing (GLib.GType gtype, StartEditingDelegate cb); static extern void gtksharp_cellrenderer_override_start_editing (IntPtr gtype, StartEditingDelegate cb);
[GLib.CDeclCallback] [GLib.CDeclCallback]
delegate IntPtr StartEditingDelegate (IntPtr raw, IntPtr evnt, IntPtr widget, IntPtr path, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, Gtk.CellRendererState flags); delegate IntPtr StartEditingDelegate (IntPtr raw, IntPtr evnt, IntPtr widget, IntPtr path, ref Gdk.Rectangle background_area, ref Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
@ -152,7 +152,7 @@
{ {
if (StartEditingCallback == null) if (StartEditingCallback == null)
StartEditingCallback = new StartEditingDelegate (StartEditing_cb); StartEditingCallback = new StartEditingDelegate (StartEditing_cb);
gtksharp_cellrenderer_override_start_editing (gtype, StartEditingCallback); gtksharp_cellrenderer_override_start_editing (gtype.Val, StartEditingCallback);
} }
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]

10
gtk/Container.custom
View file

@ -104,7 +104,7 @@ public Widget[] FocusChain {
static extern void gtksharp_container_base_forall (IntPtr handle, bool include_internals, IntPtr cb, IntPtr data); static extern void gtksharp_container_base_forall (IntPtr handle, bool include_internals, IntPtr cb, IntPtr data);
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_override_forall (GLib.GType gtype, ForallDelegate cb); static extern void gtksharp_container_override_forall (IntPtr gtype, ForallDelegate cb);
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_invoke_gtk_callback (IntPtr cb, IntPtr handle, IntPtr data); static extern void gtksharp_container_invoke_gtk_callback (IntPtr cb, IntPtr handle, IntPtr data);
@ -158,7 +158,7 @@ static void OverrideForallOld (GLib.GType gtype)
{ {
if (ForallOldCallback == null) if (ForallOldCallback == null)
ForallOldCallback = new ForallDelegate (ForallOld_cb); ForallOldCallback = new ForallDelegate (ForallOld_cb);
gtksharp_container_override_forall (gtype, ForallOldCallback); gtksharp_container_override_forall (gtype.Val, ForallOldCallback);
} }
[Obsolete ("Override the ForAll(bool,Gtk.Callback) method instead")] [Obsolete ("Override the ForAll(bool,Gtk.Callback) method instead")]
@ -183,7 +183,7 @@ static void OverrideForall (GLib.GType gtype)
{ {
if (ForallCallback == null) if (ForallCallback == null)
ForallCallback = new ForallDelegate (Forall_cb); ForallCallback = new ForallDelegate (Forall_cb);
gtksharp_container_override_forall (gtype, ForallCallback); gtksharp_container_override_forall (gtype.Val, ForallCallback);
} }
[GLib.DefaultSignalHandler (Type=typeof(Gtk.Container), ConnectionMethod="OverrideForall")] [GLib.DefaultSignalHandler (Type=typeof(Gtk.Container), ConnectionMethod="OverrideForall")]
@ -202,7 +202,7 @@ protected virtual void ForAll (bool include_internals, Gtk.Callback callback)
static extern IntPtr gtk_container_child_type(IntPtr raw); static extern IntPtr gtk_container_child_type(IntPtr raw);
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_override_child_type (GLib.GType type, ChildTypeDelegate cb); static extern void gtksharp_container_override_child_type (IntPtr type, ChildTypeDelegate cb);
[GLib.CDeclCallback] [GLib.CDeclCallback]
delegate IntPtr ChildTypeDelegate (IntPtr raw); delegate IntPtr ChildTypeDelegate (IntPtr raw);
@ -226,7 +226,7 @@ static void OverrideChildType (GLib.GType gtype)
{ {
if (ChildTypeCallback == null) if (ChildTypeCallback == null)
ChildTypeCallback = new ChildTypeDelegate (ChildType_cb); ChildTypeCallback = new ChildTypeDelegate (ChildType_cb);
gtksharp_container_override_child_type (gtype, ChildTypeCallback); gtksharp_container_override_child_type (gtype.Val, ChildTypeCallback);
} }
[GLib.DefaultSignalHandler (Type=typeof(Gtk.Container), ConnectionMethod="OverrideChildType")] [GLib.DefaultSignalHandler (Type=typeof(Gtk.Container), ConnectionMethod="OverrideChildType")]