~ubuntu-branches/ubuntu/feisty/gnumeric/feisty

« back to all changes in this revision

Viewing changes to src/preview-grid.c

  • Committer: Bazaar Package Importer
  • Author(s): Gauvain Pocentek
  • Date: 2006-12-06 13:55:23 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061206135523-6bh02cebuk0hduva
Tags: 1.7.5-1ubuntu1
* Merge with debian experimental:
  - debian/control, debian/*-gtk-*, debian/rules,
    debian/shlibs.local: Xubuntu changes for
    gtk/gnome multibuild.
  - run intltool-update in po*
  - Build Depend on intltool

Show diffs side-by-side

added added

removed removed

Lines of Context:
91
91
                v = value_dup (pg->defaults.value);
92
92
 
93
93
        cell = sheet_cell_fetch (pg->sheet, col, row);
94
 
        cell_set_value (cell, v);
95
 
        cell->rendered_value = rendered_value_new (cell, style,
 
94
        gnm_cell_set_value (cell, v);
 
95
        cell->rendered_value = gnm_rendered_value_new (cell, style,
96
96
                TRUE, context, pg->sheet->last_zoom_factor_used);
97
97
 
98
98
        return cell;
227
227
                /* Fill the entire cell (API excludes far pixel) */
228
228
                gdk_draw_rectangle (drawable, gc, TRUE, x, y, w+1, h+1);
229
229
 
230
 
        style_border_draw_diag (mstyle, drawable, x, y, x+w, y+h);
 
230
        gnm_style_border_draw_diag (mstyle, drawable, x, y, x+w, y+h);
231
231
}
232
232
 
233
233
#define border_null(b)  ((b) == none || (b) == NULL)
234
234
static void
235
235
pg_style_get_row (PreviewGrid *pg, GnmStyleRow *sr)
236
236
{
237
 
        GnmBorder const *top, *bottom, *none = style_border_none ();
 
237
        GnmBorder const *top, *bottom, *none = gnm_style_border_none ();
238
238
        GnmBorder const *left, *right;
239
239
        int const end = sr->end_col, row = sr->row;
240
240
        int col = sr->start_col;
303
303
        GnmStyleRow sr, next_sr;
304
304
        GnmStyle const **styles;
305
305
        GnmBorder const **borders, **prev_vert;
306
 
        GnmBorder const *none = pg->gridlines ? style_border_none () : NULL;
 
306
        GnmBorder const *none = pg->gridlines ? gnm_style_border_none () : NULL;
307
307
 
308
308
        int *colwidths = NULL;
309
309
 
310
 
        style_border_none_set_color (style_color_grid ());
 
310
        gnm_style_border_none_set_color (style_color_grid ());
311
311
 
312
312
        /*
313
313
         * allocate a single blob of memory for all 8 arrays of pointers.
350
350
                                                      style, col, row, x, y,
351
351
                                                      colwidths [col], row_height);
352
352
 
353
 
                        if (!cell_is_empty (cell))
 
353
                        if (!gnm_cell_is_empty (cell))
354
354
                                cell_draw (cell, pg->gc.cell, drawable,
355
355
                                           x, y, colwidths [col], row_height, -1);
356
356
 
357
357
                        x += colwidths [col];
358
358
                }
359
359
 
360
 
                style_borders_row_draw (prev_vert, &sr,
 
360
                gnm_style_borders_row_draw (prev_vert, &sr,
361
361
                                        drawable, diff_x, y, y+row_height,
362
362
                                        colwidths, TRUE, 1 /* cheat dir == 1 for now */);
363
363