Added ATK_ROLE_FORM and ATK_RELATION_DESCRIBED_BY/DESCRIPTION_FOR to HEAD.

6 files changed, 30 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b8c238b..a662f9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-08 Bill Haneman <bill.haneman@sun.com>
+
+	* configure.in: Revved to 1.12.0 after tagging the repository with
+	gnome-2-14 (if we need to create/work on the old branch).
+	
+	* atk/atkobject.h, atkobject.c: Added ATK_ROLE_FORM (bug #344142).
+	
+	* atk/atkrelationtype.h: Added ATK_RELATION_DESCRIPTION_FOR, 
+	ATK_RELATION_DESCRIBED_BY (bug #344144).
+	
 2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* configure.in: Remove obsolete no.po referrals
diff --git a/NEWS b/NEWS
index 566c601..f6bf5de 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Changes in version 1.12.0: [ongoing]
+=========================
+
+* Added ATK_ROLE_FORM
+* Added ATK_RELATION_DESCRIPTION_FOR, ATK_RELATION_DESCRIBED_BY
+
 Changes in version 1.11.4:
 =========================
 
diff --git a/atk/atkobject.c b/atk/atkobject.c
index d2f88bb..77b3df2 100755
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -163,7 +163,8 @@ static const AtkRoleItem role_items [] =
   { ATK_ROLE_HEADING, N_("heading")},
   { ATK_ROLE_PAGE, N_("page")},
   { ATK_ROLE_SECTION, N_("section")},
-  { ATK_ROLE_REDUNDANT_OBJECT, N_("redundant object")}
+  { ATK_ROLE_REDUNDANT_OBJECT, N_("redundant object")},
+  { ATK_ROLE_FORM, N_("form")}
 };
 
 static void            atk_object_class_init        (AtkObjectClass  *klass);
diff --git a/atk/atkobject.h b/atk/atkobject.h
index 06379bb..d98de44 100755
--- a/atk/atkobject.h
+++ b/atk/atkobject.h
@@ -124,7 +124,11 @@ extern "C" {
  *@ATK_ROLE_HEADING: The object serves as a heading for content which follows it in a document. The 'heading level' of the heading, if availabe, may be obtained by querying the object's attributes.
  *@ATK_ROLE_PAGE: The object is a containing instance which encapsulates a page of information. @ATK_ROLE_PAGE is used in documents and content which support a paginated navigation model.
  *@ATK_ROLE_SECTION: The object is a containing instance of document content which constitutes a particular 'logical' section of the document. The type of content within a section, and the nature of the section division itself, may be obtained by querying the object's attributes. Sections may be nested.
- *@ATK_ROLE_REDUNDANT_OBJECT: The object is redundant with another object in the hierarchy, and is exposed for purely technical reasons.  Objects of this role should normally be ignored by clients.
+ *@ATK_ROLE_REDUNDANT_OBJECT: The object is redundant with another object in the hierarchy, and is exposed for purely technical reasons.  Objects of this role should normally be ignored by clients. 
+ *@ATK_ROLE_FORM: The object is a container for form controls, for instance as part of a 
+ * web form or user-input form within a document.  This role is primarily a tag/convenience for 
+ * clients when navigating complex documents, it is not expected that ordinary GUI containers will 
+ * always have ATK_ROLE_FORM.
  *@ATK_ROLE_LAST_DEFINED: not a valid role, used for finding end of the enumeration
  * 
  * Describes the role of an object
@@ -220,6 +224,7 @@ typedef enum
   ATK_ROLE_PAGE,
   ATK_ROLE_SECTION,
   ATK_ROLE_REDUNDANT_OBJECT,
+  ATK_ROLE_FORM,
   ATK_ROLE_LAST_DEFINED
 } AtkRole;
 
diff --git a/atk/atkrelationtype.h b/atk/atkrelationtype.h
index 6a019a2..665c675 100755
--- a/atk/atkrelationtype.h
+++ b/atk/atkrelationtype.h
@@ -45,6 +45,8 @@ extern "C" {
  *  this object's content is visualy embedded in another object.
  *@ATK_RELATION_POPUP_FOR: Indicates that an object is a popup for another object.
  *@ATK_RELATION_PARENT_WINDOW_OF: Indicates that an object is a parent window of another object.
+ *@ATK_RELATION_DESCRIBED_BY: Indicates that another object provides descriptive information about this object; more verbose than ATK_RELATION_LABELLED_BY.
+ *@ATK_RELATION_DESCRIPTION_FOR: Indicates that an object provides descriptive information about another object; more verbose than ATK_RELATION_LABEL_FOR.
  *@ATK_RELATION_LAST_DEFINED: Not used, this value indicates the end of the enumeration.
  * 
  *Describes the type of the relation
@@ -65,6 +67,8 @@ typedef enum
   ATK_RELATION_EMBEDDED_BY, 
   ATK_RELATION_POPUP_FOR, 
   ATK_RELATION_PARENT_WINDOW_OF, 
+  ATK_RELATION_DESCRIBED_BY,
+  ATK_RELATION_DESCRIPTION_FOR,
   ATK_RELATION_LAST_DEFINED
 } AtkRelationType;
 
diff --git a/configure.in b/configure.in
index 85bf62e..d62a39a 100644
--- a/configure.in
+++ b/configure.in
@@ -16,8 +16,8 @@ dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0.
 
 dnl The triplet 
 m4_define([atk_major_version], [1])
-m4_define([atk_minor_version], [11])
-m4_define([atk_micro_version], [4])
+m4_define([atk_minor_version], [12])
+m4_define([atk_micro_version], [0)
 m4_define([atk_version],
           [atk_major_version.atk_minor_version.atk_micro_version])