Removed po directory from Makefile.am for now.

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

diff --git a/libspi/action.h b/libspi/action.h
index 50a8d10..7396b4b 100644 (file)
--- a/libspi/action.h
+++ b/libspi/action.h
@@ -17,45 +17,34 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef ACTION_H_
-#define ACTION_H_
+#ifndef SPI_ACTION_H_
+#define SPI_ACTION_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>
+#define SPI_ACTION_TYPE        (spi_action_get_type ())
+#define SPI_ACTION(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_ACTION_TYPE, SpiAction))
+#define SPI_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SPI_ACTION_TYPE, SpiActionClass))
+#define SPI_IS_ACTION(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_ACTION_TYPE))
+#define SPI_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_ACTION_TYPE))
 
-#define ACTION_TYPE        (action_get_type ())
-#define ACTION(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), ACTION_TYPE, Action))
-#define ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), ACTION_TYPE, ActionClass))
-#define IS_ACTION(obj)       (G_TYPE_CHECK__INSTANCE_TYPE ((obj), ACTION_TYPE))
-#define IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ACTION_TYPE))
-
-typedef struct _Action Action;
-typedef struct _ActionClass ActionClass;
+typedef struct _Action SpiAction;
+typedef struct _ActionClass SpiActionClass;
 
 struct _Action {
-  BonoboObject parent;
-  AtkObject *atko;
+  SpiBase parent;
 };
 
 struct _ActionClass {
-  BonoboObjectClass parent_class;
+  SpiBaseClass parent_class;
   POA_Accessibility_Action__epv epv;
 };
 
-GType
-action_get_type   (void);
-
-Action *
-action_interface_new       (AtkObject *obj);
+GType      spi_action_get_type      (void);
+SpiAction *spi_action_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* ACTION_H_ */
+#endif /* SPI_ACTION_H_ */