2001-12-10 Michael Meeks <michael@ximian.com>

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

diff --git a/libspi/image.h b/libspi/image.h
index 0ad0dcc..bd45bf5 100644 (file)
--- a/libspi/image.h
+++ b/libspi/image.h
@@ -17,45 +17,35 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef IMAGE_H_
-#define IMAGE_H_
+#ifndef SPI_IMAGE_H_
+#define SPI_IMAGE_H_
 
+#include <libspi/base.h>
+#include <atk/atkimage.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-#include <bonobo/bonobo-object.h>
-#include <atk/atk.h>
-#include <libspi/Accessibility.h>
+#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 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))
 
-#define IMAGE_TYPE        (image_get_type ())
-#define IMAGE(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), IMAGE_TYPE, Image))
-#define IMAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), IMAGE_TYPE, ImageClass))
-#define IS_IMAGE(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), IMAGE_TYPE))
-#define IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IMAGE_TYPE))
-
-typedef struct _Image Image;
-typedef struct _ImageClass ImageClass;
+typedef struct _Image SpiImage;
+typedef struct _ImageClass SpiImageClass;
 
 struct _Image {
-  BonoboObject parent;
-  AtkObject *atko;
+  SpiBase parent;
 };
 
 struct _ImageClass {
-  BonoboObjectClass parent_class;
+  SpiBaseClass parent;
   POA_Accessibility_Image__epv epv;
 };
 
-GType
-image_get_type   (void);
-
-Image *
-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 /* IMAGE_H_ */
+#endif /* SPI_IMAGE_H_ */