ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* gtk/Container.custom (ChildType): fix this to just call

Browse source 
gtk_container_child_type().

	* gtk/glue/container.c (gtksharp_container_base_child_type): kill

svn path=/trunk/gtk-sharp/; revision=41330
This commit is contained in:
Dan Winship 2005-03-01 18:02:16 +00:00
parent 57972ab070
commit c47f1eb8d8
4 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-02-28 Dan Winship <danw@novell.com>
* gtk/Container.custom (ChildType): fix this to just call
gtk_container_child_type().
* gtk/glue/container.c (gtksharp_container_base_child_type): kill
2005-02-28 Mike Kestner <mkestner@novell.com>
* glib/Idle.cs : add locking on the source_handlers.

5
doc/en/Gtk/Container.xml
View file

@ -600,7 +600,10 @@
<Docs>
<summary>Returns the type of children supported by this container.</summary>
<returns>a <see cref="T:GLib.GType" /></returns>
<remarks />
<remarks>
If you override this in a derived container class, you
must not call base.ChildType() from the overridden method.
</remarks>
</Docs>
</Member>
<Member MemberName="ForeachFull">

6
gtk/Container.custom
View file

@ -156,8 +156,8 @@ protected virtual void ForAll (bool include_internals, CallbackInvoker invoker)
gtksharp_container_base_forall (Handle, include_internals, invoker.Callback, invoker.Data);
}
[DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_container_base_child_type(IntPtr raw);
[DllImport("libgtk-win32-2.0-0.dll")]
static extern IntPtr gtk_container_child_type(IntPtr raw);
[DllImport("gtksharpglue-2")]
static extern void gtksharp_container_override_child_type (GLib.GType type, ChildTypeDelegate cb);
@ -182,7 +182,7 @@ static void OverrideChildType (GLib.GType gtype)
[GLib.DefaultSignalHandler (Type=typeof(Gtk.Container), ConnectionMethod="OverrideChildType")]
public virtual GLib.GType ChildType() {
IntPtr raw_ret = gtksharp_container_base_child_type(Handle);
IntPtr raw_ret = gtk_container_child_type(Handle);
GLib.GType ret = new GLib.GType(raw_ret);
return ret;
}

14
gtk/glue/container.c
View file

@ -58,20 +58,6 @@ gtksharp_container_invoke_gtk_callback (GtkCallback cb, GtkWidget *widget, gpoin
cb (widget, data);
}
GType gtksharp_container_base_child_type (GtkContainer *container);
GType
gtksharp_container_base_child_type (GtkContainer *container)
{
GtkContainerClass *parent = g_type_class_peek_parent (G_OBJECT_GET_CLASS (container));
GType slot;
if (parent->child_type)
slot = (*parent->child_type) (container);
else
slot = G_TYPE_NONE;
return slot;
}
void gtksharp_container_override_child_type (GType gtype, gpointer cb);
void