2001-11-20 Michael Meeks <michael@ximian.com>

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

diff --git a/libspi/text.h b/libspi/text.h
index 9d9d0fd..7818d75 100644 (file)
--- a/libspi/text.h
+++ b/libspi/text.h
@@ -1,4 +1,4 @@
-/* ATK -  Accessibility Toolkit
+/* AT-SPI -  Assistive Technology Service Provider Interface
  * Copyright 2001 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef TEXT_H_
-#define TEXT_H_
+#ifndef SPI_TEXT_H_
+#define SPI_TEXT_H_
 
 
 #ifdef __cplusplus
@@ -28,19 +28,20 @@ extern "C" {
 #include <bonobo/bonobo-object.h>
 #include <atk/atk.h>
 #include <libspi/Accessibility.h>
+#include "accessible.h"
 
-#define TEXT_TYPE        (text_get_type ())
-#define TEXT(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEXT_TYPE, Text))
-#define TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), TEXT_TYPE, TextClass))
-#define IS_TEXT(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), TEXT_TYPE))
-#define IS_TEX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 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 _Text Text;
-typedef struct _TextClass TextClass;
+typedef struct _Text SpiText;
+typedef struct _TextClass SpiTextClass;
 
 struct _Text {
   BonoboObject parent;
-  AtkText *atk_text;
+  AtkObject *atko;
 };
 
 struct _TextClass {
@@ -49,13 +50,13 @@ struct _TextClass {
 };
 
 GType
-text_get_type   (void);
+accessibility_text_get_type   (void);
 
-Text *
-text_new       (AtkText *text);
+SpiText *
+spi_text_interface_new       (AtkObject *obj);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* TEXT_H_ */
+#endif /* SPI_TEXT_H_ */