+<2001-09-05 Marc Mulcahy <marc.mulcahy@sun.com>
+ implementations-- made server implementations own AtkObject pointers
+ rather than their respective AtkInterrface pointers to fix
+ refcounting. AtkHyperlink is still broken.
+
2001-09-04 Bill Haneman <bill.haneman@sun.com>
* at-bridge/bridge.c:
/* void getRowColAtOffset (in long offset, out long row, out long column); */
string getAttributes (in long offset,
out long startOffset, out long endOffset);
- boolean getCharacterExtents (in long offset, out long x, out long y, out long length, out long width, in short coordType);
+ void getCharacterExtents (in long offset, out long x, out long y, out long length, out long width, in short coordType);
long getOffsetAtPoint (in long x, in long y, in short coordType);
long getNSelections ();
void getSelection (in long selectionNum, out long startOffset, out long endOffset);
/* void getRowColAtOffset (in long offset, out long row, out long column); */
string getAttributes (in long offset,
out long startOffset, out long endOffset);
- boolean getCharacterExtents (in long offset, out long x, out long y, out long length, out long width, in short coordType);
+ void getCharacterExtents (in long offset, out long x, out long y, out long length, out long width, in short coordType);
long getOffsetAtPoint (in long x, in long y, in short coordType);
long getNSelections ();
void getSelection (in long selectionNum, out long startOffset, out long endOffset);
* This pulls the definition for the BonoboObject (Gtk Type)
*/
#include "accessible.h"
+#include "component.h"
+#include "editabletext.h"
+#include "hyperlink.h"
+#include "hypertext.h"
+#include "image.h"
+#include "selection.h"
+#include "table.h"
+#include "text.h"
+#include "value.h"
/*
* Our parent Gtk object type
{
CORBA_char * retval;
Accessible *accessible = ACCESSIBLE (bonobo_object_from_servant (servant));
- retval = atk_object_get_name (accessible->atko);
+ retval = (CORBA_char *) atk_object_get_name (accessible->atko);
if (retval )
retval = CORBA_string_dup (retval);
else
if (ATK_IS_ACTION (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (action_new (ATK_ACTION(o))));
+ BONOBO_OBJECT (action_interface_new (o)));
}
if (ATK_IS_COMPONENT (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (component_interface_new (o)));
+ BONOBO_OBJECT (component_interface_new (o)));
}
if (ATK_IS_EDITABLE_TEXT (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (editable_text_new (ATK_EDITABLE_TEXT(o))));
+ BONOBO_OBJECT(editable_text_interface_new (o)));
}
else if (ATK_IS_HYPERTEXT (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (hypertext_new (o)));
+ BONOBO_OBJECT (hypertext_interface_new (o)));
}
else if (ATK_IS_TEXT (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (text_new (o)));
+ BONOBO_OBJECT (text_interface_new (o)));
}
if (ATK_IS_HYPERLINK (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (hyperlink_new(ATK_HYPERLINK(o))));
+ BONOBO_OBJECT (hyperlink_interface_new(o)));
}
if (ATK_IS_IMAGE (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (image_new (o)));
+ BONOBO_OBJECT (image_interface_new (o)));
}
if (ATK_IS_SELECTION (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (selection_new (o)));
+ BONOBO_OBJECT (selection_interface_new (o)));
}
if (ATK_IS_TABLE (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (table_new (o)));
+ BONOBO_OBJECT (table_interface_new (o)));
}
- /* if (ATK_IS_VALUE (o))
+ if (ATK_IS_VALUE (o))
{
bonobo_object_add_interface (bonobo_object (retval),
- bonobo_object (value_interface_new (o)));
+ BONOBO_OBJECT (value_interface_new (o)));
}
- */
return retval;
}
GType accessible_get_type (void);
Accessible *accessible_new (AtkObject *o);
-#include "component.h"
#ifdef __cplusplus
}
action_finalize (GObject *obj)
{
Action *action = ACTION (obj);
- action->atk_action = NULL;
+ g_object_unref (action->atko);
+ action->atko = NULL;
parent_class->finalize (obj);
}
Action *
-action_new (AtkAction *action)
+action_interface_new (AtkObject *obj)
{
Action *new_action =
ACTION(g_object_new (ACTION_TYPE, NULL));
- new_action->atk_action = action;
+ new_action->atko = obj;
+ g_object_ref (obj);
return new_action;
}
CORBA_Environment * ev)
{
Action *action = ACTION (bonobo_object_from_servant(servant));
- return (CORBA_long) atk_action_get_n_actions (action->atk_action);
+ return (CORBA_long) atk_action_get_n_actions (ATK_ACTION(action->atko));
}
static CORBA_boolean
const CORBA_long index, CORBA_Environment * ev)
{
Action *action = ACTION (bonobo_object_from_servant (servant));
- return (CORBA_boolean) atk_action_do_action (action->atk_action, (gint) index);
+ return (CORBA_boolean) atk_action_do_action (ATK_ACTION(action->atko), (gint) index);
}
CORBA_Environment * ev)
{
Action *action = ACTION (bonobo_object_from_servant(servant));
- return CORBA_string_dup (atk_action_get_description (action->atk_action, (gint) index));
+ return CORBA_string_dup (atk_action_get_description (ATK_ACTION(action->atko), (gint) index));
}
CORBA_Environment * ev)
{
Action *action = ACTION (bonobo_object_from_servant(servant));
- return CORBA_string_dup (atk_action_get_name (action->atk_action, (gint) index));
+ return CORBA_string_dup (atk_action_get_name (ATK_ACTION(action->atko), (gint) index));
}
static CORBA_string
CORBA_Environment * ev)
{
Action *action = ACTION (bonobo_object_from_servant(servant));
- return CORBA_string_dup (atk_action_get_keybinding (action->atk_action, (gint) index));
+ return CORBA_string_dup (atk_action_get_keybinding (ATK_ACTION(action->atko), (gint) index));
}
struct _Action {
BonoboObject parent;
- AtkAction *atk_action;
+ AtkObject *atko;
};
struct _ActionClass {
action_get_type (void);
Action *
-action_new (AtkAction *action);
+action_interface_new (AtkObject *obj);
#ifdef __cplusplus
}
Component *component = COMPONENT (object);
printf("accessible_component_object_finalize called\n");
- component->atko = NULL;
+ g_object_unref (component->atko);
+ component->atko = NULL;
printf("atko freed, calling parent finalize\n");
component_parent_class->finalize (object);
{
Component *retval =
COMPONENT (g_object_new (accessibility_component_get_type (), NULL));
- /* don't increment AtkObject refcount, ref is held by containing Accessible instance */
- retval->atko = ATK_OBJECT (o);
- return retval;
+ retval->atko = o;
+ g_object_ref (o);
+return retval;
}
editable_text_finalize (GObject *obj)
{
EditableText *editable = EDITABLE_TEXT(obj);
- editable->atk_editable_text = NULL;
+ g_object_unref (editable->atko);
+ editable->atko = NULL;
parent_class->finalize (obj);
}
EditableText *
-editable_text_new (AtkEditableText *editable)
+editable_text_interface_new (AtkObject *obj)
{
EditableText *new_editable =
EDITABLE_TEXT(g_object_new (EDITABLE_TEXT_TYPE, NULL));
- new_editable->atk_editable_text = editable;
- return new_editable;
+ new_editable->atko = obj;
+ g_object_ref (obj);
+return new_editable;
}
CORBA_Environment * ev)
{
EditableText *editable = EDITABLE_TEXT(bonobo_object_from_servant (_servant));
- atk_editable_text_set_text_contents (editable->atk_editable_text,
+ atk_editable_text_set_text_contents (ATK_EDITABLE_TEXT(editable->atko),
(gchar *) newContents);
}
CORBA_Environment * ev)
{
EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
- atk_editable_text_insert_text (editable->atk_editable_text,
+ atk_editable_text_insert_text (ATK_EDITABLE_TEXT(editable->atko),
(gchar *) text,
(gint) length,
(gint *) &position);
CORBA_Environment * ev)
{
EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
- atk_editable_text_copy_text (editable->atk_editable_text,
+ atk_editable_text_copy_text (ATK_EDITABLE_TEXT(editable->atko),
(gint) startPos, (gint) endPos);
}
CORBA_Environment * ev)
{
EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
- atk_editable_text_cut_text (editable->atk_editable_text,
+ atk_editable_text_cut_text (ATK_EDITABLE_TEXT(editable->atko),
(gint) startPos, (gint) endPos);
}
CORBA_Environment * ev)
{
EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
- atk_editable_text_delete_text (editable->atk_editable_text,
+ atk_editable_text_delete_text (ATK_EDITABLE_TEXT(editable->atko),
(gint) startPos, (gint) endPos);
}
const CORBA_long position, CORBA_Environment * ev)
{
EditableText *editable = EDITABLE_TEXT (bonobo_object_from_servant(_servant));
- atk_editable_text_paste_text (editable->atk_editable_text, position);
+ atk_editable_text_paste_text (ATK_EDITABLE_TEXT(editable->atko), position);
}
struct _EditableText {
BonoboObject parent;
- AtkEditableText *atk_editable_text;
+ AtkObject *atko;
};
struct _EditableTextClass {
editable_text_get_type (void);
EditableText *
-editable_text_new (AtkEditableText *editable);
+editable_text_interface_new ( AtkObject *obj);
#ifdef __cplusplus
}
hyperlink_finalize (GObject *obj)
{
Hyperlink *hyperlink = HYPERLINK(obj);
- hyperlink->atk_hyperlink = NULL;
+ g_object_unref (hyperlink->atko);
+ hyperlink->atko = NULL;
parent_class->finalize (obj);
}
Hyperlink *
-hyperlink_new (AtkHyperlink *hyperlink)
+hyperlink_interface_new (AtkObject *obj)
{
Hyperlink *new_hyperlink =
HYPERLINK(g_object_new (HYPERLINK_TYPE, NULL));
- new_hyperlink->atk_hyperlink = hyperlink;
+ new_hyperlink->atko = obj;
+ g_object_ref (obj);
return new_hyperlink;
}
CORBA_Environment * ev)
{
Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_short) atk_hyperlink_get_n_anchors (link->atk_hyperlink);
+ return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->atko));
}
CORBA_Environment * ev)
{
Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_long) atk_hyperlink_get_start_index (link->atk_hyperlink);
+ return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->atko));
}
CORBA_Environment * ev)
{
Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_long) atk_hyperlink_get_end_index (link->atk_hyperlink);
+ return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->atko));
}
Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
gchar *uri;
CORBA_char *rv;
- uri = atk_hyperlink_get_uri (link->atk_hyperlink, (gint) i);
+ uri = atk_hyperlink_get_uri (ATK_HYPERLINK(link->atko), (gint) i);
rv = CORBA_string_dup (uri);
g_free (uri);
return rv;
Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
AtkObject *atk_object;
Accessibility_Accessible rv;
- atk_object = atk_hyperlink_get_object (link->atk_hyperlink, (gint) i);
+ atk_object = atk_hyperlink_get_object (ATK_HYPERLINK(link->atko), (gint) i);
rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(atk_object)));
return rv;
}
CORBA_Environment * ev)
{
Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_boolean) atk_hyperlink_is_valid (link->atk_hyperlink);
+ return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->atko));
}
struct _Hyperlink {
BonoboObject parent;
- AtkHyperlink *atk_hyperlink;
+ AtkObject *atko;
};
struct _HyperlinkClass {
hyperlink_get_type (void);
Hyperlink *
-hyperlink_new (AtkHyperlink *hyperlink);
+hyperlink_interface_new (AtkObject *obj);
#ifdef __cplusplus
}
hypertext_finalize (GObject *obj)
{
Hypertext *hypertext = HYPERTEXT(obj);
- hypertext->atk_hypertext = NULL;
+ g_object_unref (hypertext->atko);
+ hypertext->atko = NULL;
parent_class->finalize (obj);
}
Hypertext *
-hypertext_new (AtkHypertext *hypertext)
+hypertext_interface_new (AtkObject *obj)
{
Hypertext *new_hypertext =
HYPERTEXT(g_object_new (HYPERTEXT_TYPE, NULL));
- new_hypertext->atk_hypertext = hypertext;
+ new_hypertext->atko = obj;
+ g_object_ref (obj);
return new_hypertext;
}
{
Hypertext *hypertext = HYPERTEXT(bonobo_object_from_servant(_servant));
return (CORBA_long)
- atk_hypertext_get_n_links (hypertext->atk_hypertext);
+ atk_hypertext_get_n_links (ATK_HYPERTEXT(hypertext->atko));
}
Hypertext *hypertext = HYPERTEXT(bonobo_object_from_servant(_servant));
Accessibility_Hyperlink rv;
- link = atk_hypertext_get_link (hypertext->atk_hypertext,
+ link = atk_hypertext_get_link (ATK_HYPERTEXT(hypertext->atko),
(gint) linkIndex);
- rv = bonobo_object_corba_objref (BONOBO_OBJECT(hyperlink_new(link)));
+ rv = bonobo_object_corba_objref (BONOBO_OBJECT(hyperlink_interface_new(ATK_OBJECT(link))));
return rv;
}
{
Hypertext *hypertext = HYPERTEXT(bonobo_object_from_servant(_servant));
return (CORBA_long)
- atk_hypertext_get_link_index (hypertext->atk_hypertext,
+ atk_hypertext_get_link_index (ATK_HYPERTEXT(hypertext->atko),
(gint) characterIndex);
}
struct _Hypertext {
BonoboObject parent;
- AtkHypertext *atk_hypertext;
+ AtkObject *atko;
};
struct _HypertextClass {
hypertext_get_type (void);
Hypertext *
-hypertext_new (AtkHypertext *hypertext);
+hypertext_interface_new (AtkObject *obj);
#ifdef __cplusplus
}
image_finalize (GObject *obj)
{
Image *image = IMAGE (obj);
- image->atk_image = NULL;
+ g_object_unref (image->atko);
+ image->atko = NULL;
parent_class->finalize (obj);
}
Image *
-image_new (AtkImage *image)
+image_interface_new (AtkObject *obj)
{
Image *new_image =
IMAGE(g_object_new (IMAGE_TYPE, NULL));
- new_image->atk_image = image;
+ new_image->atko = obj;
+ g_object_ref (obj);
return new_image;
}
CORBA_Environment * ev)
{
Image *image = IMAGE (bonobo_object_from_servant(_servant));
- atk_image_get_image_position (image->atk_image,
+ atk_image_get_image_position (ATK_IMAGE(image->atko),
(gint *) x, (gint *) y,
(AtkCoordType) coordType);
}
CORBA_Environment * ev)
{
Image *image = IMAGE (bonobo_object_from_servant(_servant));
- atk_image_get_image_size (image->atk_image,
+ atk_image_get_image_size (ATK_IMAGE(image->atko),
(gint *) width, (gint *) height);
}
{
Image *image = IMAGE (bonobo_object_from_servant(_servant));
return CORBA_string_dup (
- atk_image_get_image_description (image->atk_image));
+ atk_image_get_image_description (ATK_IMAGE(image->atko)));
}
struct _Image {
BonoboObject parent;
- AtkImage *atk_image;
+ AtkObject *atko;
};
struct _ImageClass {
image_get_type (void);
Image *
-image_new (AtkImage *image);
+image_interface_new (AtkObject *obj);
#ifdef __cplusplus
}
selection_finalize (GObject *obj)
{
Selection *selection = SELECTION (obj);
- selection->atk_selection = NULL;
+ g_object_unref (selection->atko);
+ selection->atko = NULL;
parent_class->finalize (obj);
}
Selection *
-selection_new (AtkSelection *selection)
+selection_interface_new (AtkObject *obj)
{
Selection *new_selection =
SELECTION(g_object_new (SELECTION_TYPE, NULL));
- new_selection->atk_selection = selection;
+ new_selection->atko = obj;
+ g_object_ref (obj);
return new_selection;
}
{
Selection *selection = SELECTION (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_selection_get_selection_count (selection->atk_selection);
+ atk_selection_get_selection_count (ATK_SELECTION(selection->atko));
}
AtkObject *atk_object;
Accessibility_Accessible rv;
- atk_object = atk_selection_ref_selection (selection->atk_selection, (gint) selectedChildIndex);
+ atk_object = atk_selection_ref_selection (ATK_SELECTION(selection->atko), (gint) selectedChildIndex);
rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(atk_object)));
return rv;
}
{
Selection *selection = SELECTION (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_selection_add_selection (selection->atk_selection, (gint) childIndex);
+ atk_selection_add_selection (ATK_SELECTION(selection->atko), (gint) childIndex);
}
{
Selection *selection = SELECTION (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_selection_remove_selection (selection->atk_selection, (gint) selectedChildIndex);
+ atk_selection_remove_selection (ATK_SELECTION(selection->atko), (gint) selectedChildIndex);
}
{
Selection *selection = SELECTION (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_selection_is_child_selected (selection->atk_selection, (gint) childIndex);
+ atk_selection_is_child_selected (ATK_SELECTION(selection->atko), (gint) childIndex);
}
CORBA_Environment * ev)
{
Selection *selection = SELECTION (bonobo_object_from_servant (_servant));
- atk_selection_select_all_selection (selection->atk_selection);
+ atk_selection_select_all_selection (ATK_SELECTION(selection->atko));
}
CORBA_Environment * ev)
{
Selection *selection = SELECTION (bonobo_object_from_servant (_servant));
- atk_selection_clear_selection (selection->atk_selection);
+ atk_selection_clear_selection (ATK_SELECTION(selection->atko));
}
struct _Selection {
BonoboObject parent;
- AtkSelection *atk_selection;
+ AtkObject *atko;
};
struct _SelectionClass {
selection_get_type (void);
Selection *
-selection_new (AtkSelection *selection);
+selection_interface_new (AtkObject *obj);
#ifdef __cplusplus
}
table_finalize (GObject *obj)
{
Table *table = TABLE (obj);
- table->atk_table = NULL;
+ g_object_unref (table->atko);
+ table->atko = NULL;
parent_class->finalize (obj);
}
Table *
-table_new (AtkTable *table)
+table_interface_new (AtkObject *obj)
{
Table *new_table =
TABLE(g_object_new (TABLE_TYPE, NULL));
- new_table->atk_table = table;
+ new_table->atko = obj;
+ g_object_ref (obj);
return new_table;
}
Accessibility_Accessible rv;
atk_object = g_object_new (ATK_TYPE_OBJECT, NULL);
- atk_object_set_name (atk_object, atk_table_get_caption (table->atk_table));
+ atk_object_set_name (atk_object, atk_table_get_caption (ATK_TABLE(table-> atko)));
rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(atk_object)));
return rv;
}
AtkObject *atk_object;
Accessibility_Accessible rv;
- atk_object = atk_table_get_summary (table->atk_table);
+ atk_object = atk_table_get_summary (ATK_TABLE(table->atko));
rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(atk_object)));
return rv;
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_table_get_n_rows (table->atk_table);
+ atk_table_get_n_rows (ATK_TABLE(table->atko) );
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_table_get_n_columns (table->atk_table);
+ atk_table_get_n_columns (ATK_TABLE(table->atko));
}
AtkObject *atk_object;
Accessibility_Accessible rv;
- atk_object = atk_table_ref_at (table->atk_table,
+ atk_object = atk_table_ref_at (ATK_TABLE(table->atko),
(gint) row, (gint) column);
rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(atk_object)));
return rv;
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_table_get_index_at (table->atk_table,
+ atk_table_get_index_at (ATK_TABLE(table->atko),
(gint) row, (gint) column);
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_table_get_row_at_index (table->atk_table, (gint) index);
+ atk_table_get_row_at_index (ATK_TABLE(table->atko), (gint) index);
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_table_get_column_at_index (table->atk_table, (gint) index);
+ atk_table_get_column_at_index (ATK_TABLE(table->atko), (gint) index);
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return CORBA_string_dup (
- atk_table_get_row_description (table->atk_table, (gint) row));
+ atk_table_get_row_description (ATK_TABLE(table->atko), (gint) row));
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return CORBA_string_dup (
- atk_table_get_column_description (table->atk_table, (gint) column));
+ atk_table_get_column_description (ATK_TABLE(table->atko), (gint) column));
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_table_get_row_extent_at (table->atk_table,
+ atk_table_get_row_extent_at (ATK_TABLE(table->atko),
(gint) row, (gint) column);
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_table_get_column_extent_at (table->atk_table,
+ atk_table_get_column_extent_at (ATK_TABLE(table->atko),
(gint) row, (gint) column);
}
AtkObject *header;
Accessibility_Table rv;
- header = atk_table_get_row_header (table->atk_table, (gint) row);
+ header = atk_table_get_row_header (ATK_TABLE(table->atko), (gint) row);
rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(header)));
return rv;
}
AtkObject *header;
Accessibility_Table rv;
- header = atk_table_get_column_header (table->atk_table, (gint) column);
+ header = atk_table_get_column_header (ATK_TABLE(table->atko), (gint) column);
rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(header)));
return rv;
}
gint length;
Accessibility_LongSeq *retval;
- length = atk_table_get_selected_rows (table->atk_table, &selectedRows);
+ length = atk_table_get_selected_rows (ATK_TABLE(table->atko), &selectedRows);
g_return_val_if_fail (length, NULL);
retval = Accessibility_LongSeq__alloc ();
gint length;
Accessibility_LongSeq *retval;
- length = atk_table_get_selected_columns (table->atk_table, &selectedColumns);
+ length = atk_table_get_selected_columns (ATK_TABLE(table->atko), &selectedColumns);
g_return_val_if_fail (length, NULL);
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_table_is_row_selected (table->atk_table, (gint) row);
+ atk_table_is_row_selected (ATK_TABLE(table->atko), (gint) row);
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_table_is_column_selected (table->atk_table, (gint) column);
+ atk_table_is_column_selected (ATK_TABLE(table->atko), (gint) column);
}
{
Table *table = TABLE (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_table_is_selected (table->atk_table,
+ atk_table_is_selected (ATK_TABLE(table->atko),
(gint) row, (gint) column);
}
struct _Table {
BonoboObject parent;
- AtkTable *atk_table;
+ AtkObject *atko;
};
struct _TableClass {
table_get_type (void);
Table *
-table_new (AtkTable *table);
+table_interface_new (AtkObject *obj);
#ifdef __cplusplus
}
const CORBA_long startOffset,
const CORBA_long endOffset,
CORBA_Environment * ev);
-static void
+static CORBA_boolean
impl_setCaretOffset (PortableServer_Servant _servant,
const CORBA_long value,
CORBA_Environment * ev);
text_finalize (GObject *obj)
{
Text *text = TEXT (obj);
- text->atk_text = NULL;
+ g_object_unref (text->atko);
+ text->atko = NULL;
parent_class->finalize (obj);
}
Text *
-text_new (AtkText *text)
+text_interface_new (AtkObject *obj)
{
Text *new_text =
TEXT(g_object_new (TEXT_TYPE, NULL));
- new_text->atk_text = text;
+ new_text->atko = obj;
+ g_object_ref (obj);
return new_text;
}
gchar *txt;
CORBA_char *rv;
- txt = atk_text_get_text (text->atk_text,
+ txt = atk_text_get_text (ATK_TEXT(text->atko),
(gint) startOffset, (gint) endOffset);
rv = CORBA_string_dup (txt);
g_free (txt);
gchar *txt;
CORBA_char *rv;
- txt = atk_text_get_text_after_offset (text->atk_text,
+ txt = atk_text_get_text_after_offset (ATK_TEXT(text->atko),
(gint) offset, (AtkTextBoundary) type,
(gint *) startOffset, (gint *) endOffset);
rv = CORBA_string_dup (txt);
gchar *txt;
CORBA_char *rv;
- txt = atk_text_get_text_at_offset (text->atk_text,
+ txt = atk_text_get_text_at_offset (ATK_TEXT(text->atko),
(gint) offset, (AtkTextBoundary) type,
(gint *) startOffset, (gint *) endOffset);
rv = CORBA_string_dup (txt);
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_wchar)
- atk_text_get_character_at_offset (text->atk_text, (gint) offset);
+ atk_text_get_character_at_offset (ATK_TEXT(text->atko), (gint) offset);
}
gchar *txt;
CORBA_char *rv;
- txt = atk_text_get_text_before_offset (text->atk_text,
+ txt = atk_text_get_text_before_offset (ATK_TEXT(text->atko),
(gint) offset, (AtkTextBoundary) type,
(gint *) startOffset, (gint *) endOffset);
rv = CORBA_string_dup (txt);
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_text_get_caret_offset (text->atk_text);
+ atk_text_get_caret_offset (ATK_TEXT(text->atko));
}
CORBA_Environment * ev)
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
- atk_text_get_character_extents (text->atk_text, (gint) offset,
+ atk_text_get_character_extents (ATK_TEXT(text->atko), (gint) offset,
(gint *) x, (gint *) y, (gint *) width, (gint *) height,
(AtkCoordType) coordType);
}
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_text_get_character_count (text->atk_text);
+ atk_text_get_character_count (ATK_TEXT(text->atko));
}
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_text_get_offset_at_point (text->atk_text,
+ atk_text_get_offset_at_point (ATK_TEXT(text->atko),
(gint) x, (gint) y, (AtkCoordType) coordType);
}
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_long)
- atk_text_get_n_selections (text->atk_text);
+ atk_text_get_n_selections (ATK_TEXT(text->atko));
}
CORBA_Environment * ev)
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
- atk_text_get_selection (text->atk_text, (gint) selectionNum,
+ atk_text_get_selection (ATK_TEXT(text->atko), (gint) selectionNum,
(gint *) startOffset, (gint *) endOffset);
}
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_text_add_selection (text->atk_text,
+ atk_text_add_selection (ATK_TEXT(text->atko),
(gint) startOffset, (gint) endOffset);
}
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_text_remove_selection (text->atk_text, (gint) selectionNum);
+ atk_text_remove_selection (ATK_TEXT(text->atko), (gint) selectionNum);
}
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_text_set_selection (text->atk_text,
+ atk_text_set_selection (ATK_TEXT(text->atko),
(gint) selectionNum, (gint) startOffset, (gint) endOffset);
}
-static void
+static CORBA_boolean
impl_setCaretOffset (PortableServer_Servant _servant,
const CORBA_long value,
CORBA_Environment * ev)
{
Text *text = TEXT (bonobo_object_from_servant (_servant));
return (CORBA_boolean)
- atk_text_set_caret_offset (text->atk_text, (gint) value);
+ atk_text_set_caret_offset (ATK_TEXT(text->atko), (gint) value);
}
struct _Text {
BonoboObject parent;
- AtkText *atk_text;
+ AtkObject *atko;
};
struct _TextClass {
text_get_type (void);
Text *
-text_new (AtkText *text);
+text_interface_new (AtkObject *obj);
#ifdef __cplusplus
}
value_finalize (GObject *obj)
{
Value *value = VALUE (obj);
- value->atk_value = NULL;
+ g_object_unref (value->atko);
+ value->atko = NULL;
parent_class->finalize (obj);
}
Value *
-value_new (AtkValue *value)
+value_interface_new (AtkObject *obj)
{
Value *new_value =
VALUE(g_object_new (VALUE_TYPE, NULL));
- new_value->atk_value = value;
+ new_value->atko = obj;
+ g_object_ref (obj);
return new_value;
}
GValue gvalue = {0, };
g_value_init (&gvalue, G_TYPE_FLOAT);
- atk_value_get_minimum_value (value->atk_value, &gvalue);
+ atk_value_get_minimum_value (ATK_VALUE(value->atko), &gvalue);
return (CORBA_float) g_value_get_float (&gvalue);
}
GValue gvalue = {0, };
g_value_init (&gvalue, G_TYPE_FLOAT);
- atk_value_get_maximum_value (value->atk_value, &gvalue);
+ atk_value_get_maximum_value (ATK_VALUE(value->atko), &gvalue);
return (CORBA_float) g_value_get_float (&gvalue);
}
GValue gvalue = {0, };
g_value_init (&gvalue, G_TYPE_FLOAT);
- atk_value_get_current_value (value->atk_value, &gvalue);
+ atk_value_get_current_value (ATK_VALUE(value->atko), &gvalue);
return (CORBA_float) g_value_get_float (&gvalue);
}
g_value_init (&gvalue, G_TYPE_FLOAT);
g_value_set_float (&gvalue, (gfloat) value);
- atk_value_set_current_value (val->atk_value, &gvalue);
+ atk_value_set_current_value (ATK_VALUE(val->atko), &gvalue);
}
struct _Value {
BonoboObject parent;
- AtkValue *atk_value;
+ AtkObject *atko;
};
struct _ValueClass {
value_get_type (void);
Value *
-value_new (AtkValue *value);
+value_interface_new (AtkObject *obj);
#ifdef __cplusplus
}
+2001-09-05 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.38.
+
2001-09-04 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.