diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-09-21 16:52:59 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-09-26 15:11:45 +0200 |
| commit | e66129015de47d21006ff03f82964a77fdf7ca3d (patch) | |
| tree | 744cd6f0f36d8216ebeef9c7a52cd0550f695122 /modules | |
| parent | d9c92598612714683eab96fecf6e90a9531607e5 (diff) | |
| download | gtk+-e66129015de47d21006ff03f82964a77fdf7ca3d.tar.gz | |
cellrenderer: Merge GtkCellSizeRequest into GtkCellRenderer
This mostly goes to keep consistency with the changes to GtkSizeRequest
in the last patch, as GtkCellSizeRequest requires GtkCellRenderer and
GtkCellRenderer implements GtkCellSizeRequest there's no use in keeping
them separate.
This patch renames the functions:
gtk_cell_size_request_get_request_mode()
=> gtk_cell_renderer_get_request_mode()
gtk_cell_size_request_get_width()
=> gtk_cell_renderer_get_preferred_width()
gtk_cell_size_request_get_height()
=> gtk_cell_renderer_get_preferred_height()
gtk_cell_size_request_get_size()
=> gtk_cell_renderer_get_preferred_size()
gtk_cell_size_request_get_width_for_height()
=> gtk_cell_renderer_get_preferred_width_for_height()
gtk_cell_size_request_get_height_for_width()
=> gtk_cell_renderer_get_preferred_height_for_width()
... and moves the corresponding vfuncs to GtkCellRenderer.
The patch also renames the implementations of these functions in cell
renderers to include the word "preferrred".
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/other/gail/gailtextcell.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/other/gail/gailtextcell.c b/modules/other/gail/gailtextcell.c index 625813794d..2cbf5bf283 100644 --- a/modules/other/gail/gailtextcell.c +++ b/modules/other/gail/gailtextcell.c @@ -605,9 +605,9 @@ gail_text_cell_get_character_extents (AtkText *text, gail_cell_parent_get_cell_area (GAIL_CELL_PARENT (parent), GAIL_CELL (text), &rendered_rect); - gtk_cell_size_request_get_size (GTK_CELL_SIZE_REQUEST (gtk_renderer), - widget, - &min_size, NULL); + gtk_cell_renderer_get_preferred_size (GTK_CELL_RENDERER (gtk_renderer), + widget, + &min_size, NULL); _gtk_cell_renderer_calc_offset (GTK_CELL_RENDERER (gtk_renderer), &rendered_rect, gtk_widget_get_direction (widget), @@ -672,9 +672,9 @@ gail_text_cell_get_offset_at_point (AtkText *text, gail_cell_parent_get_cell_area (GAIL_CELL_PARENT (parent), GAIL_CELL (text), &rendered_rect); - gtk_cell_size_request_get_size (GTK_CELL_SIZE_REQUEST (gtk_renderer), - widget, - &min_size, NULL); + gtk_cell_renderer_get_preferred_size (GTK_CELL_RENDERER (gtk_renderer), + widget, + &min_size, NULL); _gtk_cell_renderer_calc_offset (GTK_CELL_RENDERER (gtk_renderer), &rendered_rect, gtk_widget_get_direction (widget), min_size.width, min_size.height, |