Cleanup gtksheet and add features to var-sheet.[ch]

[pspp-builds.git] / lib / gtksheet / gtksheet.h

diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
index c77eb472cac4c84cb14a0f376ca5083746293da1..90adb0416356748987f30d67eac2d314301887fd 100644 (file)
--- a/lib/gtksheet/gtksheet.h
+++ b/lib/gtksheet/gtksheet.h
@@ -74,7 +74,6 @@ enum
 #define GTK_SHEET_ROW_FROZEN(sheet)      !gtk_sheet_rows_resizable (sheet)
 #define GTK_SHEET_COLUMN_FROZEN(sheet)   !gtk_sheet_columns_resizable (sheet)
 #define GTK_SHEET_AUTORESIZE(sheet)      gtk_sheet_autoresize (sheet)
-#define GTK_SHEET_CLIP_TEXT(sheet)       gtk_sheet_clip_text (sheet)
 #define GTK_SHEET_ROW_TITLES_VISIBLE(sheet)   gtk_sheet_row_titles_visible (sheet)
 #define GTK_SHEET_COL_TITLES_VISIBLE(sheet)   gtk_sheet_column_titles_visible (sheet)
 #define GTK_SHEET_AUTO_SCROLL(sheet)     gtk_sheet_autoscroll (sheet)
@@ -111,9 +110,12 @@ struct _GtkSheetHoverTitle
   gint row, column;
 };
 
-struct _GtkSheet{
+struct _GtkSheet
+{
   GtkContainer container;
 
+
+  gboolean dispose_has_run;
   GSheetColumn *column_geometry;
   GSheetRow *row_geometry;
 
@@ -124,11 +126,8 @@ struct _GtkSheet{
   GtkSelectionMode selection_mode;
   gboolean autoresize;
   gboolean autoscroll;
-  gboolean clip_text;
   gboolean justify_entry;
 
-  guint freeze_count;
-
   /* Background colors */
   GdkColor bg_color;
   GdkColor grid_color;
@@ -141,8 +140,6 @@ struct _GtkSheet{
      and the width of the shadow border */
   GdkRectangle internal_allocation;
 
-  gchar *name;
-
   gint16 column_requisition;
   gint16 row_requisition;
 
@@ -158,10 +155,6 @@ struct _GtkSheet{
   /* expanding selection */
   GtkSheetCell selection_cell;
 
-  /* timer for flashing clipped range */
-  gint32 clip_timer;
-  gint interval;
-
   /* global selection button */
   GtkWidget *button;
 
@@ -203,6 +196,8 @@ struct _GtkSheet{
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
 
+  gint freeze_count;
+
   /* xor GC for the verticle drag line */
   GdkGC *xor_gc;
 
@@ -224,9 +219,6 @@ struct _GtkSheet{
   /* current range being dragged */
   GtkSheetRange drag_range;
 
-  /* clipped range */
-  GtkSheetRange clip_range;
-
   /* Used for the subtitle (popups) */
   gint motion_timer;
   GtkSheetHoverTitle *hover_window;
@@ -246,8 +238,6 @@ struct _GtkSheetClass
 
  void (*select_range)          (GtkSheet *sheet, GtkSheetRange *range);
 
- void (*clip_range)            (GtkSheet *sheet, GtkSheetRange *clip_range);
-
  void (*resize_range)          (GtkSheet *sheet,
                                GtkSheetRange *old_range,
                                GtkSheetRange *new_range);
@@ -266,23 +256,8 @@ struct _GtkSheetClass
  gboolean (*activate)          (GtkSheet *sheet,
                                gint row, gint column);
 
- void (*set_cell)              (GtkSheet *sheet,
-                               gint row, gint column);
-
- void (*clear_cell)            (GtkSheet *sheet,
-                               gint row, gint column);
-
  void (*changed)               (GtkSheet *sheet,
                                gint row, gint column);
-
- void (*new_column_width)       (GtkSheet *sheet,
-                                 gint col,
-                                 guint width);
-
- void (*new_row_height)        (GtkSheet *sheet,
-                                 gint row,
-                                 guint height);
-
 };
 
 GType gtk_sheet_get_type (void);
@@ -291,7 +266,6 @@ GtkType gtk_sheet_range_get_type (void);
 
 /* create a new sheet */
 GtkWidget * gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo,
-                          const gchar *title,
                           GSheetModel *model);
 
 
@@ -309,13 +283,11 @@ gtk_sheet_construct_browser               (GtkSheet *sheet,
 GtkWidget *
 gtk_sheet_new_with_custom_entry        (GSheetRow *vgeo,
                                         GSheetColumn *hgeo,
-                                         const gchar *title,
                                         GtkType entry_type);
 void
 gtk_sheet_construct_with_custom_entry  (GtkSheet *sheet,
                                         GSheetRow *vgeo,
                                         GSheetColumn *hgeo,
-                                         const gchar *title,
                                         GtkType entry_type);
 /* change scroll adjustments */
 void
@@ -370,12 +342,6 @@ gtk_sheet_set_autoscroll           (GtkSheet *sheet, gboolean autoscroll);
 gboolean
 gtk_sheet_autoscroll                   (GtkSheet *sheet);
 
-void
-gtk_sheet_set_clip_text                        (GtkSheet *sheet, gboolean clip_text);
-
-gboolean
-gtk_sheet_clip_text                    (GtkSheet *sheet);
-
 void
 gtk_sheet_set_justify_entry            (GtkSheet *sheet, gboolean justify);
 
@@ -505,16 +471,6 @@ void
 gtk_sheet_select_column                (GtkSheet * sheet,
                                        gint column);
 
-/* save selected range to "clipboard" */
-void
-gtk_sheet_clip_range                   (GtkSheet *sheet, const GtkSheetRange *range);
-/* free clipboard */
-void
-gtk_sheet_unclip_range                 (GtkSheet *sheet);
-
-gboolean
-gtk_sheet_in_clip                      (GtkSheet *sheet);
-
 /* get scrollbars adjustment */
 GtkAdjustment *
 gtk_sheet_get_vadjustment              (GtkSheet * sheet);