X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Fimage.h;h=8ffb855c030a70e0c4ce45f86fb83695b9908ba5;hb=fc127cbb0f6101f0dc98416737d651c0cda2ca10;hp=e3eae30739477420ca2527d02e5dd201b308e06b;hpb=408978dd34f3338e49b6ace5f60b7606579ce7a9;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/image.h b/libspi/image.h
index e3eae30..8ffb855 100644
--- a/libspi/image.h
+++ b/libspi/image.h
@@ -1,5 +1,9 @@
-/* ATK -  Accessibility Toolkit
- * Copyright 2001 Sun Microsystems Inc.
+/*
+ * AT-SPI - Assistive Technology Service Provider Interface
+ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
+ *
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,42 +24,32 @@
 #ifndef SPI_IMAGE_H_
 #define SPI_IMAGE_H_
 
+#include <libspi/base.h>
+#include <atk/atkimage.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <bonobo/bonobo-object.h>
-#include <atk/atk.h>
-#include <libspi/Accessibility.h>
+G_BEGIN_DECLS
 
-#define SPI_IMAGE_TYPE        (spi_image_get_type ())
-#define SPI_IMAGE(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_IMAGE_TYPE, SpiImage))
+#define SPI_IMAGE_TYPE            (spi_image_get_type ())
+#define SPI_IMAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_IMAGE_TYPE, SpiImage))
 #define SPI_IMAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SPI_IMAGE_TYPE, SpiImageClass))
-#define IS_SPI_IMAGE(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_IMAGE_TYPE))
-#define IS_SPI_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_IMAGE_TYPE))
+#define SPI_IS_IMAGE(obj)         (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_IMAGE_TYPE))
+#define SPI_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_IMAGE_TYPE))
 
-typedef struct _SpiImage SpiImage;
-typedef struct _SpiImageClass SpiImageClass;
+typedef struct _Image SpiImage;
+typedef struct _ImageClass SpiImageClass;
 
-struct _SpiImage {
-  BonoboObject parent;
-  AtkObject *atko;
+struct _Image {
+  SpiBase parent;
 };
 
-struct _SpiImageClass {
-  BonoboObjectClass parent_class;
-  POA_Accessibility_SpiImage__epv epv;
+struct _ImageClass {
+  SpiBaseClass parent;
+  POA_Accessibility_Image__epv epv;
 };
 
-GType
-spi_image_get_type   (void);
-
-SpiImage *
-spi_image_interface_new       (AtkObject *obj);
+GType     spi_image_get_type      (void);
+SpiImage *spi_image_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_IMAGE_H_ */