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

[platform/core/uifw/at-spi2-atk.git] / cspi / spi-private.h

diff --git a/cspi/spi-private.h b/cspi/spi-private.h
index 8bb4c16..633572e 100644 (file)
--- a/cspi/spi-private.h
+++ b/cspi/spi-private.h
@@ -1,13 +1,11 @@
 #ifndef _SPI_PRIVATE_H_
 #define _SPI_PRIVATE_H_
 
-/*
- * Private internal implementation details of at-spi.
- */
+/* Private internal implementation details of at-spi. */
 
-#include <libbonobo.h>
 #include <libspi/Accessibility.h>
 #include <cspi/spi.h>
+#include "cspi/cspi-lowlevel.h"
 #include "cspi/spi-listener.h"
 
 struct _Accessible {
@@ -18,15 +16,27 @@ struct _Accessible {
 
 #define CSPI_OBJREF(a) (((Accessible *)(a))->objref)
 
-CORBA_Environment     *cspi_ev           (void);
-boolean                cspi_exception    (void);
-Accessibility_Registry cspi_registry     (void);
-Accessible            *cspi_object_add   (CORBA_Object         corba_object);
-void                   cspi_object_ref   (Accessible          *accessible);
-void                   cspi_object_unref (Accessible          *accessible);
-boolean                cspi_warn_ev      (CORBA_Environment   *ev,
-                                         const char          *error_string);
-void                   cspi_check_ev     (CORBA_Environment   *ev,
-                                         const char          *error_string);
+CORBA_Environment     *cspi_ev               (void);
+SPIBoolean             cspi_exception        (void);
+Accessibility_Registry cspi_registry         (void);
+Accessible            *cspi_object_add       (CORBA_Object         corba_object);
+void                   cspi_object_ref       (Accessible          *accessible);
+void                   cspi_object_unref     (Accessible          *accessible);
+SPIBoolean             cspi_accessible_is_a  (Accessible          *obj,
+                                             const char          *interface_name);
+
+#define cspi_return_if_fail(val)               \
+       if (!(val))                             \
+               return
+#define cspi_return_val_if_fail(val, ret)      \
+       if (!(val))                             \
+               return (ret)
+
+#define cspi_return_if_ev(err)                 \
+       if (!cspi_check_ev (err))               \
+               return;
+#define cspi_return_val_if_ev(err, ret)        \
+       if (!cspi_check_ev (err))               \
+               return (ret);
 
 #endif /* _SPI_PRIVATE_H_ */