diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt index c433f7b51c..dbe4e423e8 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk3-sections.txt @@ -4402,6 +4402,7 @@ gtk_cell_area_get_style_detail gtk_cell_area_get_cell_allocation gtk_cell_area_get_cell_at_position gtk_cell_area_create_context +gtk_cell_area_copy_context gtk_cell_area_get_request_mode gtk_cell_area_get_preferred_width gtk_cell_area_get_preferred_height_for_width @@ -4458,6 +4459,8 @@ gtk_cell_area_context_allocate gtk_cell_area_context_reset gtk_cell_area_context_get_preferred_width gtk_cell_area_context_get_preferred_height +gtk_cell_area_context_get_preferred_height_for_width +gtk_cell_area_context_get_preferred_width_for_height gtk_cell_area_context_get_allocation gtk_cell_area_context_push_preferred_width gtk_cell_area_context_push_preferred_height diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 8489ee1399..ce41e59b0e 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -386,11 +386,14 @@ gtk_cell_area_context_allocate gtk_cell_area_context_get_allocation gtk_cell_area_context_get_area gtk_cell_area_context_get_preferred_height +gtk_cell_area_context_get_preferred_height_for_width gtk_cell_area_context_get_preferred_width +gtk_cell_area_context_get_preferred_width_for_height gtk_cell_area_context_get_type G_GNUC_CONST gtk_cell_area_context_push_preferred_width gtk_cell_area_context_push_preferred_height gtk_cell_area_context_reset +gtk_cell_area_copy_context gtk_cell_area_create_context gtk_cell_area_event gtk_cell_area_foreach diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h index 61579221fb..008b8bb10f 100644 --- a/gtk/gtkcellarea.h +++ b/gtk/gtkcellarea.h @@ -119,6 +119,8 @@ struct _GtkCellArea * class but can be overridden to apply some custom attributes. * @create_context: Creates and returns a class specific #GtkCellAreaContext to store cell * alignment and allocation details for a said #GtkCellArea class. + * @copy_context: Creates a new #GtkCellAreaContext in the same state as the passed @context + * with any cell alignment data and allocations in tact. * @get_request_mode: This allows an area to tell its layouting widget whether it prefers to * be allocated in %GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH or %GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT mode. * @get_preferred_width: Calculates the minimum and natural width of the area's cells diff --git a/gtk/gtkcellareacontext.h b/gtk/gtkcellareacontext.h index d2b462cfce..3c3522bc59 100644 --- a/gtk/gtkcellareacontext.h +++ b/gtk/gtkcellareacontext.h @@ -58,6 +58,10 @@ struct _GtkCellAreaContext * recalculated at gtk_cell_area_render() time. * @reset: Clear any previously stored information about requested and allocated * sizes for the context. + * @get_preferred_height_for_width: Returns the aligned height for the given width + * that context must store while collecting sizes for it's rows. + * @get_preferred_width_for_height: Returns the aligned width for the given height + * that context must store while collecting sizes for it's rows. */ struct _GtkCellAreaContextClass { @@ -84,6 +88,8 @@ struct _GtkCellAreaContextClass void (*_gtk_reserved2) (void); void (*_gtk_reserved3) (void); void (*_gtk_reserved4) (void); + void (*_gtk_reserved5) (void); + void (*_gtk_reserved6) (void); }; GType gtk_cell_area_context_get_type (void) G_GNUC_CONST;