Added ATK_ROLE_APPLICATION, revved to 1.1.3. Fix for 99090.

8 files changed, 49 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index df84924..e51586a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-11-20  Bill Haneman <bill.haneman@sun.com>
+
+	* atk/atkobject.h:
+	Added ATK_ROLE_APPLICATION.
+
+	* atk/atkobject.c:
+	(atk_role_get_localized_name):
+	Added ATK_ROLE_APPLICATION case.	
+
+	* docs/atk-decl.txt:
+	Added ATK_ROLE_APPLICATION to docs.
+	
 2002-11-18  Abi Brady  <morwen@evilmagic.org>
 
 	* configure.in: Added "en_GB" to ALL_LINGUAS.
@@ -13,6 +25,7 @@
 	* docs/tmpl/atkhyperlink.sgml docs/tmpl/atkobject.sgml
 	Update docs.
 
+>>>>>>> 1.223
 2002-11-14  Bill Haneman <bill.haneman@sun.com>
 
 	* configure.in:
diff --git a/atk/atkobject.c b/atk/atkobject.c
index 3b51ab6..0c9c220 100755
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -1398,6 +1398,9 @@ atk_role_get_localized_name (AtkRole role)
       case ATK_ROLE_RULER:
         name = _("ruler");
         break;
+      case ATK_ROLE_APPLICATION:
+        name = _("application");
+        break;
       default:
         name = atk_role_get_name (role);
         break;
diff --git a/atk/atkobject.h b/atk/atkobject.h
index 89f5deb..ddef6d8 100755
--- a/atk/atkobject.h
+++ b/atk/atkobject.h
@@ -113,6 +113,7 @@ extern "C" {
  *@ATK_ROLE_FOOTER: An object that serves as a document footer.
  *@ATK_ROLE_PARAGRAPH: An object which is contains a paragraph of text content.
  *@ATK_ROLE_RULER: An object which describes margins and tab stops, etc. for text objects which it controls (should have CONTROLLER_FOR relation to such).
+ *@ATK_ROLE_APPLICATION: The object is an application object, which may contain @ATK_ROLE_FRAME objects or other types of accessibles.
  *@ATK_ROLE_LAST_DEFINED: not a valid role, used for finding end of enumeration
  * 
  *Describes the role of an object
@@ -192,6 +193,7 @@ typedef enum
   ATK_ROLE_FOOTER,
   ATK_ROLE_PARAGRAPH,
   ATK_ROLE_RULER,
+  ATK_ROLE_APPLICATION,
   ATK_ROLE_LAST_DEFINED
 } AtkRole;
 
diff --git a/configure.in b/configure.in
index 06ddc63..c3eb2e8 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0.
 dnl The triplet 
 ATK_MAJOR_VERSION=1
 ATK_MINOR_VERSION=1
-ATK_MICRO_VERSION=2
+ATK_MICRO_VERSION=3
 ATK_VERSION=$ATK_MAJOR_VERSION.$ATK_MINOR_VERSION.$ATK_MICRO_VERSION
 
 dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 2.
@@ -38,7 +38,7 @@ ATK_API_VERSION=1.0
 dnl Number of releases since we've added interfaces
 ATK_INTERFACE_AGE=0
 
-ATK_BINARY_AGE=102
+ATK_BINARY_AGE=103
 
 AC_SUBST(ATK_MAJOR_VERSION)
 AC_SUBST(ATK_MINOR_VERSION)
diff --git a/docs/tmpl/atkobject.sgml b/docs/tmpl/atkobject.sgml
index 7b3b6f4..223fea7 100644
--- a/docs/tmpl/atkobject.sgml
+++ b/docs/tmpl/atkobject.sgml
@@ -118,6 +118,7 @@ ATK_ROLE_LAST_DEFINED is not necessarily an error.
 @ATK_ROLE_FOOTER: 
 @ATK_ROLE_PARAGRAPH: 
 @ATK_ROLE_RULER: 
+@ATK_ROLE_APPLICATION: 
 @ATK_ROLE_LAST_DEFINED: 
 
 <!-- ##### FUNCTION atk_role_register ##### -->
@@ -473,37 +474,32 @@ This signal support, which may be any of the accessible state types.
 
 @atkobject: the object which received the signal.
 
-<!-- ##### ARG AtkObject:accessible-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG AtkObject:accessible-description ##### -->
+<!-- ##### ARG AtkObject:accessible-component-layer ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-parent ##### -->
+<!-- ##### ARG AtkObject:accessible-component-mdi-zorder ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-value ##### -->
+<!-- ##### ARG AtkObject:accessible-description ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-role ##### -->
+<!-- ##### ARG AtkObject:accessible-name ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-component-layer ##### -->
+<!-- ##### ARG AtkObject:accessible-parent ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG AtkObject:accessible-component-mdi-zorder ##### -->
+<!-- ##### ARG AtkObject:accessible-role ##### -->
 <para>
 
 </para>
@@ -538,3 +534,8 @@ This signal support, which may be any of the accessible state types.
 
 </para>
 
+<!-- ##### ARG AtkObject:accessible-value ##### -->
+<para>
+
+</para>
+
diff --git a/po/en_GB.po b/po/en_GB.po
index da0858e..10550cf 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: atk\n"
-"POT-Creation-Date: 2002-11-18 17:27+0000\n"
+"POT-Creation-Date: 2002-11-20 16:46+0000\n"
 "PO-Revision-Date: 2002-11-18 17:29+0000\n"
 "Last-Translator: Abi Brady <morwen@evilmagic.org>\n"
 "Language-Team: en_GB\n"
@@ -306,3 +306,7 @@ msgstr ""
 #: atk/atkobject.c:1399
 msgid "ruler"
 msgstr ""
+
+#: atk/atkobject.c:1402
+msgid "application"
+msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 6fac892..50a019d 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: atk HEAD\n"
-"POT-Creation-Date: 2002-11-16 19:50+0800\n"
+"POT-Creation-Date: 2002-11-20 16:46+0000\n"
 "PO-Revision-Date: 2002-11-10 20:20+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
@@ -304,3 +304,8 @@ msgstr "perenggan"
 #: atk/atkobject.c:1399
 msgid "ruler"
 msgstr "ruler"
+
+#: atk/atkobject.c:1402
+#, fuzzy
+msgid "application"
+msgstr "Animasi"
diff --git a/po/sv.po b/po/sv.po
index f8290c7..77377ef 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: atk\n"
-"POT-Creation-Date: 2002-11-15 08:20+0000\n"
+"POT-Creation-Date: 2002-11-20 16:46+0000\n"
 "PO-Revision-Date: 2002-11-11 11:59+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -308,6 +308,11 @@ msgstr "stycke"
 msgid "ruler"
 msgstr "linjal"
 
+#: atk/atkobject.c:1402
+#, fuzzy
+msgid "application"
+msgstr "animering"
+
 #~ msgid "folder-pane"
 #~ msgstr "mappanel"