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

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

diff --git a/libspi/relation.h b/libspi/relation.h
index 59806af..eb1c05e 100644 (file)
--- a/libspi/relation.h
+++ b/libspi/relation.h
@@ -21,42 +21,32 @@
 #ifndef SPI_RELATION_H_
 #define SPI_RELATION_H_
 
+#include <libspi/base.h>
+#include <atk/atkrelation.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_RELATION_TYPE        (spi_relation_get_type ())
-#define SPI_RELATION(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_RELATION_TYPE, SpiRelation))
+#define SPI_RELATION_TYPE            (spi_relation_get_type ())
+#define SPI_RELATION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_RELATION_TYPE, SpiRelation))
 #define SPI_RELATION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SPI_RELATION_TYPE, SpiRelationClass))
-#define IS_SPI_RELATION(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_RELATION_TYPE))
-#define IS_SPI_RELATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_RELATION_TYPE))
+#define SPI_IS_RELATION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_RELATION_TYPE))
+#define SPI_IS_RELATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_RELATION_TYPE))
 
 typedef struct _SpiRelation SpiRelation;
 typedef struct _SpiRelationClass SpiRelationClass;
 
 struct _SpiRelation {
-  BonoboObject parent;
-  AtkRelation *relation;
+  SpiBase parent;
 };
 
 struct _SpiRelationClass {
-  BonoboObjectClass parent_class;
+  SpiBaseClass parent_class;
   POA_Accessibility_Relation__epv epv;
 };
 
-GType
-spi_relation_get_type   (void);
-
-SpiRelation *
-spi_relation_new       (AtkRelation *relation);
+GType        spi_relation_get_type (void);
+SpiRelation *spi_relation_new      (AtkRelation *relation);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_RELATION_H_ */