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

[platform/core/uifw/at-spi2-atk.git] / idl / Accessibility.idl

diff --git a/idl/Accessibility.idl b/idl/Accessibility.idl
index 862453a..c2b425c 100644 (file)
--- a/idl/Accessibility.idl
+++ b/idl/Accessibility.idl
@@ -23,24 +23,52 @@
 #ifndef _ACCESSIBILITY_IDL_
 #define _ACCESSIBILITY_IDL_
 
-#if !defined(__ACCESSIBILITY_COMPILATION__) && defined(__ORBIT_IDL__)
+#ifndef  __ACCESSIBILITY_COMPILATION__
+#ifdef   __ORBIT_IDL__
 %{
 #pragma include_defs Accessibility.h
 %}
 #pragma inhibit push
 #endif
+#endif
 
+/*
+ * Accessibility interfaces and subinterfaces
+ */
 #include <Accessible.idl>
-#include <Desktop.idl>
+#include <Action.idl>
+#include <Component.idl>
+#include <Hyperlink.idl>
+#include <Image.idl>
+#include <Selection.idl>
+#include <StreamableContent.idl>
+#include <Table.idl>
+#include <Text.idl>
+#include <Value.idl>
+
+/*
+ * Interfaces derived from Accessibility::Text
+ */
+
+#include <EditableText.idl>
+#include <Hypertext.idl>
+
+/*
+ * Utility interfaces and interfaces derived from Accessibility::Accessible
+ */
+
 #include <Relation.idl>
 #include <State.idl>
 #include <Application.idl>
+#include <Desktop.idl>
 #include <Event.idl>
 #include <Registry.idl>
 #include <Role.idl>
 
-#if !defined(__ACCESSIBILITY_COMPILATION__) && defined(__ORBIT_IDL__)
+#ifndef __ACCESSIBILITY_COMPILATION__
+#ifdef  __ORBIT_IDL__
 #pragma inhibit pop
 #endif
+#endif
 
 #endif