* cspi/spi-roletypes.h, spi_accessible.c: Added marshalling
definitions/conversions for new roles from ATK.
- * libspi/accessible.c: Fixed marshalling of new role types from ATK.
+ * idl/Accessibility_Relation.idl:
+ * libspi/relation.c:
+ * cspi/spi.h, spi_accessible.c: Added SPI_RELATION_DESCRIBED_BY and
+ SPI_RELATION_DESCRIPTION_FOR. (bug #344264) Also
+ SPI_PARENT_WINDOW_OF, which was in ATK but not AT-SPI.
+
+ * libspi/accessible.c: Fixed marshalling of new role types from
+ ATK.
2006-04-17 Matthias Clasen <mclasen@redhat.com>
* another's content.
*@SPI_RELATION_EMBEDDED_BY: Inverse of %SPI_RELATION_EMBEDS, indicates that
* this object's content is visualy embedded in another object.
- *@SPI_RELATION_POPUP_FOR: Indicates that an object is a popup for another objec
-t.
+ *@SPI_RELATION_POPUP_FOR: Indicates that an object is a popup for another objec *@SPI_RELATION_PARENT_WINDOW_OF: Indicates that an object is a parent window of another object.
+ *@SPI_RELATION_DESCRIBED_BY: Indicates that another object provides descriptive information about this object; more verbose than %SPI_RELATION_LABELLED_BY.
+ *@SPI_RELATION_DESCRIPTION_FOR: Indicates that an object provides descriptive information about another object; more verbose than %SPI_RELATION_LABEL_FOR.
*@SPI_RELATION_LAST_DEFINED: Do not use, this is an implementation detail used
* to identify the size of this enumeration.
*
SPI_RELATION_EMBEDS,
SPI_RELATION_EMBEDDED_BY,
SPI_RELATION_POPUP_FOR,
+ SPI_RELATION_PARENT_WINDOW_OF,
+ SPI_RELATION_DESCRIPTION_FOR,
+ SPI_RELATION_DESCRIBED_BY,
SPI_RELATION_LAST_DEFINED
} AccessibleRelationType;
relation_type_table [Accessibility_RELATION_EMBEDS] = SPI_RELATION_EMBEDS;
relation_type_table [Accessibility_RELATION_EMBEDDED_BY] = SPI_RELATION_EMBEDDED_BY;
relation_type_table [Accessibility_RELATION_POPUP_FOR] = SPI_RELATION_POPUP_FOR;
+ relation_type_table [Accessibility_RELATION_PARENT_WINDOW_OF] = SPI_RELATION_PARENT_WINDOW_OF;
+ relation_type_table [Accessibility_RELATION_DESCRIBED_BY] = SPI_RELATION_DESCRIBED_BY;
+ relation_type_table [Accessibility_RELATION_DESCRIPTION_FOR] = SPI_RELATION_DESCRIPTION_FOR;
return TRUE;
}
@SPI_RELATION_EMBEDS:
@SPI_RELATION_EMBEDDED_BY:
@SPI_RELATION_POPUP_FOR:
+@SPI_RELATION_PARENT_WINDOW_OF:
+@SPI_RELATION_DESCRIPTION_FOR:
+@SPI_RELATION_DESCRIBED_BY:
@SPI_RELATION_LAST_DEFINED:
<!-- ##### FUNCTION AccessibleRelation_ref ##### -->
RELATION_POPUP_FOR,
/** This is the reciprocal relation to RELATION_POPUP_FOR. */
RELATION_PARENT_WINDOW_OF,
+ /** Indicates that an object provides descriptive information
+ * about another object; more verbose than RELATION_LABEL_FOR. */
+ RELATION_DESCRIPTION_FOR,
+ /** Indicates that another object provides descriptive information
+ * about this object; more verbose than RELATION_LABELLED_BY. */
+ RELATION_DESCRIBED_BY,
/** Do not use as a parameter value, used to determine the size of the enumeration. */
RELATION_LAST_DEFINED
};
types[ATK_RELATION_EMBEDDED_BY] = Accessibility_RELATION_EMBEDDED_BY;
types[ATK_RELATION_POPUP_FOR] = Accessibility_RELATION_POPUP_FOR;
types[ATK_RELATION_PARENT_WINDOW_OF] = Accessibility_RELATION_PARENT_WINDOW_OF;
+ types[ATK_RELATION_DESCRIPTION_FOR] = Accessibility_RELATION_DESCRIPTION_FOR;
+ types[ATK_RELATION_DESCRIBED_BY] = Accessibility_RELATION_DESCRIBED_BY;
+
return TRUE;
}