removed clutter_actor_get_abs_position_units() and clutter_actor_get_abs_size_units...

diff --git a/ChangeLog b/ChangeLog
index f36eba1..f79f1da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-23  Tomas Frydrych  <tf@openedhand.com>
+
+       * clutter/clutter-actor.c:
+       * clutter/clutter-actor.h:
+       (clutter_actor_get_abs_size_units):
+       (clutter_actor_get_abs_position_units):
+       removed from public api
+       
 2007-05-22  Tomas Frydrych  <tf@openedhand.com>
 
        * configure.ac:

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 93d85b7..eba26e9 100644 (file)
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -1078,28 +1078,7 @@ clutter_actor_get_size (ClutterActor *self,
     *height = clutter_actor_get_height (self);
 }
 
-/**
- * clutter_actor_get_abs_position
- * @self: A #ClutterActor
- * @x: Location to store x position if non NULL.
- * @y: Location to store y position if non NULL.
- *
- * Gets the absolute position of an actor in pixels relative
- * to the stage.
- */
-void
-clutter_actor_get_abs_position (ClutterActor *self,
-                               gint           *x,
-                               gint           *y)
-{
-  gint32 xu, yu;
-  clutter_actor_get_abs_position_units (self, &xu, &yu);
-
-  *x = CLUTTER_UNITS_TO_INT (xu);
-  *y = CLUTTER_UNITS_TO_INT (yu);
-}
-
-/**
+/*
  * clutter_actor_get_abs_position_units
  * @self: A #ClutterActor
  * @x: Location to store x position if non NULL.
@@ -1110,7 +1089,7 @@ clutter_actor_get_abs_position (ClutterActor *self,
  *
  * Since: 0.4
  */
-void
+static void
 clutter_actor_get_abs_position_units (ClutterActor *self,
                                      gint32       *x,
                                      gint32       *y)
@@ -1153,27 +1132,27 @@ clutter_actor_get_abs_position_units (ClutterActor *self,
 }
 
 /**
- * clutter_actor_get_abs_size:
+ * clutter_actor_get_abs_position
  * @self: A #ClutterActor
- * @width: Location to store width if non NULL.
- * @height: Location to store height if non NULL.
+ * @x: Location to store x position if non NULL.
+ * @y: Location to store y position if non NULL.
  *
- * Gets the absolute size of an actor taking into account
- * an scaling factors
+ * Gets the absolute position of an actor in pixels relative
+ * to the stage.
  */
 void
-clutter_actor_get_abs_size (ClutterActor *self,
-                           guint        *width,
-                           guint        *height)
+clutter_actor_get_abs_position (ClutterActor *self,
+                               gint           *x,
+                               gint           *y)
 {
-  gint32 wu, hu;
-  clutter_actor_get_abs_size_units (self, &wu, &hu);
-  
-  *width  = CLUTTER_UNITS_TO_INT (wu);
-  *height = CLUTTER_UNITS_TO_INT (hu);
+  gint32 xu, yu;
+  clutter_actor_get_abs_position_units (self, &xu, &yu);
+
+  *x = CLUTTER_UNITS_TO_INT (xu);
+  *y = CLUTTER_UNITS_TO_INT (yu);
 }
 
-/**
+/*
  * clutter_actor_get_abs_size_units:
  * @self: A #ClutterActor
  * @width: Location to store width if non NULL.
@@ -1184,7 +1163,7 @@ clutter_actor_get_abs_size (ClutterActor *self,
  *
  * Since: 0.4
  */
-void
+static void
 clutter_actor_get_abs_size_units (ClutterActor *self,
                                  gint32       *width,
                                  gint32       *height)
@@ -1227,6 +1206,27 @@ clutter_actor_get_abs_size_units (ClutterActor *self,
   while ((parent = clutter_actor_get_parent (parent)) != NULL);
 }
 
+/**
+ * clutter_actor_get_abs_size:
+ * @self: A #ClutterActor
+ * @width: Location to store width if non NULL.
+ * @height: Location to store height if non NULL.
+ *
+ * Gets the absolute size of an actor taking into account
+ * an scaling factors
+ */
+void
+clutter_actor_get_abs_size (ClutterActor *self,
+                           guint        *width,
+                           guint        *height)
+{
+  gint32 wu, hu;
+  clutter_actor_get_abs_size_units (self, &wu, &hu);
+  
+  *width  = CLUTTER_UNITS_TO_INT (wu);
+  *height = CLUTTER_UNITS_TO_INT (hu);
+}
+
 
 /**
  * clutter_actor_get_width

diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 6379ced..3fbd3f1 100644 (file)
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -184,9 +184,6 @@ void                  clutter_actor_set_position     (ClutterActor          *sel
 void                  clutter_actor_get_abs_position (ClutterActor          *self,
                                                      gint                  *x,
                                                      gint                  *y);
-void                  clutter_actor_get_abs_position_units (ClutterActor    *self,
-                                                           gint32          *x,
-                                                           gint32          *y);
 guint                 clutter_actor_get_width        (ClutterActor          *self);
 guint                 clutter_actor_get_height       (ClutterActor          *self);
 
@@ -261,9 +258,6 @@ void                  clutter_actor_scalex           (ClutterActor          *sel
 void                  clutter_actor_get_abs_size     (ClutterActor          *self,
                                                       guint                 *width,
                                                       guint                 *height);
-void                  clutter_actor_get_abs_size_units (ClutterActor        *self,
-                                                       gint32              *width,
-                                                       gint32              *height);
 void                  clutter_actor_get_size         (ClutterActor          *self,
                                                       guint                 *width,
                                                       guint                 *height);