org.handhelds.familiar/packages/gtk+/gtk+-2.6.4-1.osso7/gtktreeviewcolumn.c.diff

   1 --- gtk+-2.6.4/gtk/gtktreeviewcolumn.c  2005-01-05 00:10:56.000000000 +0200
   2 +++ gtk+-2.6.4/gtk/gtktreeviewcolumn.c  2005-04-06 16:19:38.346708776 +0300
   3 @@ -1367,6 +1367,19 @@
   4    return FALSE;
   5  }
   6
   7 +gboolean
   8 +_gtk_tree_view_column_has_activatable_cell (GtkTreeViewColumn *column)
   9 +{
  10 +  GList *list;
  11 +
  12 +  for (list = column->cell_list; list; list = list->next)
  13 +    if (((GtkTreeViewColumnCellInfo *)list->data)->cell->mode ==
  14 +       GTK_CELL_RENDERER_MODE_ACTIVATABLE)
  15 +      return TRUE;
  16 +
  17 +  return FALSE;
  18 +}
  19 +
  20  /* gets cell being edited */
  21  GtkCellRenderer *
  22  _gtk_tree_view_column_get_edited_cell (GtkTreeViewColumn *column)
  23 @@ -2582,6 +2595,7 @@
  24    GList *list;
  25    gboolean first_cell = TRUE;
  26    gint focus_line_width;
  27 +  gint horizontal_separator;
  28
  29    g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
  30
  31 @@ -2590,7 +2604,10 @@
  32    if (width)
  33      * width = 0;
  34
  35 -  gtk_widget_style_get (tree_column->tree_view, "focus-line-width", &focus_line_width, NULL);
  36 +  gtk_widget_style_get (tree_column->tree_view,
  37 +                        "focus-line-width", &focus_line_width,
  38 +                        "horizontal-separator", &horizontal_separator,
  39 +                        NULL);
  40
  41    for (list = tree_column->cell_list; list; list = list->next)
  42      {
  43 @@ -2618,7 +2635,7 @@
  44         * height = MAX (*height, new_height + focus_line_width * 2);
  45        info->requested_width = MAX (info->requested_width, new_width + focus_line_width * 2);
  46        if (width)
  47 -       * width += info->requested_width;
  48 +       * width += info->requested_width + horizontal_separator;
  49        first_cell = FALSE;
  50      }
  51  }