Fix for ROLE build regression; added ROLE_DRAWING_AREA to

idl/Accessibility_Role.idl.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@258 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index f66f603..90eec5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-15 Bill Haneman <bill.haneman@sun.com>
+
+       * idl/Accessibility_Role.idl:
+       Added ROLE_DRAWING_AREA which seemed to be missing from the
+       previous commit.
+
 2002-03-14 Marc Mulcahy <marc.mulcahy@sun.com>
 
        * cspi/spi-roletypes.h cspi/spi_accessible.c

diff --git a/docs/reference/cspi/tmpl/spi_accessible.sgml b/docs/reference/cspi/tmpl/spi_accessible.sgml
index f177805..9b7b374 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_accessible.sgml
+++ b/docs/reference/cspi/tmpl/spi_accessible.sgml
@@ -338,9 +338,9 @@ Accessible Objects
 @SPI_ROLE_DIAL: 
 @SPI_ROLE_DIALOG: 
 @SPI_ROLE_DIRECTORY_PANE: 
+@SPI_ROLE_DRAWING_AREA: 
 @SPI_ROLE_FILE_CHOOSER: 
 @SPI_ROLE_FILLER: 
-@SPI_ROLE_FOCUS_TRAVERSABLE: 
 @SPI_ROLE_FONT_CHOOSER: 
 @SPI_ROLE_FRAME: 
 @SPI_ROLE_GLASS_PANE: 
@@ -379,6 +379,7 @@ Accessible Objects
 @SPI_ROLE_TABLE_COLUMN_HEADER: 
 @SPI_ROLE_TABLE_ROW_HEADER: 
 @SPI_ROLE_TEAROFF_MENU_ITEM: 
+@SPI_ROLE_TERMINAL: 
 @SPI_ROLE_TEXT: 
 @SPI_ROLE_TOGGLE_BUTTON: 
 @SPI_ROLE_TOOL_BAR: 

diff --git a/docs/reference/cspi/tmpl/spi_stateset.sgml b/docs/reference/cspi/tmpl/spi_stateset.sgml
index 080d948..1776a3b 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_stateset.sgml
+++ b/docs/reference/cspi/tmpl/spi_stateset.sgml
@@ -25,7 +25,9 @@ State and StateSets
 @SPI_STATE_BUSY: 
 @SPI_STATE_CHECKED: 
 @SPI_STATE_COLLAPSED: 
+@SPI_STATE_DEFUNCT: 
 @SPI_STATE_EDITABLE: 
+@SPI_STATE_ENABLED: 
 @SPI_STATE_EXPANDABLE: 
 @SPI_STATE_EXPANDED: 
 @SPI_STATE_FOCUSABLE: 
@@ -34,15 +36,16 @@ State and StateSets
 @SPI_STATE_ICONIFIED: 
 @SPI_STATE_MODAL: 
 @SPI_STATE_MULTI_LINE: 
-@SPI_STATE_MULTISELECSPI_TABLE: 
+@SPI_STATE_MULTISELECTABLE: 
 @SPI_STATE_OPAQUE: 
 @SPI_STATE_PRESSED: 
 @SPI_STATE_RESIZABLE: 
-@SPI_STATE_SELECSPI_TABLE: 
+@SPI_STATE_SELECTABLE: 
 @SPI_STATE_SELECTED: 
 @SPI_STATE_SENSITIVE: 
 @SPI_STATE_SHOWING: 
 @SPI_STATE_SINGLE_LINE: 
+@SPI_STATE_STALE: 
 @SPI_STATE_TRANSIENT: 
 @SPI_STATE_VERTICAL: 
 @SPI_STATE_VISIBLE: 

diff --git a/idl/Accessibility_Role.idl b/idl/Accessibility_Role.idl
index 87d2c81..8fc9e7d 100644 (file)
--- a/idl/Accessibility_Role.idl
+++ b/idl/Accessibility_Role.idl
@@ -78,6 +78,10 @@ module Accessibility {
    * the user select a file, browse a different directory, or specify a
    * filename.
    */
+  ROLE_DRAWING_AREA,
+  /*
+   * An object used for drawing custom user interface elements.
+   */
   ROLE_FILE_CHOOSER,
   /*
    * A object that fills up space in a user interface

diff --git a/libspi/accessible.c b/libspi/accessible.c
index cd4f9b1..4243a44 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -62,7 +62,7 @@ spi_init_role_lookup_table (Accessibility_Role *role_table)
   role_table [ATK_ROLE_DIAL] =             Accessibility_ROLE_DIAL;
   role_table [ATK_ROLE_DIALOG] =           Accessibility_ROLE_DIALOG;
   role_table [ATK_ROLE_DIRECTORY_PANE] =   Accessibility_ROLE_DIRECTORY_PANE;
-  role_table[ATK_ROLE_DRAWING_AREA] = Accessibility_ROLE_DRAWING_AREA;
+  role_table [ATK_ROLE_DRAWING_AREA] =     Accessibility_ROLE_DRAWING_AREA;
   role_table [ATK_ROLE_FILE_CHOOSER] =     Accessibility_ROLE_FILE_CHOOSER;
   role_table [ATK_ROLE_FILLER] =           Accessibility_ROLE_FILLER;
   role_table [ATK_ROLE_FONT_CHOOSER] =     Accessibility_ROLE_FONT_CHOOSER;