1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
$NetBSD: patch-ab,v 1.3 2005/04/12 00:49:41 rillig Exp $
Needed for gcc-2.95.
--- gal/a11y/e-table/gal-a11y-e-cell-vbox.c.orig Thu Jan 27 06:28:27 2005
+++ gal/a11y/e-table/gal-a11y-e-cell-vbox.c Mon Apr 11 00:43:09 2005
@@ -31,8 +31,9 @@ static AtkComponentIface *component_pare
static gint
ecv_get_n_children (AtkObject *a11y)
{
+ GalA11yECellVbox *gaev;
g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0);
- GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
+ gaev = GAL_A11Y_E_CELL_VBOX (a11y);
return (gaev->a11y_subcell_count);
}
@@ -63,10 +64,11 @@ ecv_ref_child (AtkObject *a11y, gint i)
AtkObject *ret;
if (i < gaev->a11y_subcell_count) {
if (gaev->a11y_subcells[i] == NULL) {
+ ECellView *subcell_view;
gint model_col, row;
row = gaec->row;
model_col = ecvv->model_cols[i];
- ECellView *subcell_view = ecvv->subcell_views[i];
+ subcell_view = ecvv->subcell_views[i];
ret = gal_a11y_e_cell_registry_get_object (NULL,
gaec->item,
subcell_view,
@@ -200,14 +202,17 @@ AtkObject *gal_a11y_e_cell_vbox_new (ETa
int row)
{
AtkObject *a11y;
+ GalA11yECell *gaec;
+ GalA11yECellVbox *gaev;
+ 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);
- GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
- GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
- ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view);
+ 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_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count);
return a11y;
|
