2001-12-07 Michael Meeks <michael@ximian.com>

[platform/upstream/at-spi2-core.git] / libspi / table.h

diff --git a/libspi/table.h b/libspi/table.h
index e8acfa4..3a41b6e 100644 (file)
--- a/libspi/table.h
+++ b/libspi/table.h
@@ -20,42 +20,31 @@
 #ifndef SPI_TABLE_H_
 #define SPI_TABLE_H_
 
+#include <libspi/base.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-#include <bonobo/bonobo-object.h>
-#include <atk/atk.h>
-#include <libspi/Accessibility.h>
+#define SPI_TABLE_TYPE         (spi_table_get_type ())
+#define SPI_TABLE(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_TABLE_TYPE, SpiTable))
+#define SPI_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SPI_TABLE_TYPE, SpiTableClass))
+#define IS_TABLE(obj)          (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_TABLE_TYPE))
+#define IS_TABLE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_TABLE_TYPE))
 
-#define SPI_TABLE_TYPE        (spi_table_get_type ())
-#define SPI_TABLE(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_TABLE_TYPE, SpiTable))
-#define SPI_TABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SPI_TABLE_TYPE, SpiTableClass))
-#define IS_TABLE(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_TABLE_TYPE))
-#define IS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_TABLE_TYPE))
+typedef struct _SpiTable      SpiTable;
+typedef struct _SpiTableClass SpiTableClass;
 
-typedef struct _Table SpiTable;
-typedef struct _TableClass SpiTableClass;
-
-struct _Table {
-  BonoboObject parent;
-  AtkObject *atko;
+struct _SpiTable {
+  SpiBase parent;
 };
 
-struct _TableClass {
-  BonoboObjectClass parent_class;
+struct _SpiTableClass {
+  SpiBaseClass parent_class;
   POA_Accessibility_Table__epv epv;
 };
 
-GType
-spi_table_get_type   (void);
-
-SpiTable *
-spi_table_interface_new       (AtkObject *obj);
+GType     spi_table_get_type      (void);
+SpiTable *spi_table_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_TABLE_H_ */