diff options
Diffstat (limited to 'a11y/e-table')
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell-popup.c | 14 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell-registry.c | 8 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell-text.c | 28 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell-toggle.c | 10 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell-tree.c | 8 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell-vbox.c | 12 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell-vbox.h | 6 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell.c | 46 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-cell.h | 6 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table-click-to-add-factory.c | 6 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table-click-to-add.c | 18 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table-column-header.c | 6 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table-factory.c | 8 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table-item-factory.c | 8 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table-item.c | 62 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-table.c | 14 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-tree-factory.c | 6 | ||||
-rw-r--r-- | a11y/e-table/gal-a11y-e-tree.c | 6 |
18 files changed, 136 insertions, 136 deletions
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c index 64e11bcf98..c0110e9dba 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.c +++ b/a11y/e-table/gal-a11y-e-cell-popup.c @@ -43,11 +43,11 @@ static void popup_cell_action (GalA11yECell *cell); /** * gal_a11y_e_cell_popup_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yECellPopup class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yECellPopup class. **/ GType @@ -99,7 +99,7 @@ gal_a11y_e_cell_popup_new (ETableItem *item, if (popupcell && popupcell->popup_cell_view) child_view = popupcell->popup_cell_view->child_view; - + if (child_view && child_view->ecell) { a11y = gal_a11y_e_cell_registry_get_object (NULL, item, @@ -120,7 +120,7 @@ gal_a11y_e_cell_popup_new (ETableItem *item, } g_return_val_if_fail (a11y != NULL, NULL); cell = GAL_A11Y_E_CELL(a11y); - gal_a11y_e_cell_add_action (cell, + gal_a11y_e_cell_add_action (cell, _("popup"), /* action name*/ _("popup a child"), /* action description */ "<Alt>Down", /* action keybinding */ @@ -136,12 +136,12 @@ popup_cell_action (GalA11yECell *cell) gint finished; GdkEvent event; - event.key.type = GDK_KEY_PRESS; + event.key.type = GDK_KEY_PRESS; event.key.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(cell->item)->canvas)->bin_window;; event.key.send_event = TRUE; event.key.time = GDK_CURRENT_TIME; event.key.state = GDK_MOD1_MASK; event.key.keyval = GDK_Down; - + g_signal_emit_by_name (cell->item, "event", &event, &finished); } diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c index 9557ec5464..72ff48e33f 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.c +++ b/a11y/e-table/gal-a11y-e-cell-registry.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey <clahey@ximian.com> * * Copyright (C) 2002 Ximian, Inc. @@ -51,11 +51,11 @@ gal_a11y_e_cell_registry_init (GalA11yECellRegistry *registry) /** * gal_a11y_e_cell_registry_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yECellRegistry class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yECellRegistry class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c index baee1c3cbc..696127ae3b 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.c +++ b/a11y/e-table/gal-a11y-e-cell-text.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey <clahey@ximian.com> * * Copyright (C) 2002 Ximian, Inc. @@ -193,7 +193,7 @@ ect_get_caret_offset (AtkText *text) gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); end = g_utf8_pointer_to_offset (full_text, full_text + end); g_free (full_text); - + return end; } else @@ -261,7 +261,7 @@ ect_get_offset_at_point (AtkText *text, } -static gint +static gint ect_get_n_selections (AtkText *text) { GalA11yECell *gaec = GAL_A11Y_E_CELL (text); @@ -344,7 +344,7 @@ ect_add_selection (AtkText *text, real_start = MIN (start_offset, end_offset); real_end = MAX (start_offset, end_offset); - + real_start = MIN (MAX (0, real_start), len); real_end = MIN (MAX (0, real_end), len); @@ -376,7 +376,7 @@ ect_remove_selection (AtkText *text, gaec->view_col, gaec->row, &selection_start, &selection_end) - && selection_start != selection_end + && selection_start != selection_end && e_cell_text_set_selection (gaec->cell_view, gaec->view_col, gaec->row, selection_end, selection_end)) { @@ -418,7 +418,7 @@ ect_set_caret_offset (AtkText *text, offset = len; else offset = MIN (MAX (0, offset), len); - + offset = g_utf8_offset_to_pointer (full_text, offset) - full_text; g_free (full_text); @@ -598,7 +598,7 @@ ect_class_init (GalA11yECellTextClass *klass) { AtkObjectClass *a11y = ATK_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass); - + parent_class = g_type_class_ref (PARENT_TYPE); a11y->get_name = ect_get_name; object_class->dispose = ect_dispose; @@ -619,11 +619,11 @@ ect_action_init (GalA11yECellText *a11y) /** * gal_a11y_e_cell_text_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yECellText class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yECellText class. **/ GType @@ -670,7 +670,7 @@ static void cell_text_destroyed (gpointer data) { g_return_if_fail (GAL_A11Y_IS_E_CELL_TEXT (data)); - + g_object_unref (data); } @@ -685,7 +685,7 @@ gal_a11y_e_cell_text_new (ETableItem *item, AtkObject *a11y; GalA11yECell *gaec; GalA11yECellText *gaet; - ECellText *ect; + ECellText *ect; a11y = g_object_new (gal_a11y_e_cell_text_get_type (), NULL); @@ -701,9 +701,9 @@ gal_a11y_e_cell_text_new (ETableItem *item, /* will be unrefed in cell_text_destroyed */ g_object_ref (a11y); - gaet->inserted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell), + gaet->inserted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell), "text_inserted", G_CALLBACK (ect_text_inserted_cb), a11y); - gaet->deleted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell), + gaet->deleted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell), "text_deleted", G_CALLBACK (ect_text_deleted_cb), a11y); g_object_weak_ref (G_OBJECT (((ECellView *)cell_view)->ecell), diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c index 6d1bbfd45e..8f994adeae 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.c +++ b/a11y/e-table/gal-a11y-e-cell-toggle.c @@ -47,18 +47,18 @@ gal_a11y_e_cell_toggle_get_type (void) NULL, /* instance init */ NULL /* value table */ }; - + type = g_type_register_static (GAL_A11Y_TYPE_E_CELL, "GalA11yECellToggle", &tinfo, 0); gal_a11y_e_cell_type_add_action_interface (type); - + } return type; } -static void +static void gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -118,7 +118,7 @@ model_change_cb (ETableModel *etm, } -AtkObject* +AtkObject* gal_a11y_e_cell_toggle_new (ETableItem *item, ECellView *cell_view, AtkObject *parent, @@ -147,7 +147,7 @@ gal_a11y_e_cell_toggle_new (ETableItem *item, view_col, row); - gal_a11y_e_cell_add_action (cell, + gal_a11y_e_cell_add_action (cell, _("toggle"), /* action name*/ _("toggle the cell"), /* action description */ NULL, /* action keybinding */ diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c index abc0c67ddb..a4b68b89ab 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.c +++ b/a11y/e-table/gal-a11y-e-cell-tree.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Tim Wo <tim.wo@sun.com>, Sun Microsystem Inc. 2003. * * Copyright (C) 2002 Ximian, Inc. @@ -89,7 +89,7 @@ ectr_do_action_expand (AtkAction *action) ETreePath node; ETreeModel *tree_model; ETreeTableAdapter *tree_table_adapter; - + a11y = GAL_A11Y_E_CELL (action); table_model = a11y->item->table_model; node = e_table_model_value_at (table_model, -1, a11y->row); @@ -112,7 +112,7 @@ ectr_do_action_collapse (AtkAction *action) ETreePath node; ETreeModel *tree_model; ETreeTableAdapter *tree_table_adapter; - + a11y = GAL_A11Y_E_CELL (action); table_model = a11y->item->table_model; node = e_table_model_value_at (table_model, -1, a11y->row); @@ -178,7 +178,7 @@ gal_a11y_e_cell_tree_new (ETableItem *item, ETreePath node; ETreeModel *tree_model; ETreeTableAdapter *tree_table_adapter; - + ECellView *subcell_view; subcell_view = e_cell_tree_view_get_subcell_view (cell_view); diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c index caed5d4fc2..268dc51691 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.c +++ b/a11y/e-table/gal-a11y-e-cell-vbox.c @@ -46,7 +46,7 @@ subcell_destroyed (gpointer data) GalA11yECell *cell; AtkObject *parent; GalA11yECellVbox *gaev; - + g_return_if_fail (GAL_A11Y_IS_E_CELL (data)); cell = GAL_A11Y_E_CELL (data); @@ -199,9 +199,9 @@ gal_a11y_e_cell_vbox_get_type (void) AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item, ECellView *cell_view, - AtkObject *parent, - int model_col, - int view_col, + AtkObject *parent, + int model_col, + int view_col, int row) { AtkObject *a11y; @@ -210,13 +210,13 @@ AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item, ECellVboxView *ecvv; a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL); - + gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row); gaec = GAL_A11Y_E_CELL (a11y); gaev = GAL_A11Y_E_CELL_VBOX (a11y); ecvv = (ECellVboxView *) (gaec->cell_view); - gaev->a11y_subcell_count = ecvv->subcell_view_count; + gaev->a11y_subcell_count = ecvv->subcell_view_count; gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count); return a11y; } diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h index 121db71671..32a199c05a 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.h +++ b/a11y/e-table/gal-a11y-e-cell-vbox.h @@ -53,9 +53,9 @@ struct _GalA11yECellVboxClass GType gal_a11y_e_cell_vbox_get_type (void); AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item, ECellView *cell_view, - AtkObject *parent, - int model_col, - int view_col, + AtkObject *parent, + int model_col, + int view_col, int row); #ifdef __cplusplus diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c index c19622d2b5..f6372eedc4 100644 --- a/a11y/e-table/gal-a11y-e-cell.c +++ b/a11y/e-table/gal-a11y-e-cell.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey <clahey@ximian.com> * * Copyright (C) 2002 Ximian, Inc. @@ -42,9 +42,9 @@ unref_cell (gpointer user_data, GObject *obj_loc) a11y->cell_view = NULL; g_object_unref (a11y); } -#endif +#endif -static gboolean +static gboolean is_valid (AtkObject *cell) { GalA11yECell *a11y = GAL_A11Y_E_CELL (cell); @@ -113,7 +113,7 @@ gal_a11y_e_cell_ref_state_set (AtkObject *accessible) GalA11yECell *cell = GAL_A11Y_E_CELL (accessible); g_return_val_if_fail (cell->state_set, NULL); - + g_object_ref(cell->state_set); return cell->state_set; @@ -193,10 +193,10 @@ gal_a11y_e_cell_grab_focus (AtkComponent *component) a11yTableItem = GAL_A11Y_E_TABLE_ITEM (a11y->parent); index = atk_object_get_index_in_parent (ATK_OBJECT (a11y)); - + atk_selection_clear_selection (ATK_SELECTION (a11yTableItem)); atk_selection_add_selection (ATK_SELECTION (a11yTableItem), index); - + gtk_widget_grab_focus (GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas)); toplevel = gtk_widget_get_toplevel (GTK_WIDGET (GNOME_CANVAS_ITEM (a11y->item)->canvas)); if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel)) @@ -256,7 +256,7 @@ _gal_a11y_e_cell_get_action_info (GalA11yECell *cell, gint index) { GList *list_node; - + g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), NULL); if (cell->action_list == NULL) return NULL; @@ -290,7 +290,7 @@ gal_a11y_e_cell_add_action ( GalA11yECell * cell, ActionInfo *info; g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE); info = g_new (ActionInfo, 1); - + if (action_name != NULL) info->name = g_strdup (action_name); else @@ -333,7 +333,7 @@ gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell, { GList *list_node; gboolean action_found= FALSE; - + g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE); for (list_node = cell->action_list; list_node && !action_found; list_node = list_node->next) { @@ -366,7 +366,7 @@ gal_a11y_e_cell_action_get_name (AtkAction *action, { GalA11yECell *cell = GAL_A11Y_E_CELL(action); ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index); - + if (info == NULL) return NULL; return info->name; @@ -391,7 +391,7 @@ gal_a11y_e_cell_action_set_description (AtkAction *action, { GalA11yECell *cell = GAL_A11Y_E_CELL(action); ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index); - + if (info == NULL) return FALSE; g_free (info->description); @@ -410,7 +410,7 @@ gal_a11y_e_cell_action_get_keybinding (AtkAction *action, return info->keybinding; } - + static gboolean idle_do_action (gpointer data) { @@ -424,7 +424,7 @@ idle_do_action (gpointer data) cell->action_idle_handler = 0; cell->action_func (cell); g_object_unref (cell); - + return FALSE; } @@ -454,7 +454,7 @@ static void gal_a11y_e_cell_atk_action_interface_init (AtkActionIface *iface) { g_return_if_fail (iface != NULL); - + iface->get_n_actions = gal_a11y_e_cell_action_get_n_actions; iface->do_action = gal_a11y_e_cell_action_do_action; iface->get_name = gal_a11y_e_cell_action_get_name; @@ -484,17 +484,17 @@ gal_a11y_e_cell_add_state (GalA11yECell *cell, { if (!atk_state_set_contains_state (cell->state_set, state_type)) { gboolean rc; - + rc = atk_state_set_add_state (cell->state_set, state_type); /* * The signal should only be generated if the value changed, * not when the cell is set up. So states that are set * initially should pass FALSE as the emit_signal argument. */ - + if (emit_signal) { atk_object_notify_state_change (ATK_OBJECT (cell), state_type, TRUE); - /* If state_type is ATK_STATE_VISIBLE, additional + /* If state_type is ATK_STATE_VISIBLE, additional notification */ if (state_type == ATK_STATE_VISIBLE) g_signal_emit_by_name (cell, "visible_data_changed"); @@ -513,7 +513,7 @@ gal_a11y_e_cell_remove_state (GalA11yECell *cell, { if (atk_state_set_contains_state (cell->state_set, state_type)) { gboolean rc; - + rc = atk_state_set_remove_state (cell->state_set, state_type); /* * The signal should only be generated if the value changed, @@ -536,11 +536,11 @@ gal_a11y_e_cell_remove_state (GalA11yECell *cell, /** * gal_a11y_e_cell_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yECell class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yECell class. **/ GType @@ -616,14 +616,14 @@ gal_a11y_e_cell_construct (AtkObject *object, ATK_OBJECT (a11y) ->role = ATK_ROLE_TABLE_CELL; if (item) - g_object_ref (G_OBJECT (item)); + g_object_ref (G_OBJECT (item)); #if 0 if (parent) g_object_ref (parent); if (cell_view) - g_object_ref (G_OBJECT (cell_view)); + g_object_ref (G_OBJECT (cell_view)); #endif diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h index b3f5ef3277..48da764102 100644 --- a/a11y/e-table/gal-a11y-e-cell.h +++ b/a11y/e-table/gal-a11y-e-cell.h @@ -74,16 +74,16 @@ void gal_a11y_e_cell_construct (AtkObject *object, int row); void gal_a11y_e_cell_type_add_action_interface (GType type); - + gboolean gal_a11y_e_cell_add_action (GalA11yECell *cell, const gchar *action_name, const gchar *action_description, const gchar *action_keybinding, ACTION_FUNC action_func); - + gboolean gal_a11y_e_cell_remove_action (GalA11yECell *cell, gint action_id); - + gboolean gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell, const gchar *action_name); diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c index ab98b4a10b..2dfa2cb1c4 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c @@ -57,11 +57,11 @@ gal_a11y_e_table_click_to_add_factory_init (GalA11yETableClickToAddFactory *fact /** * gal_a11y_e_table_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableFactory class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c index 819946cbbb..a4905971de 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c @@ -70,14 +70,14 @@ idle_do_action (gpointer data) event.x = 0; event.y = 0; - + event.type = GDK_BUTTON_PRESS; event.window = GTK_LAYOUT(GNOME_CANVAS_ITEM(etcta)->canvas)->bin_window; event.button = 1; event.send_event = TRUE; event.time = GDK_CURRENT_TIME; event.axes = NULL; - + g_signal_emit_by_name (etcta, "event", &event, &finished); return FALSE; @@ -97,7 +97,7 @@ static void atk_action_interface_init (AtkActionIface *iface) { g_return_if_fail (iface != NULL); - + iface->do_action = etcta_do_action; iface->get_n_actions = etcta_get_n_actions; iface->get_description = etcta_get_description; @@ -184,11 +184,11 @@ etcta_init (GalA11yETableClickToAdd *a11y) /** * gal_a11y_e_table_click_to_add_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableClickToAdd class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableClickToAdd class. **/ GType @@ -222,9 +222,9 @@ gal_a11y_e_table_click_to_add_get_type (void) parent_type = atk_object_factory_get_accessible_type (factory); type = gal_a11y_type_register_static_with_private (PARENT_TYPE, - "GalA11yETableClickToAdd", &info, 0, + "GalA11yETableClickToAdd", &info, 0, sizeof(GalA11yETableClickToAddPrivate), &priv_offset); - + g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); } @@ -238,7 +238,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data) ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); GalA11yETableClickToAdd *a11y; GalA11yETableClickToAddPrivate *priv; - + g_return_val_if_fail (item, TRUE); g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_CLICK_TO_ADD(data), FALSE); diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c index 3303978a65..5f060e9cde 100644 --- a/a11y/e-table/gal-a11y-e-table-column-header.c +++ b/a11y/e-table/gal-a11y-e-table-column-header.c @@ -54,7 +54,7 @@ static void gal_a11y_e_table_column_header_dispose (GObject *object) { GalA11yETableColumnHeader *a11y = GAL_A11Y_E_TABLE_COLUMN_HEADER (object); - GalA11yETableColumnHeaderPrivate *priv = GET_PRIVATE (a11y); + GalA11yETableColumnHeaderPrivate *priv = GET_PRIVATE (a11y); if (priv->state_set) { g_object_unref (priv->state_set); @@ -63,7 +63,7 @@ gal_a11y_e_table_column_header_dispose (GObject *object) if (parent_class->dispose) parent_class->dispose (object); - + } static void @@ -108,7 +108,7 @@ gal_a11y_e_table_column_header_do_action (AtkAction *action, } else if (E_IS_TABLE (widget)) ethi = E_TABLE_HEADER_ITEM (E_TABLE (widget)->header_item); - else + else break; ethi_change_sort_state (ethi, col); default: diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c index 8e207716ce..384dd40ed4 100644 --- a/a11y/e-table/gal-a11y-e-table-factory.c +++ b/a11y/e-table/gal-a11y-e-table-factory.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey <clahey@ximian.com> * * Copyright (C) 2002 Ximian, Inc. @@ -51,11 +51,11 @@ gal_a11y_e_table_factory_init (GalA11yETableFactory *factory) /** * gal_a11y_e_table_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableFactory class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c index 959de7e718..7841490e77 100644 --- a/a11y/e-table/gal-a11y-e-table-item-factory.c +++ b/a11y/e-table/gal-a11y-e-table-item-factory.c @@ -34,7 +34,7 @@ gal_a11y_e_table_item_factory_create_accessible (GObject *obj) g_return_val_if_fail (E_IS_TABLE_ITEM(obj), NULL); accessible = gal_a11y_e_table_item_new (E_TABLE_ITEM (obj)); - + return accessible; } @@ -56,11 +56,11 @@ gal_a11y_e_table_item_factory_init (GalA11yETableItemFactory *factory) /** * gal_a11y_e_table_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableFactory class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index c11be59787..65c9b4ba22 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey <clahey@ximian.com> * Bolian Yin <bolian.yin@sun.com> * @@ -176,7 +176,7 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y, ETableItem *item, gboolean } else g_object_set_data (G_OBJECT (a11y), "gail-focus-object", NULL); - if (notify && cell) + if (notify && cell) atk_focus_tracker_notify (cell); } @@ -251,7 +251,7 @@ eti_get_extents (AtkComponent *component, parent = ATK_OBJECT (component)->accessible_parent; if (parent && ATK_IS_COMPONENT (parent)) - atk_component_get_extents (ATK_COMPONENT (parent), x, y, + atk_component_get_extents (ATK_COMPONENT (parent), x, y, width, height, coord_type); @@ -313,7 +313,7 @@ cell_destroyed (gpointer data) g_return_if_fail (cell->item && G_IS_OBJECT (cell->item)); if (cell->item) { - g_object_unref (cell->item); + g_object_unref (cell->item); cell->item = NULL; } @@ -354,7 +354,7 @@ eti_ref_at (AtkTable *table, gint row, gint column) (GWeakNotify) cell_destroyed, ret); /* if current cell is focused, add FOCUSED state */ - if (e_selection_model_cursor_row (item->selection) == GAL_A11Y_E_CELL (ret)->row && + if (e_selection_model_cursor_row (item->selection) == GAL_A11Y_E_CELL (ret)->row && e_selection_model_cursor_col (item->selection) == GAL_A11Y_E_CELL (ret)->model_col) gal_a11y_e_cell_add_state (GAL_A11Y_E_CELL (ret), ATK_STATE_FOCUSED, FALSE); } else @@ -439,7 +439,7 @@ eti_get_column_extent_at (AtkTable *table, return -1; e_table_item_get_cell_geometry (item, - &row, + &row, &column, NULL, NULL, @@ -462,7 +462,7 @@ eti_get_row_extent_at (AtkTable *table, return -1; e_table_item_get_cell_geometry (item, - &row, + &row, &column, NULL, NULL, @@ -537,7 +537,7 @@ eti_get_summary (AtkTable *table) return NULL; } -static gboolean +static gboolean table_is_row_selected (AtkTable *table, gint row) { ETableItem *item; @@ -556,7 +556,7 @@ table_is_row_selected (AtkTable *table, gint row) return e_selection_model_is_row_selected(item->selection, view_to_model_row (item, row)); } -static gboolean +static gboolean table_is_selected (AtkTable *table, gint row, gint column) { return table_is_row_selected (table, row); @@ -591,7 +591,7 @@ table_get_selected_rows (AtkTable *table, gint **rows_selected) return n_selected; } -static gboolean +static gboolean table_add_row_selection (AtkTable *table, gint row) { ETableItem *item; @@ -608,7 +608,7 @@ table_add_row_selection (AtkTable *table, gint row) return TRUE; } -static gboolean +static gboolean table_remove_row_selection (AtkTable *table, gint row) { ETableItem *item; @@ -662,7 +662,7 @@ eti_atk_component_iface_init (AtkComponentIface *iface) } static void -eti_rows_inserted (ETableModel * model, int row, int count, +eti_rows_inserted (ETableModel * model, int row, int count, AtkObject * table_item) { gint n_cols,n_rows,i,j; @@ -676,11 +676,11 @@ eti_rows_inserted (ETableModel * model, int row, int count, n_rows = atk_table_get_n_rows (ATK_TABLE(table_item)); old_nrows = GET_PRIVATE(item_a11y)->rows; - + g_return_if_fail (n_cols > 0 && n_rows > 0); g_return_if_fail (old_nrows == n_rows - count); - GET_PRIVATE(table_item)->rows = n_rows; + GET_PRIVATE(table_item)->rows = n_rows; g_signal_emit_by_name (table_item, "row-inserted", row, count, NULL); @@ -697,12 +697,12 @@ eti_rows_inserted (ETableModel * model, int row, int count, } static void -eti_rows_deleted (ETableModel * model, int row, int count, +eti_rows_deleted (ETableModel * model, int row, int count, AtkObject * table_item) { gint i,j, n_rows, n_cols, old_nrows; ETableItem *item = E_TABLE_ITEM (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (table_item))); - + n_rows = atk_table_get_n_rows (ATK_TABLE(table_item)); n_cols = atk_table_get_n_columns (ATK_TABLE(table_item)); @@ -748,7 +748,7 @@ enum { ETI_HEADER_NEW_ADDED, ETI_HEADER_REMOVED, }; - + /* * 1. Check what actually happened: column reorder, remove or add * 2. Update cache @@ -757,17 +757,17 @@ enum { static void eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) { - + gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE; GalA11yETableItem * a11y_item; ETableCol ** cols, **prev_cols; GalA11yETableItemPrivate *priv; gint *state = NULL, *prev_state = NULL, *reorder = NULL; gint i,j,n_rows,n_cols, prev_n_cols; - + a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y); priv = GET_PRIVATE (a11y_item); - + /* Assume rows do not changed. */ n_rows = priv->rows; @@ -776,9 +776,9 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) cols = e_table_header_get_columns (eth); n_cols = eth->col_count; - + g_return_if_fail (cols && prev_cols && n_cols > 0); - + /* Init to ETI_HEADER_UNCHANGED. */ state = g_malloc0 (sizeof (gint) * n_cols); prev_state = g_malloc0 (sizeof (gint) * prev_n_cols); @@ -799,7 +799,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) break; } } - + /* cols[i] is new added column. */ if ( j == prev_n_cols ) { added_found = TRUE; @@ -812,7 +812,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) for (j = 0 ; j < n_cols && cols[j]; j ++) if ( prev_cols [j] == cols[i] ) break; - + /* Removed columns found. */ if ( j == n_cols ) { removed_found = TRUE; @@ -861,7 +861,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) static void -eti_real_initialize (AtkObject *obj, +eti_real_initialize (AtkObject *obj, gpointer data) { ETableItem * eti; @@ -940,11 +940,11 @@ static void eti_a11y_cursor_changed_cb (ESelectionModel *selection, /** * gal_a11y_e_table_item_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETableItem class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETableItem class. **/ GType @@ -1029,7 +1029,7 @@ gal_a11y_e_table_item_new (ETableItem *item) GET_PRIVATE (a11y)->cols = item->cols; GET_PRIVATE (a11y)->rows = item->rows; - GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header); + GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header); if ( GET_PRIVATE (a11y)->columns == NULL) return NULL; @@ -1058,7 +1058,7 @@ gal_a11y_e_table_item_new (ETableItem *item) accessible->role = ATK_ROLE_TREE_TABLE; } else if (E_IS_TABLE (GET_PRIVATE (a11y)->widget)) { accessible->role = ATK_ROLE_TABLE; - } + } } if (item) @@ -1181,7 +1181,7 @@ eti_a11y_cursor_changed_cb (ESelectionModel *selection, g_return_if_fail (GAL_A11Y_IS_E_TABLE_ITEM (a11y)); - if (atk_state_set_contains_state (priv->state_set, ATK_STATE_DEFUNCT)) + if (atk_state_set_contains_state (priv->state_set, ATK_STATE_DEFUNCT)) return; item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (a11y))); diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c index 56cfdbd2f0..056b95775f 100644 --- a/a11y/e-table/gal-a11y-e-table.c +++ b/a11y/e-table/gal-a11y-e-table.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: + * Authors: * Christopher James Lahey <clahey@ximian.com> * * Copyright (C) 2002 Ximian, Inc. @@ -67,7 +67,7 @@ eti_get_accessible (ETableItem *eti, AtkObject *parent) return a11y; } -static gboolean +static gboolean init_child_item (GalA11yETable *a11y) { ETable *table; @@ -123,7 +123,7 @@ et_get_n_children (AtkObject *accessible) n = g_list_length (etgc->children); } } - + if (et && et->use_click_to_add && et->click_to_add) { n++; } @@ -212,11 +212,11 @@ et_init (GalA11yETable *a11y) /** * gal_a11y_e_table_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETable class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETable class. **/ GType @@ -282,7 +282,7 @@ gal_a11y_e_table_new (GObject *widget) return ATK_OBJECT (a11y); } -void +void gal_a11y_e_table_init (void) { if (atk_get_root ()) diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c index d5c7f80669..031220d46a 100644 --- a/a11y/e-table/gal-a11y-e-tree-factory.c +++ b/a11y/e-table/gal-a11y-e-tree-factory.c @@ -49,11 +49,11 @@ gal_a11y_e_tree_factory_init (GalA11yETreeFactory *factory) /** * gal_a11y_e_tree_factory_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETreeFactory class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETreeFactory class. **/ GType diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c index 6ad507a4f3..72738ec011 100644 --- a/a11y/e-table/gal-a11y-e-tree.c +++ b/a11y/e-table/gal-a11y-e-tree.c @@ -106,11 +106,11 @@ et_init (GalA11yETree *a11y) /** * gal_a11y_e_tree_get_type: - * @void: - * + * @void: + * * Registers the &GalA11yETree class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the &GalA11yETree class. **/ GType |