X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Fhypertext.h;h=e5db02f22a0c183eccc59810efff2693ef5b92f9;hb=a0661d5d4128769f2544d24430c80dc440bfdbba;hp=68377709968c8ff71edf623527fe6d7a8753b782;hpb=408978dd34f3338e49b6ace5f60b7606579ce7a9;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/hypertext.h b/libspi/hypertext.h
index 6837770..e5db02f 100644
--- 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))
@@ -35,27 +33,21 @@ extern "C" {
 #define IS_SPI_HYPERTEXT(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_HYPERTEXT_TYPE))
 #define IS_HYPESPI_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_HYPERTEXT_TYPE))
 
-typedef struct _SpiHypertext SpiHypertext;
-typedef struct _SpiHypertextClass SpiHypertextClass;
+typedef struct _Hypertext SpiHypertext;
+typedef struct _HypertextClass SpiHypertextClass;
 
-struct _SpiHypertext {
-  BonoboObject parent;
-  AtkObject *atko;
+struct _Hypertext {
+  SpiText parent;
 };
 
-struct _SpiHypertextClass {
+struct _HypertextClass {
   BonoboObjectClass parent_class;
-  POA_Accessibility_SpiHyperspi_text__epv epv;
+  POA_Accessibility_Hypertext__epv epv;
 };
 
-GType
-spi_hypertext_get_type   (void);
-
-SpiHypertext *
-spi_hypertext_interface_new       (AtkObject *obj);
+GType         spi_hypertext_get_type      (void);
+SpiHypertext *spi_hypertext_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_HYPERTEXT_H_ */