2002-09-06 Mark McLoughlin <mark@skynet.ie>

        * cspi/spi.h: add SPI_LAYER_WINDOW.

        * cspi/spi_component.c: (AccessibleComponent_getLayer):
        add Accessibility_LAYER_WINDOW case.

        * idl/Accessibility_Component.idl: add LAYER_WINDOW.

        * libspi/component.c: (impl_accessibility_component_get_layer):
        add ATK_LAYER_WINDOW case.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@341 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 4251e91..0480172 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-06  Mark McLoughlin  <mark@skynet.ie>
+
+       * cspi/spi.h: add SPI_LAYER_WINDOW.
+
+       * cspi/spi_component.c: (AccessibleComponent_getLayer):
+       add Accessibility_LAYER_WINDOW case.
+
+       * idl/Accessibility_Component.idl: add LAYER_WINDOW.
+
+       * libspi/component.c: (impl_accessibility_component_get_layer):
+       add ATK_LAYER_WINDOW case.
+
 2002-08-28  Bill Haneman <bill.haneman@sun.com>
 
        * configure.in: incremented micro version.

diff --git a/cspi/spi.h b/cspi/spi.h
index cc1f52d..9c2da2e 100644 (file)
--- a/cspi/spi.h
+++ b/cspi/spi.h
@@ -112,6 +112,8 @@ typedef unsigned long AccessibleKeyEventMask;
  *                          MDI components.
  * @SPI_LAYER_OVERLAY: Component is in the overlay plane - this value is reserved
  *                          for future use.
+ * @SPI_LAYER_WINDOW: Component is in the window layer and have valid Z-information
+ *                    relative to other window-layer components.
  * @SPI_LAYER_LAST_DEFINED: Used to determine the last valid value in the enum,
  *                          should not be encountered. 
  **/
@@ -123,6 +125,7 @@ typedef enum {
     SPI_LAYER_MDI,
     SPI_LAYER_POPUP,
     SPI_LAYER_OVERLAY,
+    SPI_LAYER_WINDOW,
     SPI_LAYER_LAST_DEFINED     
 } AccessibleComponentLayer;
 

diff --git a/cspi/spi_component.c b/cspi/spi_component.c
index 872882b..e2ac144 100644 (file)
--- a/cspi/spi_component.c
+++ b/cspi/spi_component.c
@@ -267,6 +267,9 @@ AccessibleComponent_getLayer (AccessibleComponent *obj)
     case Accessibility_LAYER_OVERLAY:    
       retval = SPI_LAYER_OVERLAY;
       break;
+    case Accessibility_LAYER_WINDOW:     
+      retval = SPI_LAYER_WINDOW;
+      break;
     default:
       retval = SPI_LAYER_INVALID;
       break;
@@ -279,8 +282,8 @@ AccessibleComponent_getLayer (AccessibleComponent *obj)
  * AccessibleComponent_getMDIZOrder:
  * @obj: a pointer to the #AccessibleComponent to query.
  *
- * Query the z stacking order of a component which is in the MDI layer.
- *       (Bigger z-order numbers mean nearer the top)
+ * Query the z stacking order of a component which is in the MDI or window
+ *       layer. (Bigger z-order numbers mean nearer the top)
  *
  * Returns: a short integer indicating the stacking order of the component 
  *       in the MDI layer, or -1 if the component is not in the MDI layer.

diff --git a/idl/Accessibility_Component.idl b/idl/Accessibility_Component.idl
index cb88cf0..c3ca89f 100644 (file)
--- a/idl/Accessibility_Component.idl
+++ b/idl/Accessibility_Component.idl
@@ -32,6 +32,7 @@ module Accessibility {
     LAYER_MDI,
     LAYER_POPUP,
     LAYER_OVERLAY,
+    LAYER_WINDOW,
     LAYER_LAST_DEFINED
   };
 

diff --git a/libspi/component.c b/libspi/component.c
index 5c5fc0d..a0eeb66 100644 (file)
--- a/libspi/component.c
+++ b/libspi/component.c
@@ -170,6 +170,8 @@ impl_accessibility_component_get_layer (PortableServer_Servant servant,
         return Accessibility_LAYER_POPUP;
       case ATK_LAYER_OVERLAY:
         return Accessibility_LAYER_OVERLAY;
+      case ATK_LAYER_WINDOW:
+        return Accessibility_LAYER_WINDOW;
       default:
         break;      
     }