Added API to IDL and cspi (but not libspi, yet) for AccessibleComponent

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

diff --git a/libspi/hypertext.h b/libspi/hypertext.h
index 6c00d44..e5db02f 100644 (file)
--- a/libspi/hypertext.h
+++ b/libspi/hypertext.h
@@ -20,14 +20,12 @@
 #ifndef SPI_HYPERTEXT_H_
 #define SPI_HYPERTEXT_H_
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <bonobo/bonobo-object.h>
 #include <atk/atk.h>
 #include <libspi/Accessibility.h>
+#include <libspi/text.h>
+
+G_BEGIN_DECLS
 
 #define SPI_HYPERTEXT_TYPE        (spi_hypertext_get_type ())
 #define SPI_HYPERTEXT(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_HYPERTEXT_TYPE, SpiHypertext))
@@ -39,8 +37,7 @@ typedef struct _Hypertext SpiHypertext;
 typedef struct _HypertextClass SpiHypertextClass;
 
 struct _Hypertext {
-  BonoboObject parent;
-  AtkObject *atko;
+  SpiText parent;
 };
 
 struct _HypertextClass {
@@ -51,8 +48,6 @@ struct _HypertextClass {
 GType         spi_hypertext_get_type      (void);
 SpiHypertext *spi_hypertext_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_HYPERTEXT_H_ */