X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Ftext.h;h=6c12c7356eff2fe2f3031cc05098acfbebeeab41;hb=68b558bcef701bc71b1b7e53f68935f9c632fcdb;hp=4c79eecf5a7e234269fd30b87844d9a5e8bb7434;hpb=7ff7c0d0b863f7346f21e03b6d170e8c7c6f9878;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/text.h b/libspi/text.h
index 4c79eec..6c12c73 100644
--- a/libspi/text.h
+++ b/libspi/text.h
@@ -17,46 +17,36 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef TEXT_H_
-#define TEXT_H_
+#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 TEXT_TYPE        (accessibility_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_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEXT_TYPE))
+typedef struct _SpiText      SpiText;
+typedef struct _SpiTextClass SpiTextClass;
 
-typedef struct _Text Text;
-typedef struct _TextClass TextClass;
-
-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);
-
-Text *
-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 /* TEXT_H_ */
+#endif /* SPI_TEXT_H_ */