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

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

diff --git a/libspi/table.h b/libspi/table.h
index de2fade..29f4fcd 100644 (file)
--- a/libspi/table.h
+++ b/libspi/table.h
@@ -20,32 +20,29 @@
 #ifndef SPI_TABLE_H_
 #define SPI_TABLE_H_
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <bonobo/bonobo-object.h>
 #include <atk/atk.h>
 #include <libspi/Accessibility.h>
 
+G_BEGIN_DECLS
+
 #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 _SpiTable {
+struct _Table {
   BonoboObject parent;
   AtkObject *atko;
 };
 
-struct _SpiTableClass {
+struct _TableClass {
   BonoboObjectClass parent_class;
-  POA_Accessibility_SpiTable__epv epv;
+  POA_Accessibility_Table__epv epv;
 };
 
 GType
@@ -54,8 +51,6 @@ spi_table_get_type   (void);
 SpiTable *
 spi_table_interface_new       (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_TABLE_H_ */