summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorlouised <louised@e2bd861d-eb25-0410-b326-f6ed22b6b98c>2001-10-17 19:18:38 +0000
committerlouised <louised@e2bd861d-eb25-0410-b326-f6ed22b6b98c>2001-10-17 19:18:38 +0000
commit31dcfbfe1181a558e4e1b8381ca397943bb96a78 (patch)
treef4acc20a98d1937beae02fe94249574668afe8c9 /idl
parentdd5422582cd1423af69d25ad8104e6ac0cd80f72 (diff)
downloadat-spi2-core-31dcfbfe1181a558e4e1b8381ca397943bb96a78.tar.gz
<2001-10-13 Louise Miller <louise.miller@sun.com>
* idl/Accessible.idl, idl/Application.idl, idl/Desktop.idl, idl/Event.idl, idl/Registry.idl Changed these files to include Bonobo_Unknown.idl instead of Bonobo.idl git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@78 e2bd861d-eb25-0410-b326-f6ed22b6b98c
Diffstat (limited to 'idl')
-rw-r--r--idl/Accessibility.idl8
-rw-r--r--idl/Accessibility_Accessible.idl4
-rw-r--r--idl/Accessibility_Application.idl2
-rw-r--r--idl/Accessibility_Desktop.idl2
-rw-r--r--idl/Accessibility_Event.idl2
-rw-r--r--idl/Accessibility_Registry.idl2
-rw-r--r--idl/Accessible.idl4
-rw-r--r--idl/Application.idl2
-rw-r--r--idl/Desktop.idl2
-rw-r--r--idl/Event.idl2
-rw-r--r--idl/Registry.idl2
11 files changed, 18 insertions, 14 deletions
diff --git a/idl/Accessibility.idl b/idl/Accessibility.idl
index f858a876..c2b425c4 100644
--- a/idl/Accessibility.idl
+++ b/idl/Accessibility.idl
@@ -23,12 +23,14 @@
#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
@@ -63,8 +65,10 @@
#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
diff --git a/idl/Accessibility_Accessible.idl b/idl/Accessibility_Accessible.idl
index 79785e70..09735cb5 100644
--- a/idl/Accessibility_Accessible.idl
+++ b/idl/Accessibility_Accessible.idl
@@ -23,7 +23,7 @@
#ifndef _ACCESSIBILITY_ACCESSIBLE_IDL
#define _ACCESSIBILITY_ACCESSIBLE_IDL
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
#include "Relation.idl"
#include "State.idl"
@@ -65,7 +65,7 @@ module Accessibility {
* return values: a #boolean indicating whether the two object references
* point to the same object.
**/
- boolean isEqual (in Accessible object);
+ boolean isEqual (in Accessible obj);
/**
* getChildAtIndex:
diff --git a/idl/Accessibility_Application.idl b/idl/Accessibility_Application.idl
index a41db3ae..05139bc1 100644
--- a/idl/Accessibility_Application.idl
+++ b/idl/Accessibility_Application.idl
@@ -23,7 +23,7 @@
#ifndef __ACCESSIBILITY_APPLICATION_DEFINED__
#define __ACCESSIBILITY_APPLICATION_DEFINED__
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
#include <Accessible.idl>
module Accessibility {
diff --git a/idl/Accessibility_Desktop.idl b/idl/Accessibility_Desktop.idl
index 635fee59..5702fb38 100644
--- a/idl/Accessibility_Desktop.idl
+++ b/idl/Accessibility_Desktop.idl
@@ -23,7 +23,7 @@
#ifndef __ACCESSIBILITY_DESKTOP_DEFINED__
#define __ACCESSIBILITY_DESKTOP_DEFINED__
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
#include <Accessible.idl>
module Accessibility {
diff --git a/idl/Accessibility_Event.idl b/idl/Accessibility_Event.idl
index 3e9d01ae..2574a806 100644
--- a/idl/Accessibility_Event.idl
+++ b/idl/Accessibility_Event.idl
@@ -23,7 +23,7 @@
#ifndef __ACCESSIBILITY_EVENT_DEFINED__
#define __ACCESSIBILITY_EVENT_DEFINED__
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
module Accessibility
{
diff --git a/idl/Accessibility_Registry.idl b/idl/Accessibility_Registry.idl
index 5f42d877..96da28be 100644
--- a/idl/Accessibility_Registry.idl
+++ b/idl/Accessibility_Registry.idl
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
#include <Event.idl>
#include <Application.idl>
#include <Desktop.idl>
diff --git a/idl/Accessible.idl b/idl/Accessible.idl
index 79785e70..09735cb5 100644
--- a/idl/Accessible.idl
+++ b/idl/Accessible.idl
@@ -23,7 +23,7 @@
#ifndef _ACCESSIBILITY_ACCESSIBLE_IDL
#define _ACCESSIBILITY_ACCESSIBLE_IDL
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
#include "Relation.idl"
#include "State.idl"
@@ -65,7 +65,7 @@ module Accessibility {
* return values: a #boolean indicating whether the two object references
* point to the same object.
**/
- boolean isEqual (in Accessible object);
+ boolean isEqual (in Accessible obj);
/**
* getChildAtIndex:
diff --git a/idl/Application.idl b/idl/Application.idl
index a41db3ae..05139bc1 100644
--- a/idl/Application.idl
+++ b/idl/Application.idl
@@ -23,7 +23,7 @@
#ifndef __ACCESSIBILITY_APPLICATION_DEFINED__
#define __ACCESSIBILITY_APPLICATION_DEFINED__
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
#include <Accessible.idl>
module Accessibility {
diff --git a/idl/Desktop.idl b/idl/Desktop.idl
index 635fee59..5702fb38 100644
--- a/idl/Desktop.idl
+++ b/idl/Desktop.idl
@@ -23,7 +23,7 @@
#ifndef __ACCESSIBILITY_DESKTOP_DEFINED__
#define __ACCESSIBILITY_DESKTOP_DEFINED__
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
#include <Accessible.idl>
module Accessibility {
diff --git a/idl/Event.idl b/idl/Event.idl
index 3e9d01ae..2574a806 100644
--- a/idl/Event.idl
+++ b/idl/Event.idl
@@ -23,7 +23,7 @@
#ifndef __ACCESSIBILITY_EVENT_DEFINED__
#define __ACCESSIBILITY_EVENT_DEFINED__
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
module Accessibility
{
diff --git a/idl/Registry.idl b/idl/Registry.idl
index 5f42d877..96da28be 100644
--- a/idl/Registry.idl
+++ b/idl/Registry.idl
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
#include <Event.idl>
#include <Application.idl>
#include <Desktop.idl>