Commit 39aee7284af2836542d7e8ec081158af9b7e5ac9

Emmanuele Bassi <ebassi @li…x.intel.com> (Committer)
Sat Jun 27 16:21:06 CEST 2009
Alexander Larsson (Author)
Thu Jun 25 12:11:17 CEST 2009

Tree SHA1: ce8a6cf
Parent SHA1: 7639ca0 (Post-release bump to 0.9.3)
raw diff | raw patch

Make GtkClutterEmbed derive from GtkContainer

This is required to later add child widgets when embedding Gtk+ widgets in
clutter.

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>

Diff rendering mode:
inline
side by side


58	58
59	59	#endif /* HAVE_CLUTTER_GTK_{X11,WIN32} */
60	60
61		G_DEFINE_TYPE (GtkClutterEmbed, gtk_clutter_embed, GTK_TYPE_WIDGET);
	61	G_DEFINE_TYPE (GtkClutterEmbed, gtk_clutter_embed, GTK_TYPE_CONTAINER);
62	62
63	63	#define GTK_CLUTTER_EMBED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_CLUTTER_TYPE_EMBED, GtkClutterEmbedPrivate))
64	64
…	…
514	514	}
515	515
516	516	static void
	517	gtk_clutter_embed_add (GtkContainer *container,
	518	GtkWidget *widget)
	519	{
	520	g_warning ("GtkClutterEmbed children not yet supported");
	521	}
	522
	523	static void
	524	gtk_clutter_embed_remove (GtkContainer *container,
	525	GtkWidget *widget)
	526	{
	527	g_warning ("GtkClutterEmbed children not yet supported");
	528	}
	529
	530	static void
	531	gtk_clutter_embed_forall (GtkContainer *container,
	532	gboolean include_internals,
	533	GtkCallback callback,
	534	gpointer callback_data)
	535	{
	536	}
	537
	538	static GType
	539	gtk_clutter_embed_child_type (GtkContainer *container)
	540	{
	541	/* No children supported yet */
	542	return G_TYPE_NONE;
	543	}
	544
	545	static void
517	546	gtk_clutter_embed_class_init (GtkClutterEmbedClass *klass)
518	547	{
519	548	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
520	549	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
	550	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
521	551
522	552	g_type_class_add_private (klass, sizeof (GtkClutterEmbedPrivate));
523	553
…	…
572	572	widget_class->focus_in_event = gtk_clutter_embed_focus_in;
573	573	widget_class->focus_out_event = gtk_clutter_embed_focus_out;
574	574	widget_class->scroll_event = gtk_clutter_embed_scroll_event;
	575
	576	container_class->add = gtk_clutter_embed_add;
	577	container_class->remove = gtk_clutter_embed_remove;
	578	container_class->forall = gtk_clutter_embed_forall;
	579	container_class->child_type = gtk_clutter_embed_child_type;
575	580	}
576	581
577	582	static void


53	53	struct _GtkClutterEmbed
54	54	{
55	55	/< private >/
56		GtkWidget parent_instance;
	56	GtkContainer parent_instance;
57	57
58	58	GtkClutterEmbedPrivate *priv;
59	59	};
…	…
68	68	struct _GtkClutterEmbedClass
69	69	{
70	70	/< private >/
71		GtkWidgetClass parent_class;
	71	GtkContainerClass parent_class;
72	72
73	73	/* padding for future expansion */
74	74	void (*_clutter_gtk_reserved1) (void);

Commit 39aee7284af2836542d7e8ec081158af9b7e5ac9

Gitorious