#ifndef SPI_TEXT_H_
#define SPI_TEXT_H_
+#include <libspi/base.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
-#include <bonobo/bonobo-object.h>
-#include <atk/atk.h>
-#include <libspi/Accessibility.h>
-#include "accessible.h"
+#define SPI_TEXT_TYPE (spi_text_get_type ())
+#define SPI_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_TEXT_TYPE, SpiText))
+#define SPI_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SPI_TEXT_TYPE, SpiTextClass))
+#define IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_TEXT_TYPE))
+#define IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_TEXT_TYPE))
-#define SPI_TEXT_TYPE (accessibility_text_get_type ())
-#define SPI_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_TEXT_TYPE, SpiText))
-#define SPI_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SPI_TEXT_TYPE, SpiTextClass))
-#define IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_TEXT_TYPE))
-#define IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_TEXT_TYPE))
+typedef struct _SpiText SpiText;
+typedef struct _SpiTextClass SpiTextClass;
-typedef struct _Text SpiText;
-typedef struct _TextClass SpiTextClass;
-
-struct _Text {
- BonoboObject parent;
- AtkObject *atko;
+struct _SpiText {
+ SpiBase parent;
};
-struct _TextClass {
- BonoboObjectClass parent_class;
+struct _SpiTextClass {
+ SpiBaseClass parent_class;
POA_Accessibility_Text__epv epv;
};
-GType
-accessibility_text_get_type (void);
-
-SpiText *
-spi_text_interface_new (AtkObject *obj);
+GType spi_text_get_type (void);
+void spi_text_construct (SpiText *text,
+ AtkObject *obj);
+SpiText *spi_text_interface_new (AtkObject *obj);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* SPI_TEXT_H_ */