Removed po directory from Makefile.am for now.

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

diff --git a/libspi/hypertext.h b/libspi/hypertext.h
index 6c00d44..b197ff7 100644 (file)
--- a/libspi/hypertext.h
+++ b/libspi/hypertext.h
@@ -20,39 +20,31 @@
 #ifndef SPI_HYPERTEXT_H_
 #define SPI_HYPERTEXT_H_
 
+#include <libspi/text.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_HYPERTEXT_TYPE        (spi_hypertext_get_type ())
-#define SPI_HYPERTEXT(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_HYPERTEXT_TYPE, SpiHypertext))
+#define SPI_HYPERTEXT_TYPE            (spi_hypertext_get_type ())
+#define SPI_HYPERTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_HYPERTEXT_TYPE, SpiHypertext))
 #define SPI_HYPERTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SPI_HYPERTEXT_TYPE, SpiHypertextClass))
-#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))
+#define SPI_IS_HYPERTEXT(obj)         (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_HYPERTEXT_TYPE))
+#define SPI_IS_HYPERTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_HYPERTEXT_TYPE))
 
-typedef struct _Hypertext SpiHypertext;
-typedef struct _HypertextClass SpiHypertextClass;
+typedef struct _SpiHypertext      SpiHypertext;
+typedef struct _SpiHypertextClass SpiHypertextClass;
 
-struct _Hypertext {
-  BonoboObject parent;
-  AtkObject *atko;
+struct _SpiHypertext {
+  SpiText parent;
 };
 
-struct _HypertextClass {
-  BonoboObjectClass parent_class;
+struct _SpiHypertextClass {
+  SpiTextClass parent_class;
   POA_Accessibility_Hypertext__epv epv;
 };
 
 GType         spi_hypertext_get_type      (void);
 SpiHypertext *spi_hypertext_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_HYPERTEXT_H_ */