X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Ftext.h;h=f8fe59faf82e3c5b4eea8192568a0e4dc969a0a5;hb=4328426aeae1eeed7c2e696536351b224eeddbce;hp=9ff138820919da7fd20712279c9e05a8f427ed7b;hpb=408978dd34f3338e49b6ace5f60b7606579ce7a9;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/libspi/text.h b/libspi/text.h index 9ff1388..f8fe59f 100644 --- a/libspi/text.h +++ b/libspi/text.h @@ -20,23 +20,20 @@ #ifndef SPI_TEXT_H_ #define SPI_TEXT_H_ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include #include #include -#include "accessible.h" +#include -#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)) +G_BEGIN_DECLS -typedef struct _SpiText SpiText; +#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)) + +typedef struct _SpiText SpiText; typedef struct _SpiTextClass SpiTextClass; struct _SpiText { @@ -46,17 +43,12 @@ struct _SpiText { struct _SpiTextClass { BonoboObjectClass parent_class; - POA_Accessibility_SpiText__epv epv; + POA_Accessibility_Text__epv epv; }; -GType -accessibility_text_get_type (void); - -SpiText * -spi_text_interface_new (AtkObject *obj); +GType spi_text_get_type (void); +SpiText *spi_text_interface_new (AtkObject *obj); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* SPI_TEXT_H_ */