* cspi/Makefile.am:
authormarcm <marcm@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Thu, 13 Sep 2001 04:33:22 +0000 (04:33 +0000)
committermarcm <marcm@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Thu, 13 Sep 2001 04:33:22 +0000 (04:33 +0000)
Added spi-util.c.

* cspi/spi-util.c:
Fixed typo

* cspi/spi.c:
Added interface implementation c files to list of
includes so they are included in libcspi.

* cspi/spi.h:
Changed prototype of AccessibleAction_doAction to return a boolean.
Changed prototype of AccessibleTable_getCaption to
return an Accessible.
Changed prototype of AccessibleTable_getSelectedRows
and AccessibleTable_getSelectedColumns to
return a long (returns the number of selected rows or columns
respectively).
Changed name of AccessibleText_refRunAttributes to
AccessibleText_getAttributes.
Changed prototype of AccessibleText_getCharacterExtents to return a void rather than a
boolean. Addded support for a AccessibleCoordType parameter specifying what type of coordinates are desired.
Added an AccessibleCordType parameter to
AccessibleText_getPointAtOffset.

* cspi/spi_accessible.c:
Added code to return the outstanding interfaces from
Accessible_queryInterface.

* cspi/spi_action.c:
Fixed typos.
Corrected call to getNActions to call the c binding
for an attribute.

* cspi/spi_editabletext.c:
Fixed typos.
Changed name from setRunAttributes to setAttributes.

* cspi/spi_hyperlink.c:
Fixed typos.
Changed call to getNAnchors to correctly call the c
binding for an attribute.

* cspi/spi_hypertext.c:
Fixed typos.
Changed getImageDescription to correctly call the
binding for an attribute.

* cspi/spi_selection.c:
Changed getNSelectedChildren to correctly call the c
binding for the attribute.
Changed refSelectedChild to getSelectedChild.

* cspi/spi_table.c:
Fixed typos.
Changed getCaption to return an Accessible.
Fixed calls which retrieve attributes.
Changed refAt to getAccessibleAt.
Changed getNSelectedRows and getNSelectedColumns to
return longs.

* cspi/spi_text.c:
Changed getCharacterExtents and getPointAtOffset to accept an
AccessibleCoordType.
Fixed typos.
Changed calls which retrieve attributes.
Changed refRunAttributes to getAttributes.

* cspi/spi_value.c:
Fixed typos.

* idl/Hyperlink.idl:
Changed n_anchors attribute to nAnchors to keep naming
convention consistent.

* idl/Table.idl:
Made Table inherit from Bonobo::Unknown.
Added nSelectedColumns and nSelectedRows attributes.

* idl/Value.idl:
Made Value inherit from Bonobo::Unknown.

* libspi/hyperlink.c:
Change for nAnchors attributte name change.

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

23 files changed:
ChangeLog
cspi/Makefile.am
cspi/spi-util.c
cspi/spi.c
cspi/spi.h
cspi/spi_accessible.c
cspi/spi_action.c
cspi/spi_editabletext.c
cspi/spi_hyperlink.c
cspi/spi_hypertext.c
cspi/spi_image.c
cspi/spi_selection.c
cspi/spi_table.c
cspi/spi_text.c
cspi/spi_value.c
idl/Accessibility_Hyperlink.idl
idl/Accessibility_Table.idl
idl/Accessibility_Value.idl
idl/Hyperlink.idl
idl/Table.idl
idl/Value.idl
libspi/hyperlink.c
po/ChangeLog

index 5469fac..e08fa28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,91 @@
-<2001-09-05  Marc Mulcahy <marc.mulcahy@sun.com>
+<2001-09-12  Marc Mulcahy <marc.mulcahy@sun.com>
+       * cspi/Makefile.am:
+               Added spi-util.c.
+
+       * cspi/spi-util.c:
+               Fixed typo
+
+       * cspi/spi.c:
+               Added interface implementation c files to list of
+                       includes so they are included in libcspi.
+
+       * cspi/spi.h:
+               Changed prototype of AccessibleAction_doAction to return a boolean.
+               Changed prototype of AccessibleTable_getCaption to
+                       return an Accessible.
+               Changed prototype of AccessibleTable_getSelectedRows
+                       and AccessibleTable_getSelectedColumns to
+                       return a long (returns the number of selected rows or columns
+                       respectively).
+               Changed name of AccessibleText_refRunAttributes to
+                       AccessibleText_getAttributes.
+               Changed prototype of AccessibleText_getCharacterExtents to return a void rather than a
+                       boolean. Addded support for a AccessibleCoordType parameter specifying what type of coordinates are desired.
+               Added an AccessibleCordType parameter to
+                       AccessibleText_getPointAtOffset.
+
+       * cspi/spi_accessible.c:
+               Added code to return the outstanding interfaces from
+                       Accessible_queryInterface.
+
+       * cspi/spi_action.c:
+               Fixed typos.
+               Corrected call to getNActions to call the c binding
+                       for an attribute.
+
+       * cspi/spi_editabletext.c:
+               Fixed typos.
+               Changed name from setRunAttributes to setAttributes.
+
+       * cspi/spi_hyperlink.c:
+               Fixed typos.
+               Changed call to getNAnchors to correctly call the c
+                       binding for an attribute.
+
+       * cspi/spi_hypertext.c:
+               Fixed typos.
+               Changed getImageDescription to correctly call the
+                       binding for an attribute.
+
+       * cspi/spi_selection.c:
+               Changed getNSelectedChildren to correctly call the c
+                       binding for the attribute.
+               Changed refSelectedChild to getSelectedChild.
+
+       * cspi/spi_table.c:
+               Fixed typos.
+               Changed getCaption to return an Accessible.
+               Fixed calls which retrieve attributes.
+               Changed refAt to getAccessibleAt.
+               Changed getNSelectedRows and getNSelectedColumns to
+                       return longs.
+
+       * cspi/spi_text.c:
+               Changed getCharacterExtents and getPointAtOffset to accept an
+                       AccessibleCoordType.
+               Fixed typos.
+               Changed calls which retrieve attributes.
+               Changed refRunAttributes to getAttributes.
+
+       * cspi/spi_value.c:
+               Fixed typos.
+
+       * idl/Hyperlink.idl:
+               Changed n_anchors attribute to nAnchors to keep naming
+                       convention consistent.
+
+       * idl/Table.idl:
+               Made Table inherit from Bonobo::Unknown.
+               Added nSelectedColumns and nSelectedRows attributes.
+
+       * idl/Value.idl:
+               Made Value inherit from Bonobo::Unknown.
+
+       * libspi/hyperlink.c:
+               Change for nAnchors attributte name change.
+
+
+       <2001-09-05  Marc Mulcahy <marc.mulcahy@sun.com>
                implementations-- made server implementations own AtkObject pointers
        rather than their respective AtkInterrface pointers to fix
        refcounting.  AtkHyperlink is still broken.
index d25c8a2..c7bb192 100644 (file)
@@ -24,6 +24,7 @@ libcspi_la_SOURCES = spi.c              \
 SPICSOURCES =        spi_main.c                \
                     spi_event.c        \
                     spi_registry.c     \
+                    spi-util.c\
                     spi_accessible.c   \
                     spi_action.c\
                     spi_application.c  \
index a37c7c2..e9d736b 100644 (file)
@@ -11,7 +11,7 @@ string_from_corba_string (CORBA_char *string)
   length = strlen (string);
   newstring = (char *) malloc (length+1);
   strcpy (newstring, string);
-  corba_free (string);
+  CORBA_free (string);
   return newstring;
 }
 
index ea174de..e895f90 100644 (file)
@@ -20,5 +20,15 @@ Obj_Add (Accessible object)
 #include "spi_event.c"
 #include "spi_registry.c"
 #include "spi_application.c"
+#include "spi-util.c"
 #include "spi_accessible.c"
+#include "spi_action.c"
 #include "spi_component.c"
+#include "spi_editabletext.c"
+#include "spi_hyperlink.c"
+#include "spi_hypertext.c"
+#include "spi_image.c"
+#include "spi_selection.c"
+#include "spi_table.c"
+#include "spi_text.c"
+#include "spi_value.c"
index a008d88..7c7b66a 100644 (file)
@@ -652,7 +652,7 @@ char *
 AccessibleAction_getDescription (AccessibleAction *obj,
                                  long index);
 
-void
+boolean
 AccessibleAction_doAction (AccessibleAction *obj,
                            long index);
 
@@ -1048,7 +1048,7 @@ AccessibleTable_ref (AccessibleTable *obj);
 int
 AccessibleTable_unref (AccessibleTable *obj);
 
-char *
+Accessible *
 AccessibleTable_getCaption (AccessibleTable *obj);
 
 Accessible *
@@ -1107,14 +1107,14 @@ AccessibleTable_getColumnHeader (AccessibleTable *obj,
 long
 AccessibleTable_getNSelectedRows (AccessibleTable *obj);
 
-void
+long
 AccessibleTable_getSelectedRows (AccessibleTable *obj,
                                  long **selectedRows);
 
 long
 AccessibleTable_getNSelectedColumns (AccessibleTable *obj);
 
-void
+long
 AccessibleTable_getSelectedColumns (AccessibleTable *obj,
                                     long **selectedColumns);
 
@@ -1155,7 +1155,7 @@ long
 AccessibleText_getCaretOffset (AccessibleText *obj);
 
 char *
-AccessibleText_refRunAttributes (AccessibleText *obj,
+AccessibleText_getAttributes (AccessibleText *obj,
                                 long offset,
                                 long *startOffset,
                                 long *endOfset);
@@ -1186,18 +1186,18 @@ char
 AccessibleText_getCharacterAtOffset (AccessibleText *obj,
                                      long offset);
 
-boolean
+void
 AccessibleText_getCharacterExtents (AccessibleText *obj,
                                     long offset,
                                     long *x,
                                     long *y,
                                     long *width,
-                                    long *height);
+                                    long *height, AccessibleCoordType type);
 
 long
 AccessibleText_getOffsetAtPoint (AccessibleText *obj,
                                  long x,
-                                 long y);
+                                 long y, AccessibleCoordType type);
 
 long
 AccessibleText_getNSelections (AccessibleText *obj);
index c34d7a3..0cdbd8c 100644 (file)
@@ -195,7 +195,11 @@ Accessible_getStateSet (Accessible *obj)
 boolean
 Accessible_isAction (Accessible *obj)
 {
-  return FALSE;
+  Bonobo_Unknown iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Action:1.0",
+                                             &ev);
+  return (iface != NULL) ? TRUE : FALSE;
 }
 
 /**
@@ -230,7 +234,11 @@ Accessible_isComponent (Accessible *obj)
 boolean
 Accessible_isEditableText (Accessible *obj)
 {
-  return FALSE;
+  Bonobo_Unknown iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/EditableText:1.0",
+                                             &ev);
+  return (iface != NULL) ? TRUE : FALSE;
 }
 
 /**
@@ -246,7 +254,11 @@ Accessible_isEditableText (Accessible *obj)
 boolean
 Accessible_isHypertext (Accessible *obj)
 {
-  return FALSE;
+  Bonobo_Unknown iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Hypertext:1.0",
+                                             &ev);
+  return (iface != NULL) ? TRUE : FALSE;
 }
 
 /**
@@ -262,7 +274,11 @@ Accessible_isHypertext (Accessible *obj)
 boolean
 Accessible_isImage (Accessible *obj)
 {
-  return FALSE;
+  Bonobo_Unknown iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Image:1.0",
+                                             &ev);
+  return (iface != NULL) ? TRUE : FALSE;
 }
 
 /**
@@ -278,7 +294,11 @@ Accessible_isImage (Accessible *obj)
 boolean
 Accessible_isSelection (Accessible *obj)
 {
-  return FALSE;
+  Bonobo_Unknown iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Selection:1.0",
+                                             &ev);
+  return (iface != NULL) ? TRUE : FALSE;
 }
 
 /**
@@ -294,7 +314,11 @@ Accessible_isSelection (Accessible *obj)
 boolean
 Accessible_isTable (Accessible *obj)
 {
-  return FALSE;
+  Bonobo_Unknown iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Table:1.0",
+                                             &ev);
+  return (iface != NULL) ? TRUE : FALSE;
 }
 
 /**
@@ -310,7 +334,11 @@ Accessible_isTable (Accessible *obj)
 boolean
 Accessible_isText (Accessible *obj)
 {
-  return FALSE;
+  Bonobo_Unknown iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Text:1.0",
+                                             &ev);
+  return (iface != NULL) ? TRUE : FALSE;
 }
 
 /**
@@ -322,7 +350,11 @@ Accessible_isText (Accessible *obj)
 AccessibleAction *
 Accessible_getAction (Accessible *obj)
 {
-  return NULL;
+  AccessibleComponent iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Action:1.0",
+                                             &ev);
+  return Obj_Add (iface);
 }
 
 /**
@@ -344,6 +376,90 @@ Accessible_getComponent (Accessible *obj)
   return Obj_Add (iface);
 }
 
+AccessibleEditableText *
+Accessible_getEditableText (Accessible *obj)
+{
+  AccessibleComponent iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/EditableText:1.0",
+                                             &ev);
+  return Obj_Add (iface);
+}
+
+
+
+AccessibleHypertext *
+Accessible_getHypertext (Accessible *obj)
+{
+  AccessibleComponent iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Hypertext:1.0",
+                                             &ev);
+  return Obj_Add (iface);
+}
+
+
+
+AccessibleImage *
+Accessible_getImage (Accessible *obj)
+{
+  AccessibleComponent iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Image:1.0",
+                                             &ev);
+  return Obj_Add (iface);
+}
+
+
+
+AccessibleSelection *
+Accessible_getSelection (Accessible *obj)
+{
+  AccessibleComponent iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Selection:1.0",
+                                             &ev);
+  return Obj_Add (iface);
+}
+
+
+
+AccessibleTable *
+Accessible_getTable (Accessible *obj)
+{
+  AccessibleComponent iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Table:1.0",
+                                             &ev);
+  return Obj_Add (iface);
+}
+
+
+
+AccessibleText *
+Accessible_getText (Accessible *obj)
+{
+  AccessibleComponent iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Text:1.0",
+                                             &ev);
+  return Obj_Add (iface);
+}
+
+
+
+AccessibleValue *
+Accessible_getValue (Accessible *obj)
+{
+  AccessibleComponent iface =
+    Accessibility_Accessible_queryInterface (*obj,
+                                             "IDL:Accessibility/Value:1.0",
+                                             &ev);
+  return Obj_Add (iface);
+}
+
+
+
 /**
  * Accessible_queryInterface:
  * @obj: a pointer to the #Accessible instance to query.
index f00dd83..d1e842e 100644 (file)
@@ -12,7 +12,7 @@ int
 AccessibleAction_unref (AccessibleAction *obj)
 {
   Accessibility_Action_unref (*obj, &ev);
-  eturn 0;
+  return 0;
 }
 
 
@@ -21,7 +21,7 @@ long
 AccessibleAction_getNActions (AccessibleAction *obj)
 {
   return (long)
-    Accessibility_Action_getNActions (*obj, &ev);
+    Accessibility_Action__get_nActions (*obj, &ev);
 }
 
 
@@ -54,7 +54,7 @@ AccessibleAction_getKeyBinding (AccessibleAction *obj,
                                 long index)
 {
   return string_from_corba_string (
-                                  Accessibility_Action_getKeybinding (*obj,
+                                  Accessibility_Action_getKeyBinding (*obj,
                                                                       (CORBA_long) index,
                                                                       &ev));
 }
index 8411481..876a66e 100644 (file)
@@ -17,12 +17,12 @@ AccessibleEditableText_unref (AccessibleEditableText *obj)
 
 
 boolean
-AccessibleEditableText_setRunAttributes (AccessibleEditableText *obj,
+AccessibleEditableText_setAttributes (AccessibleEditableText *obj,
                                         const char *attributes,
                                         long startPos, long endPos)
 {
   return (boolean)
-    Accessibility_EditableText_setRunAttributes (*obj,
+    Accessibility_EditableText_setAttributes (*obj,
                                                 (CORBA_char *) attributes,
                                                 (CORBA_long) startPos, (CORBA_long) endPos, &ev);
 }
@@ -31,7 +31,7 @@ AccessibleEditableText_setRunAttributes (AccessibleEditableText *obj,
 
 void
 AccessibleEditableText_setTextContents (AccessibleEditableText *obj,
-                                        const char *newContents);
+                                        const char *newContents)
 {
   Accessibility_EditableText_setTextContents (*obj,
                                              (CORBA_char *) newContents, &ev);
@@ -90,6 +90,6 @@ AccessibleEditableText_pasteText (AccessibleEditableText *obj,
                                   long position)
 {
   Accessibility_EditableText_pasteText (*obj,
-                                      (CORBA_long) startPos, (CORBA_long) endPos, &ev);
+                                       (CORBA_long) position, &ev);
 }
 
index 0e8303b..d655b6c 100644 (file)
@@ -3,8 +3,8 @@
 int
 AccessibleHyperlink_ref (AccessibleHyperlink *obj)
 {
-  Accessibility_Hyperlink_ref (*obj);
-  return 0:
+  Accessibility_Hyperlink_ref (*obj, &ev);
+  return 0;
 }
 
 
@@ -12,7 +12,7 @@ AccessibleHyperlink_ref (AccessibleHyperlink *obj)
 int
 AccessibleHyperlink_unref (AccessibleHyperlink *obj)
 {
-  Accessibility_Hyperlink_unref (*obj);
+  Accessibility_Hyperlink_unref (*obj, &ev);
   return 0;
 }
 
@@ -21,8 +21,8 @@ AccessibleHyperlink_unref (AccessibleHyperlink *obj)
 long
 AccessibleHyperlink_getNAnchors (AccessibleHyperlink *obj)
 {
-  RETURN (LONG)
-    aCCESSIBILITY_hYPERLINK_GETnaNCHORS (*OBJ);
+  return (long)
+    Accessibility_Hyperlink__get_nAnchors (*obj, &ev);
 }
 
 
@@ -31,9 +31,9 @@ char *
 AccessibleHyperlink_getURI (AccessibleHyperlink *obj,
                             long i)
 {
-  RETURN STRING_FROM_CORBA_STRING (
-                                  aCCESSIBIITY_hYPERLINK_GETuri (*OBJ,
-                                                                 (corba_LONG) I, &EV));
+  return string_from_corba_string (
+                                  Accessibility_Hyperlink_getURI (*obj,
+                                                                 (CORBA_long) i, &ev));
 }
 
 
@@ -44,7 +44,7 @@ AccessibleHyperlink_getObject (AccessibleHyperlink *obj,
 {
   return (Accessible)
     Accessibility_Hyperlink_getObject (*obj,
-                                      (CORBA_long) i);
+                                      (CORBA_long) i, &ev);
 }
 
 
@@ -55,9 +55,9 @@ AccessibleHyperlink_getIndexRange (AccessibleHyperlink *obj,
                                    long *endIndex)
 {
   *startIndex = (long)
-    Accessibility_Hyperlink__get_startIndex (*obj);
+    Accessibility_Hyperlink__get_startIndex (*obj, &ev);
   *endIndex = (long)
-    Acccessibility_Hyperlink__get_endIndex (*obj);
+    Accessibility_Hyperlink__get_endIndex (*obj, &ev);
 }
 
 
@@ -66,7 +66,7 @@ boolean
 AccessibleHyperlink_isValid (AccessibleHyperlink *obj)
 {
   return (boolean)
-    Accessibility_Hyperlink_isValid (*obj);
+    Accessibility_Hyperlink_isValid (*obj, &ev);
 }
 
 
index c9e47a7..05a6e29 100644 (file)
@@ -28,7 +28,7 @@ AccessibleHyperlink *
 AccessibleHyperText_getLink (AccessibleHypertext *obj,
                              long linkIndex)
 {
-  return (Accessible)
+  return (AccessibleHyperlink *)
     Accessibility_Hypertext_getLink (*obj,
                                     (CORBA_long) linkIndex, &ev);
 }
index 9e5e086..a4ede04 100644 (file)
@@ -23,7 +23,7 @@ char *
 AccessibleImage_getImageDescription (AccessibleImage *obj)
 {
   return string_from_corba_string (
-                                  Accessibility_Image_getImageDescription (*obj, &ev));
+                                  Accessibility_Image__get_imageDescription (*obj, &ev));
 }
 
 
index edfa202..fdd12f7 100644 (file)
@@ -20,17 +20,17 @@ long
 AccessibleSelection_getNSelectedChildren (AccessibleSelection *obj)
 {
   return (long)
-    Accessibility_Selection_getNSelectedChildren (*obj, &ev);
+    Accessibility_Selection__get_nSelectedChildren (*obj, &ev);
 }
 
 
 
 Accessible *
-AccessibleSelection_refSelectedChild (AccessibleSelection *obj,
+AccessibleSelection_getSelectedChild (AccessibleSelection *obj,
                                       long selectedChildIndex)
 {
   return (Accessible *)
-    Accessibility_Selection_refSelectedChild (*obj,
+    Accessibility_Selection_getSelectedChild (*obj,
                                              (CORBA_long) selectedChildIndex, &ev);
 }
 
index 37e7f53..f85ba21 100644 (file)
@@ -18,11 +18,11 @@ AccessibleTable_unref (AccessibleTable *obj)
 
 
 
-char *
+Accessible *
 AccessibleTable_getCaption (AccessibleTable *obj)
 {
-  return string_from_corba_string (
-                                  Accessibility_Table_getCaption (*obj, &ev));
+  return (Accessible *)
+    Accessibility_Table__get_caption (*obj, &ev);
 }
 
 
@@ -31,7 +31,7 @@ Accessible *
 AccessibleTable_getSummary (AccessibleTable *obj)
 {
   return (Accessible *)
-    Accessibility_Table_getSummary (*obj, &ev);
+    Accessibility_Table__get_summary (*obj, &ev);
 }
 
 
@@ -40,7 +40,7 @@ long
 AccessibleTable_getNRows (AccessibleTable *obj)
 {
   return (long)
-    Accessibility_Table_getNRows (*obj, &ev);
+    Accessibility_Table__get_nRows (*obj, &ev);
 }
 
 
@@ -49,17 +49,17 @@ long
 AccessibleTable_getNColumns (AccessibleTable *obj)
 {
   return (long)
-    Accessibility_Table_getNColumns (*obj, &ev);
+    Accessibility_Table__get_nColumns (*obj, &ev);
 }
 
 
 Accessible *
-AccessibleTable_refAt (AccessibleTable *obj,
+AccessibleTable_getAccessibleAt (AccessibleTable *obj,
                                  long row,
                                  long column)
 {
   return (Accessible *)
-    Accessibility_Table_refAt (*obj,
+    Accessibility_Table_getAccessibleAt (*obj,
                               (CORBA_long) row, (CORBA_long) column, &ev);
 }
 
@@ -157,7 +157,7 @@ AccessibleTable_getRowHeader (AccessibleTable *obj,
 
 Accessible *
 AccessibleTable_getColumnHeader (AccessibleTable *obj,
-                                long column);
+                                long column)
 {
   return (Accessible *)
     Accessibility_Table_getColumnHeader (*obj,
@@ -170,17 +170,30 @@ long
 AccessibleTable_getNSelectedRows (AccessibleTable *obj)
 {
   return (long)
-    Accessibility_Table_getNSelectedRows (*obj, &ev);
+    Accessibility_Table__get_nSelectedRows (*obj, &ev);
 }
 
 
 
-void
+long
 AccessibleTable_getSelectedRows (AccessibleTable *obj,
                                  long **selectedRows)
 {
-  Accessibility_Table_getSelectedRows (*obj,
-                                     (CORBA_long **) selectedRows, &ev);
+  Accessibility_LongSeq *rows = Accessibility_Table_getSelectedRows (*obj, &ev);
+  CORBA_long *i;
+  long *j;
+  long length;
+
+  i = rows->_buffer;
+  length = (long) rows->_length;
+  j = *selectedRows = malloc (sizeof(long)*length);
+  
+  while (length--)
+    *j++ = (CORBA_long) (*i++);
+
+  length = rows->_length;
+  CORBA_free (rows);
+  return length;
 }
 
 
@@ -189,16 +202,29 @@ long
 AccessibleTable_getNSelectedColumns (AccessibleTable *obj)
 {
   return (long)
-    Accessibility_Table_getNSelectedColumns (*obj, &ev);
+    Accessibility_Table__get_nSelectedColumns (*obj, &ev);
 }
 
 
-void
+long
 AccessibleTable_getSelectedColumns (AccessibleTable *obj,
                                     long **selectedColumns)
 {
-  Accessibility_Table_getSelectedColumns (*obj,
-                                     (CORBA_long **) selectedColumns, &ev);
+  Accessibility_LongSeq *columns = Accessibility_Table_getSelectedColumns (*obj, &ev);
+  CORBA_long *i;
+  long *j;
+  long length;
+
+  i = columns->_buffer;
+  length = (long) columns->_length;
+  j = *selectedColumns = malloc (sizeof(long)*length);
+  
+  while (length--)
+    *j++ = (CORBA_long) (*i++);
+
+  length = columns->_length;
+  CORBA_free (columns);
+  return length;
 }
 
 
index 379c122..45950ad 100644 (file)
@@ -44,22 +44,22 @@ long
 AccessibleText_getCaretOffset (AccessibleText *obj)
 {
   return (long)
-    Accessibility_Text_getCaretOffset (*obj, &ev);
+    Accessibility_Text__get_caretOffset (*obj, &ev);
 }
 
 
 
 char *
-AccessibleText_refRunAttributes (AccessibleText *obj,
+AccessibleText_getAttributes (AccessibleText *obj,
                                 long offset,
                                 long *startOffset,
-                                long *endOfset)
+                                long *endOffset)
 {
-return string_from_corba_string (
-                                Accessibility_Text_refRunAttributes (*obj,
-                                                                     (CORBA_long) offset,
-                                                                     (CORBA_long *) startOffset,
-                                                                     (CORBA_long *) endOffset, &ev));
+  return string_from_corba_string (
+                                  Accessibility_Text_getAttributes (*obj,
+                                                                       (CORBA_long) offset,
+                                                                       (CORBA_long *) startOffset,
+                                                                       (CORBA_long *) endOffset, &ev));
 }
 
 
@@ -131,21 +131,22 @@ AccessibleText_getCharacterAtOffset (AccessibleText *obj,
 
 
 
-boolean
+void
 AccessibleText_getCharacterExtents (AccessibleText *obj,
                                     long offset,
                                     long *x,
                                     long *y,
                                     long *width,
-                                    long *height)
+                                    long *height,
+                                   AccessibleCoordType type)
 {
-  return (boolean)
-    Accessibility_Text_getTextExtents (*obj,
-                                      (CORBA_long) offset,
-                                      (CORBA_long *) x,
-                                      (CORBA_long *) y,
-                                      (CORBA_long *) width,
-                                      (CORBA_long *) height, &ev);
+  Accessibility_Text_getCharacterExtents (*obj,
+                                         (CORBA_long) offset,
+                                         (CORBA_long *) x,
+                                         (CORBA_long *) y,
+                                         (CORBA_long *) width,
+                                         (CORBA_long *) height, 
+                                         (CORBA_short) type, &ev);
 }
 
 
@@ -153,11 +154,12 @@ AccessibleText_getCharacterExtents (AccessibleText *obj,
 long
 AccessibleText_getOffsetAtPoint (AccessibleText *obj,
                                  long x,
-                                 long y)
+                                 long y,
+                                AccessibleCoordType type)
 {
   return (long)
     Accessibility_Text_getOffsetAtPoint (*obj,
-                                        (CORBA_long) x, (CORBA_long) y, &ev);
+                                        (CORBA_long) x, (CORBA_long) y, (CORBA_short) type, &ev);
 }
 
 
@@ -216,8 +218,8 @@ AccessibleText_setSelection (AccessibleText *obj,
   return (boolean)
     Accessibility_Text_setSelection (*obj,
                                     (CORBA_long) selectionNum,
-                                    (CORBA_long) startPos,
                                   (CORBA_long) endOffset, &ev);
+                                    (CORBA_long) startOffset,
+ (CORBA_long) endOffset, &ev);
 }
 
 
index 708623b..b6a0746 100644 (file)
@@ -17,7 +17,7 @@ AccessibleValue_unref (AccessibleValue *obj)
 
 
 float
-AccessibleValue_getMinimumValue (AccessibleValue *value)
+AccessibleValue_getMinimumValue (AccessibleValue *obj)
 {
   return (float)
     Accessibility_Value__get_minimumValue (*obj, &ev);
@@ -26,7 +26,7 @@ AccessibleValue_getMinimumValue (AccessibleValue *value)
 
 
 float
-AccessibleValue_getCurrentValue (AccessibleValue *value)
+AccessibleValue_getCurrentValue (AccessibleValue *obj)
 {
   return (float)
     Accessibility_Value__get_currentValue (*obj, &ev);
@@ -35,7 +35,7 @@ AccessibleValue_getCurrentValue (AccessibleValue *value)
 
 
 float
-AccessibleValue_getMaximumValue (AccessibleValue *value)
+AccessibleValue_getMaximumValue (AccessibleValue *obj)
 {
   return (float)
     Accessibility_Value__get_maximumValue (*obj, &ev);
@@ -44,7 +44,7 @@ AccessibleValue_getMaximumValue (AccessibleValue *value)
 
 
 boolean
-AccessibleValue_setCurrentValue (AccessibleValue *value,
+AccessibleValue_setCurrentValue (AccessibleValue *obj,
                                  float newValue)
 {
   Accessibility_Value__set_currentValue (*obj,
index a52646d..f62a760 100644 (file)
@@ -25,7 +25,7 @@
 module Accessibility {
 
   interface Hyperlink : Bonobo::Unknown {
-    readonly attribute short n_anchors;
+    readonly attribute short nAnchors;
     readonly attribute long startIndex;
     readonly attribute long endIndex;
     Accessible getObject (in long i);
index 24c8a61..f964957 100644 (file)
@@ -26,11 +26,14 @@ module Accessibility {
 
 typedef sequence<long> LongSeq;
 
- interface Table {
+ interface Table : Bonobo::Unknown {
    readonly attribute long nRows;
    readonly attribute long nColumns;
    readonly attribute Accessible caption;
    readonly attribute Accessible summary;
+   readonly attribute long nSelectedRows;
+   readonly attribute long nSelectedColumns;
+
    Accessible getAccessibleAt (in long row, in long column);
    long getIndexAt (in long row, in long column);
    long getRowAtIndex (in long index);
index e45b78c..430ef4f 100644 (file)
@@ -22,7 +22,7 @@
 
 module Accessibility {
 
-  interface Value {
+  interface Value : Bonobo::Unknown {
     readonly attribute float minimumValue;
     readonly attribute float maximumValue;
     readonly attribute float minimumIncrement;
index a52646d..f62a760 100644 (file)
@@ -25,7 +25,7 @@
 module Accessibility {
 
   interface Hyperlink : Bonobo::Unknown {
-    readonly attribute short n_anchors;
+    readonly attribute short nAnchors;
     readonly attribute long startIndex;
     readonly attribute long endIndex;
     Accessible getObject (in long i);
index 24c8a61..f964957 100644 (file)
@@ -26,11 +26,14 @@ module Accessibility {
 
 typedef sequence<long> LongSeq;
 
- interface Table {
+ interface Table : Bonobo::Unknown {
    readonly attribute long nRows;
    readonly attribute long nColumns;
    readonly attribute Accessible caption;
    readonly attribute Accessible summary;
+   readonly attribute long nSelectedRows;
+   readonly attribute long nSelectedColumns;
+
    Accessible getAccessibleAt (in long row, in long column);
    long getIndexAt (in long row, in long column);
    long getRowAtIndex (in long index);
index e45b78c..430ef4f 100644 (file)
@@ -22,7 +22,7 @@
 
 module Accessibility {
 
-  interface Value {
+  interface Value : Bonobo::Unknown {
     readonly attribute float minimumValue;
     readonly attribute float maximumValue;
     readonly attribute float minimumIncrement;
index 9b96309..2ff83ec 100644 (file)
@@ -118,7 +118,7 @@ hyperlink_class_init (HyperlinkClass *klass)
 
   /* Initialize epv table */
 
-  epv->_get_n_anchors = impl__get_n_anchors;
+  epv->_get_nAnchors = impl__get_n_anchors;
   epv->getURI = impl_getURI;
   epv->_get_startIndex = impl__get_startIndex;
   epv->_get_endIndex = impl__get_endIndex;
index 187001a..56a1d0b 100644 (file)
@@ -1,3 +1,23 @@
+2001-09-11  gettextize  <bug-gnu-utils@gnu.org>
+
+       * Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-09-11  gettextize  <bug-gnu-utils@gnu.org>
+
+       * Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-09-11  gettextize  <bug-gnu-utils@gnu.org>
+
+       * Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-09-11  gettextize  <bug-gnu-utils@gnu.org>
+
+       * Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-09-05  gettextize  <bug-gnu-utils@gnu.org>
+
+       * Makefile.in.in: Upgrade to gettext-0.10.39.
+
 2001-09-05  gettextize  <bug-gnu-utils@gnu.org>
 
        * Makefile.in.in: Upgrade to gettext-0.10.38.