2001-11-13 Michael Meeks <michael@ximian.com>

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_table.c

diff --git a/cspi/spi_table.c b/cspi/spi_table.c
index 37e7f53..ff8754a 100644 (file)
--- a/cspi/spi_table.c
+++ b/cspi/spi_table.c
@@ -1,7 +1,5 @@
-#include "spi-util.h"
-
 int
-AccessibleTable_ref (AccessibleTable *obj)
+SpiAccessibleTable_ref (SpiAccessibleTable *obj)
 {
   Accessibility_Table_ref (*obj, &ev);
   return 0;
@@ -10,7 +8,7 @@ AccessibleTable_ref (AccessibleTable *obj)
 
 
 int
-AccessibleTable_unref (AccessibleTable *obj)
+SpiAccessibleTable_unref (SpiAccessibleTable *obj)
 {
   Accessibility_Table_unref (*obj, &ev);
   return 0;
@@ -18,54 +16,54 @@ AccessibleTable_unref (AccessibleTable *obj)
 
 
 
-char *
-AccessibleTable_getCaption (AccessibleTable *obj)
+SpiAccessible *
+SpiAccessibleTable_getCaption (SpiAccessibleTable *obj)
 {
-  return string_from_corba_string (
-                                  Accessibility_Table_getCaption (*obj, &ev));
+  return (SpiAccessible *)
+    Accessibility_Table__get_caption (*obj, &ev);
 }
 
 
 
-Accessible *
-AccessibleTable_getSummary (AccessibleTable *obj)
+SpiAccessible *
+SpiAccessibleTable_getSummary (SpiAccessibleTable *obj)
 {
-  return (Accessible *)
-    Accessibility_Table_getSummary (*obj, &ev);
+  return (SpiAccessible *)
+    Accessibility_Table__get_summary (*obj, &ev);
 }
 
 
 
 long
-AccessibleTable_getNRows (AccessibleTable *obj)
+SpiAccessibleTable_getNRows (SpiAccessibleTable *obj)
 {
   return (long)
-    Accessibility_Table_getNRows (*obj, &ev);
+    Accessibility_Table__get_nRows (*obj, &ev);
 }
 
 
 
 long
-AccessibleTable_getNColumns (AccessibleTable *obj)
+SpiAccessibleTable_getNColumns (SpiAccessibleTable *obj)
 {
   return (long)
-    Accessibility_Table_getNColumns (*obj, &ev);
+    Accessibility_Table__get_nColumns (*obj, &ev);
 }
 
 
-Accessible *
-AccessibleTable_refAt (AccessibleTable *obj,
+SpiAccessible *
+SpiAccessibleTable_getAccessibleAt (SpiAccessibleTable *obj,
                                  long row,
                                  long column)
 {
-  return (Accessible *)
-    Accessibility_Table_refAt (*obj,
+  return (SpiAccessible *)
+    Accessibility_Table_getAccessibleAt (*obj,
                               (CORBA_long) row, (CORBA_long) column, &ev);
 }
 
 
 long
-AccessibleTable_getIndexAt (AccessibleTable *obj,
+SpiAccessibleTable_getIndexAt (SpiAccessibleTable *obj,
                             long row,
                             long column)
 {
@@ -77,7 +75,7 @@ AccessibleTable_getIndexAt (AccessibleTable *obj,
 
 
 long
-AccessibleTable_getRowAtIndex (AccessibleTable *obj,
+SpiAccessibleTable_getRowAtIndex (SpiAccessibleTable *obj,
                                long index)
 {
   return (long)
@@ -88,7 +86,7 @@ AccessibleTable_getRowAtIndex (AccessibleTable *obj,
 
 
 long
-AccessibleTable_getColumnAtIndex (AccessibleTable *obj,
+SpiAccessibleTable_getColumnAtIndex (SpiAccessibleTable *obj,
                                   long index)
 {
   return (long)
@@ -99,29 +97,29 @@ AccessibleTable_getColumnAtIndex (AccessibleTable *obj,
 
 
 char *
-AccessibleTable_getRowDescription (AccessibleTable *obj,
+SpiAccessibleTable_getRowDescription (SpiAccessibleTable *obj,
                                   long row)
 {
-  return string_from_corba_string (
-                                  Accessibility_Table_getRowDescription (*obj,
-                                                                         (CORBA_long) row, &ev));
+  return (char *)
+    Accessibility_Table_getRowDescription (*obj,
+                                          (CORBA_long) row, &ev);
 }
 
 
 
 char *
-AccessibleTable_getColumnDescription (AccessibleTable *obj,
+SpiAccessibleTable_getColumnDescription (SpiAccessibleTable *obj,
                                      long column)
 {
-  return string_from_corba_string (
-                                  Accessibility_Table_getColumnDescription (*obj,
-                                                                            (CORBA_long) column, &ev));
+  return (char *)
+    Accessibility_Table_getColumnDescription (*obj,
+                                             (CORBA_long) column, &ev);
 }
 
 
 
 long
-AccessibleTable_getRowExtentAt (AccessibleTable *obj,
+SpiAccessibleTable_getRowExtentAt (SpiAccessibleTable *obj,
                                 long row,
                                 long column)
 {
@@ -133,7 +131,7 @@ AccessibleTable_getRowExtentAt (AccessibleTable *obj,
 
 
 long
-AccessibleTable_getColumnExtentAt (AccessibleTable *obj,
+SpiAccessibleTable_getColumnExtentAt (SpiAccessibleTable *obj,
                                    long row,
                                    long column)
 {
@@ -144,22 +142,22 @@ AccessibleTable_getColumnExtentAt (AccessibleTable *obj,
 
 
 
-Accessible *
-AccessibleTable_getRowHeader (AccessibleTable *obj,
+SpiAccessible *
+SpiAccessibleTable_getRowHeader (SpiAccessibleTable *obj,
                              long row)
 {
-  return (Accessible *)
+  return (SpiAccessible *)
     Accessibility_Table_getRowHeader (*obj,
                                      (CORBA_long) row, &ev);
 }
 
 
 
-Accessible *
-AccessibleTable_getColumnHeader (AccessibleTable *obj,
-                                long column);
+SpiAccessible *
+SpiAccessibleTable_getColumnHeader (SpiAccessibleTable *obj,
+                                long column)
 {
-  return (Accessible *)
+  return (SpiAccessible *)
     Accessibility_Table_getColumnHeader (*obj,
                                      (CORBA_long) column, &ev);
 }
@@ -167,43 +165,69 @@ AccessibleTable_getColumnHeader (AccessibleTable *obj,
 
 
 long
-AccessibleTable_getNSelectedRows (AccessibleTable *obj)
+SpiAccessibleTable_getNSelectedRows (SpiAccessibleTable *obj)
 {
   return (long)
-    Accessibility_Table_getNSelectedRows (*obj, &ev);
+    Accessibility_Table__get_nSelectedRows (*obj, &ev);
 }
 
 
 
-void
-AccessibleTable_getSelectedRows (AccessibleTable *obj,
+long
+SpiAccessibleTable_getSelectedRows (SpiAccessibleTable *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 = (long *) malloc (sizeof(long)*length);
+  
+  while (length--)
+    *j++ = (CORBA_long) (*i++);
+
+  length = rows->_length;
+  CORBA_free (rows);
+  return length;
 }
 
 
 
 long
-AccessibleTable_getNSelectedColumns (AccessibleTable *obj)
+SpiAccessibleTable_getNSelectedColumns (SpiAccessibleTable *obj)
 {
   return (long)
-    Accessibility_Table_getNSelectedColumns (*obj, &ev);
+    Accessibility_Table__get_nSelectedColumns (*obj, &ev);
 }
 
 
-void
-AccessibleTable_getSelectedColumns (AccessibleTable *obj,
+long
+SpiAccessibleTable_getSelectedColumns (SpiAccessibleTable *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 = (long *) malloc (sizeof(long)*length);
+  
+  while (length--)
+    *j++ = (CORBA_long) (*i++);
+
+  length = columns->_length;
+  CORBA_free (columns);
+  return length;
 }
 
 
 boolean
-AccessibleTable_isRowSelected (AccessibleTable *obj,
+SpiAccessibleTable_isRowSelected (SpiAccessibleTable *obj,
                                long row)
 {
   return (boolean)
@@ -214,7 +238,7 @@ AccessibleTable_isRowSelected (AccessibleTable *obj,
 
 
 boolean
-AccessibleTable_isColumnSelected (AccessibleTable *obj,
+SpiAccessibleTable_isColumnSelected (SpiAccessibleTable *obj,
                                   long column)
 {
   return (boolean)
@@ -225,7 +249,7 @@ AccessibleTable_isColumnSelected (AccessibleTable *obj,
 
 
 boolean
-AccessibleTable_isSelected (AccessibleTable *obj,
+SpiAccessibleTable_isSelected (SpiAccessibleTable *obj,
                             long row,
                             long column)
 {