Swapped order of width and height arguments to

* atk/atktext.[c|h], docs/tmpl/atktext.sgml:
Swapped order of width and height arguments to
atk_text_get_character_extents()
Changed AtkAttrributeSet_free to atk_attribute_set_free

diff --git a/ChangeLog b/ChangeLog
index b8254f2..520819e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-16  Padraig O'Briain  <padraig.obriain@sun.com>
+       * atk/atktext.[c|h], docs/tmpl/atktext.sgml:
+       Swapped order of width and height arguments to
+       atk_text_get_character_extents()
+       Changed AtkAttrributeSet_free to atk_attribute_set_free
+
 2001-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * atk/atktext.[c|h], docs/tmpl/atktext.sgml:

diff --git a/atk/atktext.c b/atk/atktext.c
index bf40a46..69f6685 100755 (executable)
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -290,11 +290,11 @@ atk_text_get_caret_offset (AtkText *text)
  * @offset: position
  * @x: x-position of character
  * @y: y-position of character
- * @length: height of character
  * @width: width of character
+ * @height: height of character
  * @coords: specify whether coordinates are relative to the screen or widget window 
  *
- * Given an @offset, the @x, @y, @length, and @width values are filled
+ * Given an @offset, the @x, @y, @width, and @height values are filled
  * appropriately. 
  **/
 void
@@ -302,8 +302,8 @@ atk_text_get_character_extents (AtkText *text,
                                 gint offset,
                                 gint *x,
                                 gint *y,
-                                gint *height,
                                 gint *width,
+                                gint *height,
                                AtkCoordType coords)
 {
   AtkTextIface *iface;
@@ -313,13 +313,13 @@ atk_text_get_character_extents (AtkText *text,
   iface = ATK_TEXT_GET_IFACE (text);
 
   if (iface->get_character_extents)
-    (*(iface->get_character_extents)) (text, offset, x, y, height, width, coords);
+    (*(iface->get_character_extents)) (text, offset, x, y, width, height, coords);
   else
     {
       *x = 0;
       *x = 0;
-      *height = 0;
       *width = 0;
+      *height = 0;
     }
 }
 
@@ -589,14 +589,14 @@ atk_text_set_caret_offset (AtkText *text,
 }
 
 /**
- * AtkAttributeSet_free:
+ * atk_attribute_set_free:
  * @attrib_set: The #AtkAttributeSet to free
  *
  * Frees the memory used by an #AtkAttributeSet, including all its
  * #AtkAttributes.
  **/
 void
-AtkAttributeSet_free(AtkAttributeSet *attrib_set)
+atk_attribute_set_free(AtkAttributeSet *attrib_set)
 {
   gint index;
 

diff --git a/atk/atktext.h b/atk/atktext.h
index bea880a..f01aeb7 100755 (executable)
--- a/atk/atktext.h
+++ b/atk/atktext.h
@@ -333,8 +333,8 @@ struct _AtkTextIface
                                                    gint             offset,
                                                    gint             *x,
                                                    gint             *y,
-                                                   gint             *height,
                                                    gint             *width,
+                                                   gint             *height,
                                                    AtkCoordType            coords);
   gint           (* get_character_count)          (AtkText          *text);
   gint           (* get_offset_at_point)          (AtkText          *text,
@@ -401,8 +401,8 @@ void          atk_text_get_character_extents              (AtkText          *tex
                                                            gint             offset,
                                                            gint             *x,
                                                            gint             *y,
-                                                           gint             *height,
                                                            gint             *width,
+                                                           gint             *height,
                                                            AtkCoordType            coords);
 AtkAttributeSet* atk_text_ref_run_attributes              (AtkText         *text,
                                                           gint             offset,
@@ -429,7 +429,7 @@ gboolean      atk_text_set_selection                      (AtkText          *tex
                                                           gint             end_offset);
 gboolean      atk_text_set_caret_offset                   (AtkText          *text,
                                                            gint             offset);
-void         AtkAttributeSet_free                        (AtkAttributeSet  *attrib_set);
+void         atk_attribute_set_free                      (AtkAttributeSet  *attrib_set);
 
 #ifdef __cplusplus
 }

diff --git a/docs/tmpl/atktext.sgml b/docs/tmpl/atktext.sgml
index a46bda9..36eb004 100644 (file)
--- a/docs/tmpl/atktext.sgml
+++ b/docs/tmpl/atktext.sgml
@@ -9,13 +9,11 @@ AtkText
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### STRUCT AtkText ##### -->
 <para>
 
@@ -152,8 +150,8 @@ AtkText
 @offset: 
 @x: 
 @y: 
-@height: 
 @width: 
+@height: 
 @coords: