2004-02-11 Padraig O'Briain <padraig.obriain@sun.com>

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

diff --git a/libspi/value.h b/libspi/value.h
index 2c3755b..c771ef3 100644 (file)
--- a/libspi/value.h
+++ b/libspi/value.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
@@ -17,45 +21,35 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef VALUE_H_
-#define VALUE_H_
-
+#ifndef SPI_VALUE_H_
+#define SPI_VALUE_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <libspi/base.h>
+#include <atk/atkvalue.h>
 
-#include <bonobo/bonobo-object.h>
-#include <atk/atk.h>
-#include <libspi/Accessibility.h>
+G_BEGIN_DECLS
 
-#define VALUE_TYPE        (value_get_type ())
-#define VALUE(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), VALUE_TYPE, Value))
-#define ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), VALUE_TYPE, ValueClass))
-#define IS_VALUE(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), VALUE_TYPE))
-#define IS_VALUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VALUE_TYPE))
+#define SPI_VALUE_TYPE            (spi_value_get_type ())
+#define SPI_VALUE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_VALUE_TYPE, SpiValue))
+#define SPI_VALUE_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass), SPI_VALUE_TYPE, SpiValueClass))
+#define SPI_IS_VALUE(obj)         (G_TYPE_CHECK__INSTANCE_TYPE ((obj), SPI_VALUE_TYPE))
+#define SPI_IS_VALUE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_VALUE_TYPE))
 
-typedef struct _Value Value;
-typedef struct _ValueClass ValueClass;
+typedef struct _Value SpiValue;
+typedef struct _ValueClass SpiValueClass;
 
 struct _Value {
-  BonoboObject parent;
-  AtkObject *atko;
+  SpiBase parent;
 };
 
 struct _ValueClass {
-  BonoboObjectClass parent_class;
+  SpiBaseClass parent_class;
   POA_Accessibility_Value__epv epv;
 };
 
-GType
-value_get_type   (void);
-
-Value *
-value_interface_new       (AtkObject *obj);
+GType     spi_value_get_type      (void);
+SpiValue *spi_value_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* VALUE_H_ */
+#endif /* SPI_VALUE_H_ */