callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed combo-refactor branch for recent switch to gtk_cell_area_context_reset() api.

Browse Source
This commit is contained in:
Tristan Van Berkom
2010-11-27 16:32:36 +09:00
parent ab3b75aeb1
commit 15ac4be60f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkcellview.c
View File

@ -419,7 +419,7 @@ gtk_cell_view_set_property (GObject *object,
case PROP_ORIENTATION: case PROP_ORIENTATION:
view->priv->orientation = g_value_get_enum (value); view->priv->orientation = g_value_get_enum (value);
if (view->priv->context) if (view->priv->context)
gtk_cell_area_context_flush (view->priv->context); gtk_cell_area_context_reset (view->priv->context);
break; break;
case PROP_BACKGROUND: case PROP_BACKGROUND:
{ {
@ -547,9 +547,9 @@ gtk_cell_view_size_allocate (GtkWidget *widget,
*/ */
if (priv->fit_model) if (priv->fit_model)
gtk_cell_area_context_allocate (priv->context, allocation->width, allocation->height); gtk_cell_area_context_allocate (priv->context, allocation->width, allocation->height);
else if (alloc_width <= 0 && priv->orientation == GTK_ORIENTATION_HORIZONTAL) else if (alloc_width != allocation->width && priv->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_cell_area_context_allocate (priv->context, allocation->width, -1); gtk_cell_area_context_allocate (priv->context, allocation->width, -1);
else if (alloc_height <= 0 && priv->orientation == GTK_ORIENTATION_VERTICAL) else if (alloc_height != allocation->height && priv->orientation == GTK_ORIENTATION_VERTICAL)
gtk_cell_area_context_allocate (priv->context, -1, allocation->height); gtk_cell_area_context_allocate (priv->context, -1, allocation->height);
} }
@ -862,7 +862,7 @@ row_changed_cb (GtkTreeModel *model,
{ {
/* Resize everything in our context if our row changed */ /* Resize everything in our context if our row changed */
if (gtk_tree_path_compare (row_path, path) == 0) if (gtk_tree_path_compare (row_path, path) == 0)
gtk_cell_area_context_flush (view->priv->context); gtk_cell_area_context_reset (view->priv->context);
gtk_tree_path_free (row_path); gtk_tree_path_free (row_path);
} }
@ -1343,7 +1343,7 @@ gtk_cell_view_set_fit_model (GtkCellView *cell_view,
{ {
priv->fit_model = fit_model; priv->fit_model = fit_model;
gtk_cell_area_context_flush (cell_view->priv->context); gtk_cell_area_context_reset (cell_view->priv->context);
g_object_notify (G_OBJECT (cell_view), "fit-model"); g_object_notify (G_OBJECT (cell_view), "fit-model");
} }

4
gtk/gtktreemenu.c
View File

@ -834,7 +834,7 @@ row_inserted_cb (GtkTreeModel *model,
gtk_menu_shell_insert (GTK_MENU_SHELL (menu), item, index); gtk_menu_shell_insert (GTK_MENU_SHELL (menu), item, index);
/* Resize everything */ /* Resize everything */
gtk_cell_area_context_flush (menu->priv->context); gtk_cell_area_context_reset (menu->priv->context);
} }
} }
else else
@ -875,7 +875,7 @@ row_deleted_cb (GtkTreeModel *model,
gtk_widget_destroy (item); gtk_widget_destroy (item);
/* Resize everything */ /* Resize everything */
gtk_cell_area_context_flush (menu->priv->context); gtk_cell_area_context_reset (menu->priv->context);
} }
} }
else else