+2001-11-19 Michael Meeks <michael@ximian.com>
+
+ * libspi/editabletext.c (impl_setAttributes): fix warnings.
+
+ * libspi/component.c (accessibility_component_get_type):
+ rename to (spi_component_get_type): and macroify.
+ (accessibility_component_init): rename to
+ (spi_component_init): this
+ (accessibility_component_class_init): rename to
+ (spi_component_class_init): this
+
+ * libspi/action.c (spi_action_get_type): kill, use the macro.
+
+ * libspi/deviceeventcontroller.c (_compare_listeners): re-order
+ to avoid prototype.
+
+ * libspi/application.c (spi_application_object_event_listener),
+ (impl_accessibility_application_register_object_event_listener):
+ warning fixes / const understanding updates.
+
+ * libspi/accessible.c (impl_accessibility_accessible_get_relation_set):
+ warning fixes.
+
2001-18-11 Bill Haneman <bill.haneman@sun.com>
* libspi/spi_accessible.c: Added docs and C bindings for
#include "text.h"
#include "value.h"
#include "action.h"
+#include "relation.h"
/*
* Our parent Gtk object type
{
retval->_buffer[i] =
CORBA_Object_duplicate (bonobo_object_corba_objref (
- spi_relation_new (atk_relation_set_get_relation (relation_set, i))),
+ BONOBO_OBJECT (spi_relation_new (atk_relation_set_get_relation (relation_set, i)))),
ev);
}
{
}
-GType
-spi_accessible_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiAccessibleClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_accessible_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiAccessible),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_accessible_init,
- NULL /* value table */
- };
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_Accessible__init,
- NULL,
- G_STRUCT_OFFSET (SpiAccessibleClass, epv),
- &tinfo,
- "SpiAccessible");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiAccessible,
+ Accessibility_Accessible,
+ PARENT_TYPE,
+ spi_accessible);
SpiAccessible *
spi_accessible_new (AtkObject *o)
static GObjectClass *parent_class;
-GType
-spi_action_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiActionClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_action_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiAction),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_action_init,
- NULL /* value table */
- };
-
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- BONOBO_OBJECT_TYPE,
- POA_Accessibility_Action__init,
- NULL,
- G_STRUCT_OFFSET (SpiActionClass, epv),
- &tinfo,
- "SpiAccessibleAction");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiAction,
+ Accessibility_Action,
+ BONOBO_OBJECT_TYPE,
+ spi_action);
static void
spi_action_class_init (SpiActionClass *klass)
Accessibility_Event *e,
CORBA_Environment *ev);
-static char* lookup_toolkit_event_for_name (char *generic_name);
+static char *reverse_lookup_name_for_toolkit_event (char *toolkit_name);
-static char* reverse_lookup_name_for_toolkit_event (char *toolkit_name);
+static const char *
+lookup_toolkit_event_for_name (const char *generic_name)
+{
+ char *toolkit_specific_name;
+ SpiApplicationClass *klass = g_type_class_peek (SPI_APPLICATION_TYPE);
+#ifdef SPI_DEBUG
+ fprintf (stderr, "looking for %s in hash table.\n", generic_name);
+#endif
+ toolkit_specific_name =
+ (char *) g_hash_table_lookup (klass->toolkit_event_names, generic_name);
+#ifdef SPI_DEBUG
+ fprintf (stderr, "generic event %s converted to %s\n", generic_name, toolkit_specific_name);
+#endif
+ return toolkit_specific_name;
+}
/*
* Implemented GObject::finalize
SpiAccessible *source;
CORBA_Environment ev;
GSignalQuery signal_query;
- gchar *name;
+ const gchar *name;
char sbuf[APP_STATIC_BUFF_SZ];
char *generic_name;
}
else
{
+ aobject = NULL;
g_error("received event from non-AtkImplementor");
}
SpiAccessible *source;
CORBA_Environment ev;
GSignalQuery signal_query;
- gchar *name;
+ const char *name;
char sbuf[APP_STATIC_BUFF_SZ];
g_signal_query (signal_hint->signal_id, &signal_query);
e->detail1 = 0;
e->detail2 = 0;
if (the_app) notify_listeners (the_app->toolkit_listeners, e, &ev);
- bonobo_object_unref (source);
+ bonobo_object_unref (BONOBO_OBJECT (source));
g_object_unref (G_OBJECT (aobject));
}
return TRUE;
{
guint spi_listener_id;
spi_listener_id =
- atk_add_global_event_listener (spi_application_toolkit_event_listener, event_name);
+ atk_add_global_event_listener (spi_application_toolkit_event_listener, (char *) event_name);
the_app->toolkit_listeners = g_list_append (the_app->toolkit_listeners,
CORBA_Object_duplicate (listener, ev));
#ifdef SPI_DEBUG
const CORBA_char *event_name,
CORBA_Environment *ev)
{
- guint spi_listener_id;
- char *toolkit_specific_event_name = lookup_toolkit_event_for_name (event_name);
+ guint spi_listener_id = 0;
+ const char *toolkit_specific_event_name =
+ lookup_toolkit_event_for_name (event_name);
if (toolkit_specific_event_name)
{
spi_listener_id =
}
static char *
-lookup_toolkit_event_for_name (char *generic_name)
-{
- char *toolkit_specific_name;
- SpiApplicationClass *klass = g_type_class_peek (SPI_APPLICATION_TYPE);
-#ifdef SPI_DEBUG
- fprintf (stderr, "looking for %s in hash table.\n", generic_name);
-#endif
- toolkit_specific_name =
- (char *) g_hash_table_lookup (klass->toolkit_event_names, generic_name);
-#ifdef SPI_DEBUG
- fprintf (stderr, "generic event %s converted to %s\n", generic_name, toolkit_specific_name);
-#endif
- return toolkit_specific_name;
-}
-
-static char *
reverse_lookup_name_for_toolkit_event (char *toolkit_specific_name)
{
char *generic_name;
the_app = application;
}
-GType
-spi_application_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiApplicationClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_application_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiApplication),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_application_init,
- NULL /* value table */
- };
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_Application__init,
- NULL,
- G_STRUCT_OFFSET (SpiApplicationClass, epv),
- &tinfo,
- "SpiApplication");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiApplication,
+ Accessibility_Application,
+ PARENT_TYPE, spi_application);
SpiApplication *
spi_application_new (AtkObject *app_root)
}
static void
-accessibility_component_class_init (SpiComponentClass *klass)
+spi_component_class_init (SpiComponentClass *klass)
{
GObjectClass * object_class = (GObjectClass *) klass;
POA_Accessibility_Component__epv *epv = &klass->epv;
}
static void
-accessibility_component_init (SpiComponent *component)
+spi_component_init (SpiComponent *component)
{
}
-GType
-accessibility_component_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiComponentClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) accessibility_component_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiComponent),
- 0, /* n preallocs */
- (GInstanceInitFunc) accessibility_component_init,
- NULL /* value table */
- };
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_Component__init,
- NULL,
- G_STRUCT_OFFSET (SpiComponentClass, epv),
- &tinfo,
- "SpiAccessibleComponent");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiComponent,
+ Accessibility_Component,
+ PARENT_TYPE,
+ spi_component);
SpiComponent *
spi_component_interface_new (AtkObject *o)
{
SpiComponent *retval =
- SPI_COMPONENT (g_object_new (accessibility_component_get_type (), NULL));
+ SPI_COMPONENT (g_object_new (SPI_COMPONENT_TYPE, NULL));
retval->atko = o;
g_object_ref (o);
return retval;
#include <atk/atk.h>
#include <libspi/Accessibility.h>
-#define SPI_COMPONENT_TYPE (accessibility_component_get_type ())
+#define SPI_COMPONENT_TYPE (spi_component_get_type ())
#define SPI_COMPONENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_COMPONENT_TYPE, SpiComponent))
#define SPI_COMPONENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SPI_COMPONENT_TYPE, SpiComponentClass))
#define IS_SPI_COMPONENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_COMPONENT_TYPE))
typedef struct {
BonoboObject parent;
- AtkObject *atko;
+ AtkObject *atko;
} SpiComponent;
typedef struct {
POA_Accessibility_Component__epv epv;
} SpiComponentClass;
-GType accessibility_component_get_type (void);
-SpiComponent *spi_component_interface_new (AtkObject *o);
+GType spi_component_get_type (void);
+SpiComponent *spi_component_interface_new (AtkObject *o);
#ifdef __cplusplus
}
epv->getChildAtIndex = impl_desktop_get_child_at_index;
}
-GType
-spi_desktop_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiDesktopClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_desktop_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiDesktop),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_desktop_init,
- NULL /* value table */
- };
- /*
- * Here we use bonobo_type_unique instead of
- * gtk_type_unique, this auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_Desktop__init,
- NULL,
- G_STRUCT_OFFSET (SpiDesktopClass, epv),
- &tinfo,
- "SpiDesktop");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiDesktop,
+ Accessibility_Desktop,
+ PARENT_TYPE,
+ spi_desktop);
SpiDesktop *
spi_desktop_new (void)
{
- SpiDesktop *retval =
- SPI_DESKTOP (g_object_new (spi_desktop_get_type (), NULL));
+ SpiDesktop *retval = SPI_DESKTOP (g_object_new (SPI_DESKTOP_TYPE, NULL));
+
return retval;
}
*/
static gint
-_compare_listeners (gconstpointer p1, gconstpointer p2)
-{
- DEControllerListener *l1 = (DEControllerListener *) p1;
- DEControllerListener *l2 = (DEControllerListener *) p2;
- return _compare_corba_objects (l1->object, l2->object);
-}
-
-static gint
_compare_corba_objects (gconstpointer p1, gconstpointer p2)
{
CORBA_Environment ev;
}
static gint
+_compare_listeners (gconstpointer p1, gconstpointer p2)
+{
+ DEControllerListener *l1 = (DEControllerListener *) p1;
+ DEControllerListener *l2 = (DEControllerListener *) p2;
+ return _compare_corba_objects (l1->object, l2->object);
+}
+
+static gint
_eventmask_compare_value (gconstpointer p1, gconstpointer p2)
{
long d;
return retval;
}
-GType
-spi_device_event_controller_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiDeviceEventControllerClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_device_event_controller_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiDeviceEventController),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_device_event_controller_init,
- NULL /* value table */
- };
- /*
- * Here we use bonobo_type_unique instead of
- * gtk_type_unique, this auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_DeviceEventController__init,
- NULL,
- G_STRUCT_OFFSET (SpiDeviceEventControllerClass, epv),
- &tinfo,
- "SpiDeviceEventController");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiDeviceEventController,
+ Accessibility_DeviceEventController,
+ PARENT_TYPE,
+ spi_device_event_controller);
static GObjectClass *parent_class;
-GType
-spi_editable_text_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiEditableTextClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_editable_text_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiEditableText),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_editable_text_init,
- NULL /* value table */
- };
-
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- SPI_TEXT_TYPE,
- POA_Accessibility_EditableText__init,
- NULL,
- G_STRUCT_OFFSET (SpiEditableTextClass, epv),
- &tinfo,
- "SpiAccessibleEditableText");
- }
-
- return type;
-}
+
+BONOBO_TYPE_FUNC_FULL (SpiEditableText,
+ Accessibility_EditableText,
+ SPI_TEXT_TYPE,
+ spi_editable_text);
static void
spi_editable_text_class_init (SpiEditableTextClass *klass)
SpiEditableText *editable;
BonoboObject *obj;
obj = (bonobo_object_from_servant (_servant));
- g_return_if_fail (IS_SPI_EDITABLE_TEXT (obj));
+ g_return_val_if_fail (IS_SPI_EDITABLE_TEXT (obj), FALSE);
editable = SPI_EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- g_return_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko));
+ g_return_val_if_fail (ATK_IS_EDITABLE_TEXT ( (SPI_TEXT (obj))->atko), FALSE);
g_print ("setRunAttributes not implemented.\n");
-}
-
+ return FALSE;
+}
static void
impl_setTextContents (PortableServer_Servant _servant,
* This pulls the definition of the hyperlink bonobo object
*/
#include "hyperlink.h"
+#include "accessible.h"
/*
* Static function declarations
static GObjectClass *parent_class;
-GType
-spi_hyperlink_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiHyperlinkClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_hyperlink_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiHyperlink),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_hyperlink_init,
- NULL /* value table */
- };
-
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- BONOBO_OBJECT_TYPE,
- POA_Accessibility_Hyperlink__init,
- NULL,
- G_STRUCT_OFFSET (SpiHyperlinkClass, epv),
- &tinfo,
- "SpiAccessibleHyperlink");
- }
-
- return type;
-}
+
+BONOBO_TYPE_FUNC_FULL (SpiHyperlink,
+ Accessibility_Hyperlink,
+ BONOBO_OBJECT_TYPE,
+ spi_hyperlink);
static void
spi_hyperlink_class_init (SpiHyperlinkClass *klass)
epv->getChildAtIndex = impl_desktop_get_child_at_index;
}
-GType
-spi_desktop_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiDesktopClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_desktop_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiDesktop),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_desktop_init,
- NULL /* value table */
- };
- /*
- * Here we use bonobo_type_unique instead of
- * gtk_type_unique, this auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_Desktop__init,
- NULL,
- G_STRUCT_OFFSET (SpiDesktopClass, epv),
- &tinfo,
- "SpiDesktop");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiDesktop,
+ Accessibility_Desktop,
+ PARENT_TYPE,
+ spi_desktop);
SpiDesktop *
spi_desktop_new (void)
{
- SpiDesktop *retval =
- SPI_DESKTOP (g_object_new (spi_desktop_get_type (), NULL));
+ SpiDesktop *retval = SPI_DESKTOP (g_object_new (SPI_DESKTOP_TYPE, NULL));
+
return retval;
}
*/
static gint
-_compare_listeners (gconstpointer p1, gconstpointer p2)
-{
- DEControllerListener *l1 = (DEControllerListener *) p1;
- DEControllerListener *l2 = (DEControllerListener *) p2;
- return _compare_corba_objects (l1->object, l2->object);
-}
-
-static gint
_compare_corba_objects (gconstpointer p1, gconstpointer p2)
{
CORBA_Environment ev;
}
static gint
+_compare_listeners (gconstpointer p1, gconstpointer p2)
+{
+ DEControllerListener *l1 = (DEControllerListener *) p1;
+ DEControllerListener *l2 = (DEControllerListener *) p2;
+ return _compare_corba_objects (l1->object, l2->object);
+}
+
+static gint
_eventmask_compare_value (gconstpointer p1, gconstpointer p2)
{
long d;
return retval;
}
-GType
-spi_device_event_controller_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiDeviceEventControllerClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_device_event_controller_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiDeviceEventController),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_device_event_controller_init,
- NULL /* value table */
- };
- /*
- * Here we use bonobo_type_unique instead of
- * gtk_type_unique, this auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- PARENT_TYPE,
- POA_Accessibility_DeviceEventController__init,
- NULL,
- G_STRUCT_OFFSET (SpiDeviceEventControllerClass, epv),
- &tinfo,
- "SpiDeviceEventController");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiDeviceEventController,
+ Accessibility_DeviceEventController,
+ PARENT_TYPE,
+ spi_device_event_controller);
projects / platform / core / uifw / at-spi2-atk.git / commitdiff