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

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

diff --git a/libspi/hypertext.h b/libspi/hypertext.h
index 7fbe157..b197ff7 100644 (file)
--- a/libspi/hypertext.h
+++ b/libspi/hypertext.h
@@ -17,45 +17,34 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef HYPERTEXT_H_
-#define HYPERTEXT_H_
+#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_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SPI_HYPERTEXT_TYPE, SpiHypertextClass))
+#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))
 
-#define HYPERTEXT_TYPE        (hypertext_get_type ())
-#define HYPERTEXT(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), HYPERTEXT_TYPE, Hypertext))
-#define HYPERTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), HYPERTEXT_TYPE, HypertextClass))
-#define IS_HYPERTEXT(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), HYPERTEXT_TYPE))
-#define IS_HYPETEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HYPERTEXT_TYPE))
+typedef struct _SpiHypertext      SpiHypertext;
+typedef struct _SpiHypertextClass SpiHypertextClass;
 
-typedef struct _Hypertext Hypertext;
-typedef struct _HypertextClass HypertextClass;
-
-struct _Hypertext {
-  BonoboObject parent;
-  AtkHypertext *atk_hypertext;
+struct _SpiHypertext {
+  SpiText parent;
 };
 
-struct _HypertextClass {
-  BonoboObjectClass parent_class;
+struct _SpiHypertextClass {
+  SpiTextClass parent_class;
   POA_Accessibility_Hypertext__epv epv;
 };
 
-GType
-hypertext_get_type   (void);
-
-Hypertext *
-hypertext_new       (AtkHypertext *hypertext);
+GType         spi_hypertext_get_type      (void);
+SpiHypertext *spi_hypertext_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* HYPERTEXT_H_ */
+#endif /* SPI_HYPERTEXT_H_ */