summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@linux.intel.com>2010-07-21 16:35:56 +0100
committerEmmanuele Bassi <ebassi@linux.intel.com>2010-07-21 16:35:56 +0100
commita7bcd11f1ff0d47239363b59355f0c7f6a0b8346 (patch)
tree744a4480c7dc804f8fd02fc715e69f2902f4a116
parent699f99c2952b8066a9a1d3587222e0382def1fd0 (diff)
downloadclutter-gtk-a7bcd11f1ff0d47239363b59355f0c7f6a0b8346.tar.gz
window: Clean up
Remove the unneeded and unimplemented get_actor() method. Remove the Since annotations and clean up the documentation.
-rw-r--r--clutter-gtk/gtk-clutter-window.c8
-rw-r--r--clutter-gtk/gtk-clutter-window.h16
2 files changed, 13 insertions, 11 deletions
diff --git a/clutter-gtk/gtk-clutter-window.c b/clutter-gtk/gtk-clutter-window.c
index 74c6577..59652e8 100644
--- a/clutter-gtk/gtk-clutter-window.c
+++ b/clutter-gtk/gtk-clutter-window.c
@@ -289,7 +289,7 @@ gtk_clutter_window_new (void)
/**
* gtk_clutter_window_get_stage:
- * @self: the #GtkClutterWindow
+ * @window: the #GtkClutterWindow
*
* Retrieves the #ClutterStage that this window is embedding
*
@@ -298,13 +298,13 @@ gtk_clutter_window_new (void)
* Return value: (transfer none): the window's #ClutterStage
*/
ClutterActor *
-gtk_clutter_window_get_stage (GtkClutterWindow *self)
+gtk_clutter_window_get_stage (GtkClutterWindow *window)
{
GtkClutterWindowPrivate *priv;
- g_return_val_if_fail (GTK_CLUTTER_IS_WINDOW (self), NULL);
+ g_return_val_if_fail (GTK_CLUTTER_IS_WINDOW (window), NULL);
- priv = self->priv;
+ priv = window->priv;
return gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (priv->embed));
}
diff --git a/clutter-gtk/gtk-clutter-window.h b/clutter-gtk/gtk-clutter-window.h
index 812f889..8f5349c 100644
--- a/clutter-gtk/gtk-clutter-window.h
+++ b/clutter-gtk/gtk-clutter-window.h
@@ -45,9 +45,10 @@ typedef struct _GtkClutterWindowClass GtkClutterWindowClass;
/**
* GtkClutterWindow:
*
- * A ClutterWindow containing a #GtkWidget.
+ * A #GtkWindow containing a #ClutterStage.
*
- * Since: 0.6
+ * The <structname>GtkClutterWindow</structname> structure contains only
+ * private data and it should be accessed using the provided API.
*/
struct _GtkClutterWindow
{
@@ -62,7 +63,8 @@ struct _GtkClutterWindow
*
* Base class for #GtkClutterWindow.
*
- * Since: 0.6
+ * The <structname>GtkClutterWindowClass</structname> structure contains
+ * only private data.
*/
struct _GtkClutterWindowClass
{
@@ -78,10 +80,10 @@ struct _GtkClutterWindowClass
void (*_clutter_gtk_reserved6) (void);
};
-GType gtk_clutter_window_get_type (void) G_GNUC_CONST;
-GtkWidget *gtk_clutter_window_new (void);
-ClutterActor *gtk_clutter_window_get_stage (GtkClutterWindow *self);
-ClutterActor *gtk_clutter_window_get_actor (GtkClutterWindow *self);
+GType gtk_clutter_window_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gtk_clutter_window_new (void);
+ClutterActor *gtk_clutter_window_get_stage (GtkClutterWindow *window);
G_END_DECLS