Removed some unused gtksheet features.

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index f7cf7822faae2629841fc57787e90751f9ef3079..78bea1b7056f1f0d2b96b8a9f2965bf8fff57867 100644 (file)
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -1411,24 +1411,6 @@ gtk_sheet_set_selection_mode (GtkSheet *sheet, gint mode)
   sheet->selection_mode = mode;
 }
 
-void
-gtk_sheet_set_autoresize (GtkSheet *sheet, gboolean autoresize)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  sheet->autoresize = autoresize;
-}
-
-gboolean
-gtk_sheet_autoresize (GtkSheet *sheet)
-{
-  g_return_val_if_fail (sheet != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
-
-  return sheet->autoresize;
-}
-
 static void
 gtk_sheet_set_column_width (GtkSheet * sheet,
                            gint column,
@@ -2741,16 +2723,7 @@ gtk_sheet_set_cell (GtkSheet *sheet, gint row, gint col,
       range.col0 = min_visible_column (sheet);
       range.coli = max_visible_column (sheet);
 
-      if (gtk_sheet_autoresize (sheet) &&
-         text_width > g_sheet_column_get_width (sheet->column_geometry, col) -
-         2 * COLUMN_TITLES_HEIGHT- attributes.border.width)
-       {
-         gtk_sheet_set_column_width (sheet, col, text_width + 2 * COLUMN_TITLES_HEIGHT
-                                     + attributes.border.width);
-         GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_REDRAW_PENDING);
-       }
-      else
-       gtk_sheet_range_draw (sheet, &range);
+      gtk_sheet_range_draw (sheet, &range);
     }
 
   if ( changed )
@@ -6035,37 +6008,6 @@ init_attributes (const GtkSheet *sheet, gint col, GtkSheetCellAttr *attributes)
   attributes->font_desc = GTK_WIDGET (sheet)->style->font_desc;
 }
 
-static void
-label_size_request (GtkSheet *sheet, gchar *label, GtkRequisition *req)
-{
-  gchar *words;
-  gchar word[1000];
-  gint n = 0;
-  gint row_height = default_row_height (sheet) - 2 * COLUMN_TITLES_HEIGHT + 2;
-
-  req->height = 0;
-  req->width = 0;
-  words = label;
-
-  while (words && *words != '\0')
-    {
-      if (*words == '\n' || * (words + 1) == '\0')
-       {
-         req->height += row_height;
-
-         word[n] = '\0';
-         req->width = MAX (req->width, STRING_WIDTH (GTK_WIDGET (sheet), GTK_WIDGET (sheet)->style->font_desc, word));
-         n = 0;
-       }
-      else
-       {
-         word[n++] = *words;
-       }
-      words++;
-    }
-
-  if (n > 0) req->height -= 2;
-}
 
 static void
 gtk_sheet_button_size_request   (GtkSheet *sheet,
@@ -6075,17 +6017,8 @@ gtk_sheet_button_size_request     (GtkSheet *sheet,
   GtkRequisition requisition;
   GtkRequisition label_requisition;
 
-  if (gtk_sheet_autoresize (sheet) && button->label && strlen (button->label) > 0)
-    {
-      label_size_request (sheet, button->label, &label_requisition);
-      label_requisition.width += 2 * COLUMN_TITLES_HEIGHT;
-      label_requisition.height += 2 * COLUMN_TITLES_HEIGHT;
-    }
-  else
-    {
-      label_requisition.height = default_row_height (sheet);
-      label_requisition.width = COLUMN_MIN_WIDTH;
-    }
+  label_requisition.height = default_row_height (sheet);
+  label_requisition.width = COLUMN_MIN_WIDTH;
 
   requisition.height = default_row_height (sheet);
   requisition.width = COLUMN_MIN_WIDTH;

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index 97f893a036f380c4d80b498fc4b492087900429e..ddaeb20b365e18c6ea14dbe48cda614c29531ba6 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -121,7 +121,6 @@ struct _GtkSheet
   GSheetModel *model;
 
   GtkSelectionMode selection_mode;
-  gboolean autoresize;
 
   /* Component colors */
   GdkColor color[n_COLORS];
@@ -346,8 +345,6 @@ void gtk_sheet_row_set_sensitivity      (GtkSheet *sheet,
 
 /* set sensitivity for all row buttons */
 void gtk_sheet_rows_set_sensitivity    (GtkSheet *sheet, gboolean sensitive);
-void gtk_sheet_rows_set_resizable      (GtkSheet *sheet, gboolean resizable);
-gboolean gtk_sheet_rows_resizable      (GtkSheet *sheet);
 
 /* set row visibility. The default value is TRUE. If FALSE, the
  * row is hidden */