Rename GtkSheet to PsppireSheet
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 14 Dec 2008 04:56:01 +0000 (13:56 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 14 Dec 2008 04:56:01 +0000 (13:56 +0900)
lib/gtksheet/README
lib/gtksheet/automake.mk
lib/gtksheet/gtkextra-sheet.h
lib/gtksheet/gtksheet.c [deleted file]
lib/gtksheet/gtksheet.h [deleted file]
src/ui/gui/psppire-data-editor.c
src/ui/gui/psppire-var-sheet.c
src/ui/gui/psppire-var-sheet.h
src/ui/gui/text-data-import-dialog.c

index ebfce1dc46b82ab83304cd1f73ad675ec3e43741..e6e23d944a600d73c7fbda2faadb12539d70e195 100644 (file)
@@ -1,11 +1,10 @@
 This is not part of the GNU PSPP program, but is used with GNU PSPP.
 
-This directory contains a version of the GtkSheet widget from the gtk-extra 
-project at http://gtkextra.sourceforge.net  The version found here has 
-major modifications developed for the needs of PSPP.  Every effort has been
-made to keep GtkSheet application independent. Thus, it should be possible
-to use this modified software for other applications.  However, the API is
-substantially different from the original.
+This directory contains a version of the GtkXPaned widget.  It includes
+minor modifications. GtkXPaned is licensed under the GNU Lesser
+General Public License.  See COPYING.LESSER. 
 
-Files in this directory ONLY are licensed under the GNU Lesser General Public 
-License.  See COPYING.LGPL
+
+This directory also contains the PsppireSheet widget which is a very
+heavily modified version of GtkSheet widget.  This modified version if
+licensed under the GNU General Public License version 3 or later.
index 9758a3eaf19f05947635ded5161ff2c5a3f3359a..a85973170588ff26cb1fb8fed4c9f9033c86282e 100644 (file)
@@ -14,8 +14,8 @@ lib_gtksheet_libgtksheet_a_SOURCES = \
        lib/gtksheet/psppire-sheetmodel.c \
        lib/gtksheet/psppire-gsheetmodel.h \
        lib/gtksheet/gtkextra-sheet.h \
-       lib/gtksheet/gtksheet.c \
-       lib/gtksheet/gtksheet.h \
+       lib/gtksheet/psppire-sheet.c \
+       lib/gtksheet/psppire-sheet.h \
        lib/gtksheet/gtkxpaned.c \
        lib/gtksheet/gtkxpaned.h \
        lib/gtksheet/psppire-axis.c \
index 7ea9b1714cc732cbec011571752a3c432d703093..16d6b5b470e396a710f83647039c6dc79e2e2660 100644 (file)
  */
 
 
-#ifndef GTK_EXTRA_SHEET_H__
-#define GTK_EXTRA_SHEET_H__
+#ifndef PSPPIRE_EXTRA_SHEET_H__
+#define PSPPIRE_EXTRA_SHEET_H__
 
 
-struct _GtkSheet ;
+struct _PsppireSheet ;
 
-typedef struct _GtkSheet GtkSheet;
+typedef struct _PsppireSheet PsppireSheet;
 
 
-struct _GtkSheetButton
+struct _PsppireSheetButton
 {
   GtkStateType state;
   gchar *label;
@@ -42,20 +42,20 @@ struct _GtkSheetButton
   GtkJustification justification;
 };
 
-struct _GtkSheetCell
+struct _PsppireSheetCell
 {
   gint row;
   gint col;
 };
 
-typedef struct _GtkSheetButton GtkSheetButton;
-typedef struct _GtkSheetCell GtkSheetCell;
+typedef struct _PsppireSheetButton PsppireSheetButton;
+typedef struct _PsppireSheetCell PsppireSheetCell;
 
-GtkSheetButton * gtk_sheet_button_new (void);
+PsppireSheetButton * psppire_sheet_button_new (void);
 
-void gtk_sheet_button_free (GtkSheetButton *button);
+void psppire_sheet_button_free (PsppireSheetButton *button);
 
 
-#endif /* GTK_EXTRA_SHEET_H__ */
+#endif /* PSPPIRE_EXTRA_SHEET_H__ */
 
 
diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
deleted file mode 100644 (file)
index 977d3bb..0000000
+++ /dev/null
@@ -1,5451 +0,0 @@
-/*
- * Copyright (C) 2006, 2008 Free Software Foundation
- *
- * This version of GtkSheet has been *heavily* modified, for the specific
- * requirements of PSPPIRE.  The changes are copyright by the
- * Free Software Foundation.  The copyright notice for the original work is
- * below.
- */
-
-/* GtkSheet widget for Gtk+.
- * Copyright (C) 1999-2001 Adrian E. Feiguin <adrian@ifir.ifir.edu.ar>
- *
- * Based on GtkClist widget by Jay Painter, but major changes.
- * Memory allocation routines inspired on SC (Spreadsheet Calculator)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * SECTION:gtksheet
- * @short_description: spreadsheet widget for gtk2
- *
- * GtkSheet is a matrix widget for GTK+. It consists of an scrollable grid of
- * cells where you can allocate text. Cell contents can be edited interactively
- * through a specially designed entry, GtkItemEntry.
- *
- */
-#include <config.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcontainer.h>
-#include <pango/pango.h>
-#include "gtksheet.h"
-#include <gtksheet/psppire-marshal.h>
-#include "psppire-sheetmodel.h"
-#include <libpspp/misc.h>
-#include <math.h>
-
-/* sheet flags */
-enum
-  {
-    GTK_SHEET_IN_XDRAG = 1 << 1,
-    GTK_SHEET_IN_YDRAG = 1 << 2,
-    GTK_SHEET_IN_DRAG = 1 << 3,
-    GTK_SHEET_IN_SELECTION = 1 << 4,
-    GTK_SHEET_IN_RESIZE = 1 << 5
-  };
-
-#define GTK_SHEET_FLAGS(sheet) (GTK_SHEET (sheet)->flags)
-#define GTK_SHEET_SET_FLAGS(sheet,flag) (GTK_SHEET_FLAGS (sheet) |= (flag))
-#define GTK_SHEET_UNSET_FLAGS(sheet,flag) (GTK_SHEET_FLAGS (sheet) &= ~ (flag))
-
-#define GTK_SHEET_IN_XDRAG(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_XDRAG)
-#define GTK_SHEET_IN_YDRAG(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_YDRAG)
-#define GTK_SHEET_IN_DRAG(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_DRAG)
-#define GTK_SHEET_IN_SELECTION(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_SELECTION)
-#define GTK_SHEET_IN_RESIZE(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_RESIZE)
-
-#define CELL_SPACING 1
-
-#define TIMEOUT_HOVER 300
-#define COLUMN_MIN_WIDTH 10
-#define COLUMN_TITLES_HEIGHT 4
-#define DEFAULT_COLUMN_WIDTH 80
-#define DEFAULT_ROW_HEIGHT 25
-
-static void set_entry_widget_font (GtkSheet *sheet);
-
-static void gtk_sheet_update_primary_selection (GtkSheet *sheet);
-static void draw_column_title_buttons_range (GtkSheet *sheet, gint first, gint n);
-static void draw_row_title_buttons_range (GtkSheet *sheet, gint first, gint n);
-static void redraw_range (GtkSheet *sheet, GtkSheetRange *range);
-
-
-static void set_row_height (GtkSheet *sheet,
-                           gint row,
-                           gint height);
-
-static void destroy_hover_window (GtkSheetHoverTitle *);
-static GtkSheetHoverTitle *create_hover_window (void);
-
-static GtkStateType gtk_sheet_cell_get_state (GtkSheet *sheet, gint row, gint col);
-
-
-static inline  void
-dispose_string (const GtkSheet *sheet, gchar *text)
-{
-  PsppireSheetModel *model = gtk_sheet_get_model (sheet);
-
-  if ( ! model )
-    return;
-
-  if (psppire_sheet_model_free_strings (model))
-    g_free (text);
-}
-
-
-/* FIXME: Why bother with these two ? */
-
-/* returns the column index from a pixel location */
-static inline gint
-column_from_xpixel (const GtkSheet *sheet, gint pixel)
-{
-  return psppire_axis_unit_at_pixel (sheet->haxis, pixel);
-}
-
-static inline gint
-row_from_ypixel (const GtkSheet *sheet, gint pixel)
-{
-  return psppire_axis_unit_at_pixel (sheet->vaxis, pixel);
-}
-
-
-/* Return the lowest row number which is wholly or partially on
-   the visible range of the sheet */
-static inline glong
-min_visible_row (const GtkSheet *sheet)
-{
-  return row_from_ypixel (sheet, sheet->vadjustment->value);
-}
-
-static inline glong
-min_fully_visible_row (const GtkSheet *sheet)
-{
-  glong row = min_visible_row (sheet);
-
-  if ( psppire_axis_start_pixel (sheet->vaxis, row) < sheet->vadjustment->value)
-    row++;
-
-  return row;
-}
-
-static inline glong
-max_visible_row (const GtkSheet *sheet)
-{
-  return row_from_ypixel (sheet, sheet->vadjustment->value + sheet->vadjustment->page_size);
-}
-
-
-static inline glong
-max_fully_visible_row (const GtkSheet *sheet)
-{
-  glong row = max_visible_row (sheet);
-
-  if ( psppire_axis_start_pixel (sheet->vaxis, row)
-       +
-       psppire_axis_unit_size (sheet->vaxis, row)
-       > sheet->vadjustment->value)
-    row--;
-
-  return row;
-}
-
-
-/* Returns the lowest column number which is wholly or partially
-   on the sheet */
-static inline glong
-min_visible_column (const GtkSheet *sheet)
-{
-  return column_from_xpixel (sheet, sheet->hadjustment->value);
-}
-
-static inline glong
-min_fully_visible_column (const GtkSheet *sheet)
-{
-  glong col = min_visible_column (sheet);
-
-  if ( psppire_axis_start_pixel (sheet->haxis, col) < sheet->hadjustment->value)
-    col++;
-
-  return col;
-}
-
-
-/* Returns the highest column number which is wholly or partially
-   on the sheet */
-static inline glong
-max_visible_column (const GtkSheet *sheet)
-{
-  return column_from_xpixel (sheet, sheet->hadjustment->value + sheet->hadjustment->page_size);
-}
-
-static inline glong
-max_fully_visible_column (const GtkSheet *sheet)
-{
-  glong col = max_visible_column (sheet);
-
-  if ( psppire_axis_start_pixel (sheet->haxis, col)
-       +
-       psppire_axis_unit_size (sheet->haxis, col)
-       > sheet->hadjustment->value)
-    col--;
-
-  return col;
-}
-
-
-
-/* The size of the region (in pixels) around the row/column boundaries
-   where the height/width may be grabbed to change size */
-#define DRAG_WIDTH 6
-
-static gboolean
-on_column_boundary (const GtkSheet *sheet, gint x, gint *column)
-{
-  gint col;
-  gint pixel;
-
-  x += sheet->hadjustment->value;
-
-  if ( x < 0)
-    return FALSE;
-
-  col = column_from_xpixel (sheet, x);
-
-  pixel = x - DRAG_WIDTH / 2;
-  if (pixel < 0)
-    pixel = 0;
-
-  if ( column_from_xpixel (sheet, pixel) < col )
-    {
-      *column = col - 1;
-      return TRUE;
-    }
-
-  if  ( column_from_xpixel (sheet, x + DRAG_WIDTH / 2) > col )
-    {
-      *column = col;
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-on_row_boundary (const GtkSheet *sheet, gint y, gint *row)
-{
-  gint r;
-  gint pixel;
-
-  y += sheet->vadjustment->value;
-
-  if ( y < 0)
-    return FALSE;
-
-  r = row_from_ypixel (sheet, y);
-
-  pixel = y - DRAG_WIDTH / 2;
-  if (pixel < 0)
-    pixel = 0;
-
-  if ( row_from_ypixel (sheet, pixel) < r )
-    {
-      *row = r - 1;
-      return TRUE;
-    }
-
-  if  ( row_from_ypixel (sheet, y + DRAG_WIDTH / 2) > r )
-    {
-      *row = r;
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-
-static inline gboolean
-POSSIBLE_DRAG (const GtkSheet *sheet, gint x, gint y,
-              gint *drag_row, gint *drag_column)
-{
-  gint ydrag, xdrag;
-
-  /* Can't drag if nothing is selected */
-  if ( sheet->range.row0 < 0 || sheet->range.rowi < 0 ||
-       sheet->range.col0 < 0 || sheet->range.coli < 0 )
-    return FALSE;
-
-  *drag_column = column_from_xpixel (sheet, x);
-  *drag_row = row_from_ypixel (sheet, y);
-
-  if (x >= psppire_axis_start_pixel (sheet->haxis, sheet->range.col0) - DRAG_WIDTH / 2 &&
-      x <= psppire_axis_start_pixel (sheet->haxis, sheet->range.coli) +
-      psppire_axis_unit_size (sheet->haxis, sheet->range.coli) + DRAG_WIDTH / 2)
-    {
-      ydrag = psppire_axis_start_pixel (sheet->vaxis, sheet->range.row0);
-      if (y >= ydrag - DRAG_WIDTH / 2 && y <= ydrag + DRAG_WIDTH / 2)
-       {
-         *drag_row = sheet->range.row0;
-         return TRUE;
-       }
-      ydrag = psppire_axis_start_pixel (sheet->vaxis, sheet->range.rowi) +
-       psppire_axis_unit_size (sheet->vaxis, sheet->range.rowi);
-      if (y >= ydrag - DRAG_WIDTH / 2 && y <= ydrag + DRAG_WIDTH / 2)
-       {
-         *drag_row = sheet->range.rowi;
-         return TRUE;
-       }
-    }
-
-  if (y >= psppire_axis_start_pixel (sheet->vaxis, sheet->range.row0) - DRAG_WIDTH / 2 &&
-      y <= psppire_axis_start_pixel (sheet->vaxis, sheet->range.rowi) +
-      psppire_axis_unit_size (sheet->vaxis, sheet->range.rowi) + DRAG_WIDTH / 2)
-    {
-      xdrag = psppire_axis_start_pixel (sheet->haxis, sheet->range.col0);
-      if (x >= xdrag - DRAG_WIDTH / 2 && x <= xdrag + DRAG_WIDTH / 2)
-       {
-         *drag_column = sheet->range.col0;
-         return TRUE;
-       }
-      xdrag = psppire_axis_start_pixel (sheet->haxis, sheet->range.coli) +
-       psppire_axis_unit_size (sheet->haxis, sheet->range.coli);
-      if (x >= xdrag - DRAG_WIDTH / 2 && x <= xdrag + DRAG_WIDTH / 2)
-       {
-         *drag_column = sheet->range.coli;
-         return TRUE;
-       }
-    }
-
-  return FALSE;
-}
-
-static inline gboolean
-POSSIBLE_RESIZE (const GtkSheet *sheet, gint x, gint y,
-                gint *drag_row, gint *drag_column)
-{
-  gint xdrag, ydrag;
-
-  /* Can't drag if nothing is selected */
-  if ( sheet->range.row0 < 0 || sheet->range.rowi < 0 ||
-       sheet->range.col0 < 0 || sheet->range.coli < 0 )
-    return FALSE;
-
-  xdrag = psppire_axis_start_pixel (sheet->haxis, sheet->range.coli)+
-    psppire_axis_unit_size (sheet->haxis, sheet->range.coli);
-
-  ydrag = psppire_axis_start_pixel (sheet->vaxis, sheet->range.rowi) +
-    psppire_axis_unit_size (sheet->vaxis, sheet->range.rowi);
-
-  if (sheet->state == GTK_SHEET_COLUMN_SELECTED)
-    ydrag = psppire_axis_start_pixel (sheet->vaxis, min_visible_row (sheet));
-
-  if (sheet->state == GTK_SHEET_ROW_SELECTED)
-    xdrag = psppire_axis_start_pixel (sheet->haxis, min_visible_column (sheet));
-
-  *drag_column = column_from_xpixel (sheet, x);
-  *drag_row = row_from_ypixel (sheet, y);
-
-  if (x >= xdrag - DRAG_WIDTH / 2 && x <= xdrag + DRAG_WIDTH / 2 &&
-      y >= ydrag - DRAG_WIDTH / 2 && y <= ydrag + DRAG_WIDTH / 2) return TRUE;
-
-  return FALSE;
-}
-
-
-static gboolean
-rectangle_from_range (GtkSheet *sheet, const GtkSheetRange *range,
-                     GdkRectangle *r)
-{
-  g_return_val_if_fail (range, FALSE);
-
-  r->x = psppire_axis_start_pixel (sheet->haxis, range->col0);
-  r->x -= round (sheet->hadjustment->value);
-
-  r->y = psppire_axis_start_pixel (sheet->vaxis, range->row0);
-  r->y -= round (sheet->vadjustment->value);
-
-  r->width = psppire_axis_start_pixel (sheet->haxis, range->coli) -
-    psppire_axis_start_pixel (sheet->haxis, range->col0) +
-    psppire_axis_unit_size (sheet->haxis, range->coli);
-
-  r->height = psppire_axis_start_pixel (sheet->vaxis, range->rowi) -
-    psppire_axis_start_pixel (sheet->vaxis, range->row0) +
-    psppire_axis_unit_size (sheet->vaxis, range->rowi);
-
-  if ( sheet->column_titles_visible)
-    {
-      r->y += sheet->column_title_area.height;
-    }
-
-  if ( sheet->row_titles_visible)
-    {
-      r->x += sheet->row_title_area.width;
-    }
-
-  return TRUE;
-}
-
-static gboolean
-rectangle_from_cell (GtkSheet *sheet, gint row, gint col,
-                    GdkRectangle *r)
-{
-  GtkSheetRange range;
-  g_return_val_if_fail (row >= 0, FALSE);
-  g_return_val_if_fail (col >= 0, FALSE);
-
-  range.row0 = range.rowi = row;
-  range.col0 = range.coli = col;
-
-  return rectangle_from_range (sheet, &range, r);
-}
-
-
-static void gtk_sheet_class_init                (GtkSheetClass *klass);
-static void gtk_sheet_init                      (GtkSheet *sheet);
-static void gtk_sheet_dispose                   (GObject *object);
-static void gtk_sheet_finalize                          (GObject *object);
-static void gtk_sheet_style_set                 (GtkWidget *widget,
-                                                 GtkStyle *previous_style);
-static void gtk_sheet_realize                   (GtkWidget *widget);
-static void gtk_sheet_unrealize                 (GtkWidget *widget);
-static void gtk_sheet_map                       (GtkWidget *widget);
-static void gtk_sheet_unmap                     (GtkWidget *widget);
-static gint gtk_sheet_expose                    (GtkWidget *widget,
-                                                 GdkEventExpose *event);
-
-static void gtk_sheet_forall                    (GtkContainer *container,
-                                                 gboolean include_internals,
-                                                 GtkCallback callback,
-                                                 gpointer callback_data);
-
-static gboolean gtk_sheet_set_scroll_adjustments  (GtkSheet *sheet,
-                                                 GtkAdjustment *hadjustment,
-                                                 GtkAdjustment *vadjustment);
-
-static gint gtk_sheet_button_press              (GtkWidget *widget,
-                                                 GdkEventButton *event);
-static gint gtk_sheet_button_release            (GtkWidget *widget,
-                                                 GdkEventButton *event);
-static gint gtk_sheet_motion                    (GtkWidget *widget,
-                                                 GdkEventMotion *event);
-static gboolean gtk_sheet_crossing_notify           (GtkWidget *widget,
-                                                    GdkEventCrossing *event);
-static gint gtk_sheet_entry_key_press           (GtkWidget *widget,
-                                                 GdkEventKey *key);
-static gboolean gtk_sheet_key_press             (GtkWidget *widget,
-                                                 GdkEventKey *key);
-static void gtk_sheet_size_request              (GtkWidget *widget,
-                                                 GtkRequisition *requisition);
-static void gtk_sheet_size_allocate             (GtkWidget *widget,
-                                                 GtkAllocation *allocation);
-
-/* Sheet queries */
-
-static gboolean gtk_sheet_range_isvisible (const GtkSheet *sheet,
-                                          const GtkSheetRange *range);
-static gboolean gtk_sheet_cell_isvisible  (GtkSheet *sheet,
-                                          gint row, gint column);
-/* Drawing Routines */
-
-/* draw cell */
-static void gtk_sheet_cell_draw (GtkSheet *sheet, gint row, gint column);
-
-
-/* draw visible part of range. */
-static void draw_sheet_region (GtkSheet *sheet, GdkRegion *region);
-
-
-/* highlight the visible part of the selected range */
-static void gtk_sheet_range_draw_selection      (GtkSheet *sheet,
-                                                 GtkSheetRange range);
-
-/* Selection */
-
-static void gtk_sheet_real_select_range         (GtkSheet *sheet,
-                                                 const GtkSheetRange *range);
-static void gtk_sheet_real_unselect_range       (GtkSheet *sheet,
-                                                 const GtkSheetRange *range);
-static void gtk_sheet_extend_selection          (GtkSheet *sheet,
-                                                 gint row, gint column);
-static void gtk_sheet_new_selection             (GtkSheet *sheet,
-                                                 GtkSheetRange *range);
-static void gtk_sheet_draw_border               (GtkSheet *sheet,
-                                                 GtkSheetRange range);
-
-/* Active Cell handling */
-
-static void gtk_sheet_hide_entry_widget                 (GtkSheet *sheet);
-static void change_active_cell  (GtkSheet *sheet, gint row, gint col);
-static gboolean gtk_sheet_draw_active_cell      (GtkSheet *sheet);
-static void gtk_sheet_show_entry_widget                 (GtkSheet *sheet);
-static gboolean gtk_sheet_click_cell            (GtkSheet *sheet,
-                                                 gint row,
-                                                 gint column);
-
-
-/* Scrollbars */
-
-static void adjust_scrollbars                   (GtkSheet *sheet);
-static void vadjustment_value_changed           (GtkAdjustment *adjustment,
-                                                 gpointer data);
-static void hadjustment_value_changed           (GtkAdjustment *adjustment,
-                                                 gpointer data);
-
-
-static void draw_xor_vline                      (GtkSheet *sheet);
-static void draw_xor_hline                      (GtkSheet *sheet);
-static void draw_xor_rectangle                  (GtkSheet *sheet,
-                                                 GtkSheetRange range);
-
-/* Sheet Button */
-
-static void create_global_button                (GtkSheet *sheet);
-static void global_button_clicked               (GtkWidget *widget,
-                                                 gpointer data);
-/* Sheet Entry */
-
-static void create_sheet_entry                  (GtkSheet *sheet);
-static void gtk_sheet_size_allocate_entry       (GtkSheet *sheet);
-
-/* Sheet button gadgets */
-
-static void draw_column_title_buttons   (GtkSheet *sheet);
-static void draw_row_title_buttons      (GtkSheet *sheet);
-
-
-static void size_allocate_global_button         (GtkSheet *sheet);
-static void gtk_sheet_button_size_request       (GtkSheet *sheet,
-                                                 const GtkSheetButton *button,
-                                                 GtkRequisition *requisition);
-
-static void gtk_sheet_real_cell_clear           (GtkSheet *sheet,
-                                                 gint row,
-                                                 gint column);
-
-
-/* Signals */
-enum
-  {
-    SELECT_ROW,
-    SELECT_COLUMN,
-    DOUBLE_CLICK_ROW,
-    DOUBLE_CLICK_COLUMN,
-    BUTTON_EVENT_ROW,
-    BUTTON_EVENT_COLUMN,
-    SELECT_RANGE,
-    RESIZE_RANGE,
-    MOVE_RANGE,
-    TRAVERSE,
-    ACTIVATE,
-    LAST_SIGNAL
-  };
-
-static GtkContainerClass *parent_class = NULL;
-static guint sheet_signals[LAST_SIGNAL] = { 0 };
-
-
-GType
-gtk_sheet_get_type ()
-{
-  static GType sheet_type = 0;
-
-  if (!sheet_type)
-    {
-      static const GTypeInfo sheet_info =
-       {
-         sizeof (GtkSheetClass),
-         NULL,
-         NULL,
-         (GClassInitFunc) gtk_sheet_class_init,
-         NULL,
-         NULL,
-         sizeof (GtkSheet),
-         0,
-         (GInstanceInitFunc) gtk_sheet_init,
-         NULL,
-       };
-
-      sheet_type =
-       g_type_register_static (GTK_TYPE_BIN, "GtkSheet",
-                               &sheet_info, 0);
-    }
-  return sheet_type;
-}
-
-\f
-
-static GtkSheetRange*
-gtk_sheet_range_copy (const GtkSheetRange *range)
-{
-  GtkSheetRange *new_range;
-
-  g_return_val_if_fail (range != NULL, NULL);
-
-  new_range = g_new (GtkSheetRange, 1);
-
-  *new_range = *range;
-
-  return new_range;
-}
-
-static void
-gtk_sheet_range_free (GtkSheetRange *range)
-{
-  g_return_if_fail (range != NULL);
-
-  g_free (range);
-}
-
-GType
-gtk_sheet_range_get_type (void)
-{
-  static GType sheet_range_type = 0;
-
-  if (!sheet_range_type)
-    {
-      sheet_range_type =
-       g_boxed_type_register_static ("GtkSheetRange",
-                                     (GBoxedCopyFunc) gtk_sheet_range_copy,
-                                     (GBoxedFreeFunc) gtk_sheet_range_free);
-    }
-
-  return sheet_range_type;
-}
-
-static GtkSheetCell*
-gtk_sheet_cell_copy (const GtkSheetCell *cell)
-{
-  GtkSheetCell *new_cell;
-
-  g_return_val_if_fail (cell != NULL, NULL);
-
-  new_cell = g_new (GtkSheetCell, 1);
-
-  *new_cell = *cell;
-
-  return new_cell;
-}
-
-static void
-gtk_sheet_cell_free (GtkSheetCell *cell)
-{
-  g_return_if_fail (cell != NULL);
-
-  g_free (cell);
-}
-
-GType
-gtk_sheet_cell_get_type (void)
-{
-  static GType sheet_cell_type = 0;
-
-  if (!sheet_cell_type)
-    {
-      sheet_cell_type =
-       g_boxed_type_register_static ("GtkSheetCell",
-                                     (GBoxedCopyFunc) gtk_sheet_cell_copy,
-                                     (GBoxedFreeFunc) gtk_sheet_cell_free);
-    }
-
-  return sheet_cell_type;
-}
-\f
-
-/* Properties */
-enum
-  {
-    PROP_0,
-    PROP_VAXIS,
-    PROP_HAXIS,
-    PROP_MODEL
-  };
-
-static void
-resize_column (GtkSheet *sheet, gint unit, glong size)
-{
-  GtkSheetRange range;
-  range.col0 = unit;
-  range.coli = max_visible_column (sheet);
-  range.row0 = min_visible_row (sheet);
-  range.rowi = max_visible_row (sheet);
-
-  redraw_range (sheet, &range);
-
-  draw_column_title_buttons_range (sheet, range.col0, range.coli);
-}
-
-
-static void
-gtk_sheet_set_horizontal_axis (GtkSheet *sheet, PsppireAxis *a)
-{
-  if ( sheet->haxis )
-    g_object_unref (sheet->haxis);
-
-  sheet->haxis = a;
-  g_signal_connect_swapped (a, "resize-unit", G_CALLBACK (resize_column), sheet);
-
-  if ( sheet->haxis )
-    g_object_ref (sheet->haxis);
-}
-
-static void
-resize_row (GtkSheet *sheet, gint unit, glong size)
-{
-  GtkSheetRange range;
-  range.col0 = min_visible_column (sheet);
-  range.coli = max_visible_column (sheet);
-  range.row0 = unit;
-  range.rowi = max_visible_row (sheet);
-
-  redraw_range (sheet, &range);
-
-  draw_row_title_buttons_range (sheet, range.row0, range.rowi);
-}
-
-static void
-gtk_sheet_set_vertical_axis (GtkSheet *sheet, PsppireAxis *a)
-{
-  if ( sheet->vaxis )
-    g_object_unref (sheet->vaxis);
-
-  sheet->vaxis = a;
-
-  g_signal_connect_swapped (a, "resize-unit", G_CALLBACK (resize_row), sheet);
-
-  if ( sheet->vaxis )
-    g_object_ref (sheet->vaxis);
-}
-
-
-static void
-gtk_sheet_set_property (GObject         *object,
-                       guint            prop_id,
-                       const GValue    *value,
-                       GParamSpec      *pspec)
-
-{
-  GtkSheet *sheet = GTK_SHEET (object);
-
-  switch (prop_id)
-    {
-    case PROP_VAXIS:
-      gtk_sheet_set_vertical_axis (sheet, g_value_get_pointer (value));
-      break;
-    case PROP_HAXIS:
-      gtk_sheet_set_horizontal_axis (sheet, g_value_get_pointer (value));
-      break;
-    case PROP_MODEL:
-      gtk_sheet_set_model (sheet, g_value_get_pointer (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    };
-}
-
-static void
-gtk_sheet_get_property (GObject         *object,
-                       guint            prop_id,
-                       GValue          *value,
-                       GParamSpec      *pspec)
-{
-  GtkSheet *sheet = GTK_SHEET (object);
-
-  switch (prop_id)
-    {
-    case PROP_VAXIS:
-      g_value_set_pointer (value, sheet->vaxis);
-      break;
-    case PROP_HAXIS:
-      g_value_set_pointer (value, sheet->haxis);
-      break;
-    case PROP_MODEL:
-      g_value_set_pointer (value, sheet->model);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    };
-}
-
-
-static void
-gtk_sheet_class_init (GtkSheetClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  GParamSpec *haxis_spec ;
-  GParamSpec *vaxis_spec ;
-  GParamSpec *model_spec ;
-
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  /**
-   * GtkSheet::select-row
-   * @sheet: the sheet widget that emitted the signal
-   * @row: the newly selected row index
-   *
-   * A row has been selected.
-   */
-  sheet_signals[SELECT_ROW] =
-    g_signal_new ("select-row",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 offsetof (GtkSheetClass, select_row),
-                 NULL, NULL,
-                 g_cclosure_marshal_VOID__INT,
-                 G_TYPE_NONE,
-                 1,
-                 G_TYPE_INT);
-
-
-  /**
-   * GtkSheet::select - column
-   * @sheet: the sheet widget that emitted the signal
-   * @column: the newly selected column index
-   *
-   * A column has been selected.
-   */
-  sheet_signals[SELECT_COLUMN] =
-    g_signal_new ("select-column",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 offsetof (GtkSheetClass, select_column),
-                 NULL, NULL,
-                 g_cclosure_marshal_VOID__INT,
-                 G_TYPE_NONE,
-                 1,
-                 G_TYPE_INT);
-
-
-  /**
-   * GtkSheet::double-click-row
-   * @sheet: the sheet widget that emitted the signal
-   * @row: the row that was double clicked.
-   *
-   * A row's title button has been double clicked
-   */
-  sheet_signals[DOUBLE_CLICK_ROW] =
-    g_signal_new ("double-click-row",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 0,
-                 NULL, NULL,
-                 g_cclosure_marshal_VOID__INT,
-                 G_TYPE_NONE,
-                 1,
-                 G_TYPE_INT);
-
-
-  /**
-   * GtkSheet::double-click-column
-   * @sheet: the sheet widget that emitted the signal
-   * @column: the column that was double clicked.
-   *
-   * A column's title button has been double clicked
-   */
-  sheet_signals[DOUBLE_CLICK_COLUMN] =
-    g_signal_new ("double-click-column",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 0,
-                 NULL, NULL,
-                 g_cclosure_marshal_VOID__INT,
-                 G_TYPE_NONE,
-                 1,
-                 G_TYPE_INT);
-
-
-  /**
-   * GtkSheet::button-event-column
-   * @sheet: the sheet widget that emitted the signal
-   * @column: the column on which the event occured.
-   *
-   * A button event occured on a column title button
-   */
-  sheet_signals[BUTTON_EVENT_COLUMN] =
-    g_signal_new ("button-event-column",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 0,
-                 NULL, NULL,
-                 psppire_marshal_VOID__INT_POINTER,
-                 G_TYPE_NONE,
-                 2,
-                 G_TYPE_INT,
-                 G_TYPE_POINTER
-                 );
-
-
-  /**
-   * GtkSheet::button-event-row
-   * @sheet: the sheet widget that emitted the signal
-   * @column: the column on which the event occured.
-   *
-   * A button event occured on a row title button
-   */
-  sheet_signals[BUTTON_EVENT_ROW] =
-    g_signal_new ("button-event-row",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 0,
-                 NULL, NULL,
-                 psppire_marshal_VOID__INT_POINTER,
-                 G_TYPE_NONE,
-                 2,
-                 G_TYPE_INT,
-                 G_TYPE_POINTER
-                 );
-
-
-  sheet_signals[SELECT_RANGE] =
-    g_signal_new ("select-range",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 offsetof (GtkSheetClass, select_range),
-                 NULL, NULL,
-                 g_cclosure_marshal_VOID__BOXED,
-                 G_TYPE_NONE,
-                 1,
-                 GTK_TYPE_SHEET_RANGE);
-
-
-  sheet_signals[RESIZE_RANGE] =
-    g_signal_new ("resize-range",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 offsetof (GtkSheetClass, resize_range),
-                 NULL, NULL,
-                 psppire_marshal_VOID__BOXED_BOXED,
-                 G_TYPE_NONE,
-                 2,
-                 GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE
-                 );
-
-  sheet_signals[MOVE_RANGE] =
-    g_signal_new ("move-range",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 offsetof (GtkSheetClass, move_range),
-                 NULL, NULL,
-                 psppire_marshal_VOID__BOXED_BOXED,
-                 G_TYPE_NONE,
-                 2,
-                 GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE
-                 );
-
-  sheet_signals[TRAVERSE] =
-    g_signal_new ("traverse",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 offsetof (GtkSheetClass, traverse),
-                 NULL, NULL,
-                 psppire_marshal_BOOLEAN__BOXED_POINTER,
-                 G_TYPE_BOOLEAN, 2,
-                 GTK_TYPE_SHEET_CELL,
-                 G_TYPE_POINTER);
-
-
-  sheet_signals[ACTIVATE] =
-    g_signal_new ("activate",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 offsetof (GtkSheetClass, activate),
-                 NULL, NULL,
-                 psppire_marshal_VOID__INT_INT_INT_INT,
-                 G_TYPE_NONE, 4,
-                 G_TYPE_INT, G_TYPE_INT,
-                 G_TYPE_INT, G_TYPE_INT);
-
-  widget_class->set_scroll_adjustments_signal =
-    g_signal_new ("set-scroll-adjustments",
-                 G_TYPE_FROM_CLASS (object_class),
-                 G_SIGNAL_RUN_LAST,
-                 offsetof (GtkSheetClass, set_scroll_adjustments),
-                 NULL, NULL,
-                 psppire_marshal_VOID__OBJECT_OBJECT,
-                 G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
-
-  container_class->add = NULL;
-  container_class->remove = NULL;
-  container_class->forall = gtk_sheet_forall;
-
-  object_class->dispose = gtk_sheet_dispose;
-  object_class->finalize = gtk_sheet_finalize;
-
-
-  vaxis_spec =
-    g_param_spec_pointer ("vertical-axis",
-                         "Vertical Axis",
-                         "A pointer to the PsppireAxis object for the rows",
-                         G_PARAM_READABLE | G_PARAM_WRITABLE );
-
-  haxis_spec =
-    g_param_spec_pointer ("horizontal-axis",
-                         "Horizontal Axis",
-                         "A pointer to the PsppireAxis object for the columns",
-                         G_PARAM_READABLE | G_PARAM_WRITABLE );
-
-  model_spec =
-    g_param_spec_pointer ("model",
-                         "Model",
-                         "A pointer to the data model",
-                         G_PARAM_READABLE | G_PARAM_WRITABLE );
-
-
-  object_class->set_property = gtk_sheet_set_property;
-  object_class->get_property = gtk_sheet_get_property;
-
-  g_object_class_install_property (object_class,
-                                   PROP_VAXIS,
-                                   vaxis_spec);
-
-  g_object_class_install_property (object_class,
-                                   PROP_HAXIS,
-                                   haxis_spec);
-
-  g_object_class_install_property (object_class,
-                                   PROP_MODEL,
-                                   model_spec);
-
-
-  widget_class->realize = gtk_sheet_realize;
-  widget_class->unrealize = gtk_sheet_unrealize;
-  widget_class->map = gtk_sheet_map;
-  widget_class->unmap = gtk_sheet_unmap;
-  widget_class->style_set = gtk_sheet_style_set;
-  widget_class->button_press_event = gtk_sheet_button_press;
-  widget_class->button_release_event = gtk_sheet_button_release;
-  widget_class->motion_notify_event = gtk_sheet_motion;
-  widget_class->enter_notify_event = gtk_sheet_crossing_notify;
-  widget_class->leave_notify_event = gtk_sheet_crossing_notify;
-  widget_class->key_press_event = gtk_sheet_key_press;
-  widget_class->expose_event = gtk_sheet_expose;
-  widget_class->size_request = gtk_sheet_size_request;
-  widget_class->size_allocate = gtk_sheet_size_allocate;
-  widget_class->focus_in_event = NULL;
-  widget_class->focus_out_event = NULL;
-
-  klass->set_scroll_adjustments = gtk_sheet_set_scroll_adjustments;
-  klass->select_row = NULL;
-  klass->select_column = NULL;
-  klass->select_range = NULL;
-  klass->resize_range = NULL;
-  klass->move_range = NULL;
-  klass->traverse = NULL;
-  klass->activate = NULL;
-  klass->changed = NULL;
-}
-
-static void
-gtk_sheet_init (GtkSheet *sheet)
-{
-  sheet->model = NULL;
-  sheet->haxis = NULL;
-  sheet->vaxis = NULL;
-
-  sheet->flags = 0;
-  sheet->selection_mode = GTK_SELECTION_NONE;
-  sheet->state = GTK_SHEET_NORMAL;
-
-  GTK_WIDGET_UNSET_FLAGS (sheet, GTK_NO_WINDOW);
-  GTK_WIDGET_SET_FLAGS (sheet, GTK_CAN_FOCUS);
-
-  sheet->column_title_window = NULL;
-  sheet->column_title_area.x = 0;
-  sheet->column_title_area.y = 0;
-  sheet->column_title_area.width = 0;
-  sheet->column_title_area.height = DEFAULT_ROW_HEIGHT;
-
-  sheet->row_title_window = NULL;
-  sheet->row_title_area.x = 0;
-  sheet->row_title_area.y = 0;
-  sheet->row_title_area.width = DEFAULT_COLUMN_WIDTH;
-  sheet->row_title_area.height = 0;
-
-
-  sheet->active_cell.row = 0;
-  sheet->active_cell.col = 0;
-  sheet->selection_cell.row = 0;
-  sheet->selection_cell.col = 0;
-
-  sheet->range.row0 = 0;
-  sheet->range.rowi = 0;
-  sheet->range.col0 = 0;
-  sheet->range.coli = 0;
-
-  sheet->state = GTK_SHEET_NORMAL;
-
-  sheet->sheet_window = NULL;
-  sheet->entry_widget = NULL;
-  sheet->button = NULL;
-
-  sheet->hadjustment = NULL;
-  sheet->vadjustment = NULL;
-
-  sheet->cursor_drag = NULL;
-
-  sheet->xor_gc = NULL;
-  sheet->fg_gc = NULL;
-  sheet->bg_gc = NULL;
-  sheet->x_drag = 0;
-  sheet->y_drag = 0;
-  sheet->show_grid = TRUE;
-
-  sheet->motion_timer = 0;
-
-  sheet->row_titles_visible = TRUE;
-  sheet->row_title_area.width = DEFAULT_COLUMN_WIDTH;
-
-  sheet->column_titles_visible = TRUE;
-
-
-  /* create sheet entry */
-  sheet->entry_type = GTK_TYPE_ENTRY;
-  create_sheet_entry (sheet);
-
-  /* create global selection button */
-  create_global_button (sheet);
-}
-
-
-/* Cause RANGE to be redrawn. If RANGE is null, then the
-   entire visible range will be redrawn.
- */
-static void
-redraw_range (GtkSheet *sheet, GtkSheetRange *range)
-{
-  GdkRectangle rect;
-
-  if ( ! GTK_WIDGET_REALIZED (sheet))
-    return;
-
-  if ( NULL != range )
-    rectangle_from_range (sheet, range, &rect);
-  else
-    {
-      GdkRegion *r = gdk_drawable_get_visible_region (sheet->sheet_window);
-      gdk_region_get_clipbox (r, &rect);
-
-      if ( sheet->column_titles_visible)
-       {
-         rect.y += sheet->column_title_area.height;
-         rect.height -= sheet->column_title_area.height;
-       }
-
-      if ( sheet->row_titles_visible)
-       {
-         rect.x += sheet->row_title_area.width;
-         rect.width -= sheet->row_title_area.width;
-       }
-    }
-
-  gdk_window_invalidate_rect (sheet->sheet_window, &rect, FALSE);
-}
-
-
-/* Callback which occurs whenever columns are inserted / deleted in the model */
-static void
-columns_inserted_deleted_callback (PsppireSheetModel *model, gint first_column,
-                                  gint n_columns,
-                                  gpointer data)
-{
-  GtkSheet *sheet = GTK_SHEET (data);
-
-  GtkSheetRange range;
-  gint model_columns = psppire_sheet_model_get_column_count (model);
-
-
-  /* Need to update all the columns starting from the first column and onwards.
-   * Previous column are unchanged, so don't need to be updated.
-   */
-  range.col0 = first_column;
-  range.row0 = 0;
-  range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
-  range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
-
-  adjust_scrollbars (sheet);
-
-  if (sheet->active_cell.col >= model_columns)
-    change_active_cell (sheet, sheet->active_cell.row, model_columns - 1);
-
-  draw_column_title_buttons_range (sheet,
-                                  first_column, max_visible_column (sheet));
-
-
-  redraw_range (sheet, &range);
-}
-
-
-
-
-/* Callback which occurs whenever rows are inserted / deleted in the model */
-static void
-rows_inserted_deleted_callback (PsppireSheetModel *model, gint first_row,
-                               gint n_rows, gpointer data)
-{
-  GtkSheet *sheet = GTK_SHEET (data);
-
-  GtkSheetRange range;
-
-  gint model_rows = psppire_sheet_model_get_row_count (model);
-
-  /* Need to update all the rows starting from the first row and onwards.
-   * Previous rows are unchanged, so don't need to be updated.
-   */
-  range.row0 = first_row;
-  range.col0 = 0;
-  range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
-  range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
-
-  adjust_scrollbars (sheet);
-
-  if (sheet->active_cell.row >= model_rows)
-    change_active_cell (sheet, model_rows - 1, sheet->active_cell.col);
-
-  draw_row_title_buttons_range (sheet, first_row, max_visible_row (sheet));
-
-  redraw_range (sheet, &range);
-}
-
-/*
-  If row0 or rowi are negative, then all rows will be updated.
-  If col0 or coli are negative, then all columns will be updated.
-*/
-static void
-range_update_callback (PsppireSheetModel *m, gint row0, gint col0,
-                      gint rowi, gint coli, gpointer data)
-{
-  GtkSheet *sheet = GTK_SHEET (data);
-
-  GtkSheetRange range;
-
-  range.row0 = row0;
-  range.col0 = col0;
-  range.rowi = rowi;
-  range.coli = coli;
-
-  if ( !GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    return;
-
-  if ( ( row0 < 0 && col0 < 0 ) || ( rowi < 0 && coli < 0 ) )
-    {
-      redraw_range (sheet, NULL);
-      adjust_scrollbars (sheet);
-
-      draw_row_title_buttons_range (sheet, min_visible_row (sheet),
-                                      max_visible_row (sheet));
-
-      draw_column_title_buttons_range (sheet, min_visible_column (sheet),
-                                      max_visible_column (sheet));
-
-      return;
-    }
-  else if ( row0 < 0 || rowi < 0 )
-    {
-      range.row0 = min_visible_row (sheet);
-      range.rowi = max_visible_row (sheet);
-    }
-  else if ( col0 < 0 || coli < 0 )
-    {
-      range.col0 = min_visible_column (sheet);
-      range.coli = max_visible_column (sheet);
-    }
-
-  redraw_range (sheet, &range);
-}
-
-
-/**
- * gtk_sheet_new:
- * @rows: initial number of rows
- * @columns: initial number of columns
- * @title: sheet title
- * @model: the model to use for the sheet data
- *
- * Creates a new sheet widget with the given number of rows and columns.
- *
- * Returns: the new sheet widget
- */
-GtkWidget *
-gtk_sheet_new (PsppireSheetModel *model)
-{
-  GtkWidget *widget = g_object_new (GTK_TYPE_SHEET,
-                                   "model", model,
-                                   NULL);
-  return widget;
-}
-
-
-/**
- * gtk_sheet_set_model
- * @sheet: the sheet to set the model for
- * @model: the model to use for the sheet data
- *
- * Sets the model for a GtkSheet
- *
- */
-void
-gtk_sheet_set_model (GtkSheet *sheet, PsppireSheetModel *model)
-{
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (sheet->model ) g_object_unref (sheet->model);
-
-  sheet->model = model;
-
-  if ( model)
-    {
-      g_object_ref (model);
-
-      sheet->update_handler_id = g_signal_connect (model, "range_changed",
-                                                  G_CALLBACK (range_update_callback),
-                                                  sheet);
-
-      g_signal_connect (model, "rows_inserted",
-                       G_CALLBACK (rows_inserted_deleted_callback), sheet);
-
-      g_signal_connect (model, "rows_deleted",
-                       G_CALLBACK (rows_inserted_deleted_callback), sheet);
-
-      g_signal_connect (model, "columns_inserted",
-                       G_CALLBACK (columns_inserted_deleted_callback), sheet);
-
-      g_signal_connect (model, "columns_deleted",
-                       G_CALLBACK (columns_inserted_deleted_callback), sheet);
-    }
-}
-
-
-void
-gtk_sheet_change_entry (GtkSheet *sheet, GtkType entry_type)
-{
-  gint state;
-
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  state = sheet->state;
-
-  if (sheet->state == GTK_SHEET_NORMAL)
-    gtk_sheet_hide_entry_widget (sheet);
-
-  sheet->entry_type = entry_type;
-
-  create_sheet_entry (sheet);
-
-  if (state == GTK_SHEET_NORMAL)
-    {
-      gtk_sheet_show_entry_widget (sheet);
-    }
-
-}
-
-void
-gtk_sheet_show_grid (GtkSheet *sheet, gboolean show)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (show == sheet->show_grid) return;
-
-  sheet->show_grid = show;
-
-  redraw_range (sheet, NULL);
-}
-
-gboolean
-gtk_sheet_grid_visible (GtkSheet *sheet)
-{
-  g_return_val_if_fail (sheet != NULL, 0);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
-
-  return sheet->show_grid;
-}
-
-guint
-gtk_sheet_get_columns_count (GtkSheet *sheet)
-{
-  g_return_val_if_fail (sheet != NULL, 0);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
-
-  return psppire_axis_unit_count (sheet->haxis);
-}
-
-static void set_column_width (GtkSheet *sheet,
-                             gint column,
-                             gint width);
-
-
-void
-gtk_sheet_show_column_titles (GtkSheet *sheet)
-{
-  if (sheet->column_titles_visible) return;
-
-  sheet->column_titles_visible = TRUE;
-
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    return;
-
-  gdk_window_show (sheet->column_title_window);
-  gdk_window_move_resize (sheet->column_title_window,
-                         sheet->column_title_area.x,
-                         sheet->column_title_area.y,
-                         sheet->column_title_area.width,
-                         sheet->column_title_area.height);
-
-  adjust_scrollbars (sheet);
-
-  if (sheet->vadjustment)
-    g_signal_emit_by_name (sheet->vadjustment,
-                          "value_changed");
-
-  size_allocate_global_button (sheet);
-
-  if ( sheet->row_titles_visible)
-    gtk_widget_show (sheet->button);
-}
-
-
-void
-gtk_sheet_show_row_titles (GtkSheet *sheet)
-{
-  if (sheet->row_titles_visible) return;
-
-  sheet->row_titles_visible = TRUE;
-
-
-  if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    {
-      gdk_window_show (sheet->row_title_window);
-      gdk_window_move_resize (sheet->row_title_window,
-                             sheet->row_title_area.x,
-                             sheet->row_title_area.y,
-                             sheet->row_title_area.width,
-                             sheet->row_title_area.height);
-
-      adjust_scrollbars (sheet);
-    }
-
-  if (sheet->hadjustment)
-    g_signal_emit_by_name (sheet->hadjustment,
-                          "value_changed");
-
-  size_allocate_global_button (sheet);
-
-  if ( sheet->column_titles_visible)
-    gtk_widget_show (sheet->button);
-}
-
-void
-gtk_sheet_hide_column_titles (GtkSheet *sheet)
-{
-  if (!sheet->column_titles_visible) return;
-
-  sheet->column_titles_visible = FALSE;
-
-  if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    {
-      if (sheet->column_title_window)
-       gdk_window_hide (sheet->column_title_window);
-
-      gtk_widget_hide (sheet->button);
-
-      adjust_scrollbars (sheet);
-    }
-
-  if (sheet->vadjustment)
-    g_signal_emit_by_name (sheet->vadjustment,
-                          "value_changed");
-}
-
-void
-gtk_sheet_hide_row_titles (GtkSheet *sheet)
-{
-  if (!sheet->row_titles_visible) return;
-
-  sheet->row_titles_visible = FALSE;
-
-  if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    {
-      if (sheet->row_title_window)
-       gdk_window_hide (sheet->row_title_window);
-
-      gtk_widget_hide (sheet->button);
-
-      adjust_scrollbars (sheet);
-    }
-
-  if (sheet->hadjustment)
-    g_signal_emit_by_name (sheet->hadjustment,
-                          "value_changed");
-}
-
-
-/* Scroll the sheet so that the cell ROW, COLUMN is visible.
-   If {ROW,COL}_ALIGN is zero, then the cell will be placed
-   at the {top,left} of the sheet.  If it's 1, then it'll
-   be placed at the {bottom,right}.
-   ROW or COL may be -1, in which case scrolling in that dimension
-   does not occur.
- */
-void
-gtk_sheet_moveto (GtkSheet *sheet,
-                 gint row,
-                 gint col,
-                 gfloat row_align,
-                 gfloat col_align)
-{
-  gint width, height;
-
-  g_return_if_fail (row_align >= 0);
-  g_return_if_fail (col_align >= 0);
-
-  g_return_if_fail (row_align <= 1);
-  g_return_if_fail (col_align <= 1);
-
-  g_return_if_fail (col <
-                   psppire_axis_unit_count (sheet->haxis));
-  g_return_if_fail (row <
-                   psppire_axis_unit_count (sheet->vaxis));
-
-  gdk_drawable_get_size (sheet->sheet_window, &width, &height);
-
-
-  if (row >= 0)
-    {
-      gint y =  psppire_axis_start_pixel (sheet->vaxis, row);
-
-      gtk_adjustment_set_value (sheet->vadjustment, y - height * row_align);
-    }
-
-
-  if (col >= 0)
-    {
-      gint x =  psppire_axis_start_pixel (sheet->haxis, col);
-
-      gtk_adjustment_set_value (sheet->hadjustment, x - width * col_align);
-    }
-}
-
-
-void
-gtk_sheet_select_row (GtkSheet *sheet, gint row)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (row < 0 || row >= psppire_axis_unit_count (sheet->vaxis))
-    return;
-
-  if (sheet->state != GTK_SHEET_NORMAL)
-    gtk_sheet_real_unselect_range (sheet, NULL);
-
-  sheet->state = GTK_SHEET_ROW_SELECTED;
-  sheet->range.row0 = row;
-  sheet->range.col0 = 0;
-  sheet->range.rowi = row;
-  sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
-  sheet->active_cell.row = row;
-
-  g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, row);
-  gtk_sheet_real_select_range (sheet, NULL);
-}
-
-
-void
-gtk_sheet_select_column (GtkSheet *sheet, gint column)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (column < 0 || column >= psppire_axis_unit_count (sheet->haxis))
-    return;
-
-  if (sheet->state != GTK_SHEET_NORMAL)
-    gtk_sheet_real_unselect_range (sheet, NULL);
-
-  sheet->state = GTK_SHEET_COLUMN_SELECTED;
-  sheet->range.row0 = 0;
-  sheet->range.col0 = column;
-  sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
-  sheet->range.coli = column;
-  sheet->active_cell.col = column;
-
-  g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, column);
-  gtk_sheet_real_select_range (sheet, NULL);
-}
-
-
-
-
-static gboolean
-gtk_sheet_range_isvisible (const GtkSheet *sheet,
-                          const GtkSheetRange *range)
-{
-  g_return_val_if_fail (sheet != NULL, FALSE);
-
-  if (range->row0 < 0 || range->row0 >= psppire_axis_unit_count (sheet->vaxis))
-    return FALSE;
-
-  if (range->rowi < 0 || range->rowi >= psppire_axis_unit_count (sheet->vaxis))
-    return FALSE;
-
-  if (range->col0 < 0 || range->col0 >= psppire_axis_unit_count (sheet->haxis))
-    return FALSE;
-
-  if (range->coli < 0 || range->coli >= psppire_axis_unit_count (sheet->haxis))
-    return FALSE;
-
-  if (range->rowi < min_visible_row (sheet))
-    return FALSE;
-
-  if (range->row0 > max_visible_row (sheet))
-    return FALSE;
-
-  if (range->coli < min_visible_column (sheet))
-    return FALSE;
-
-  if (range->col0 > max_visible_column (sheet))
-    return FALSE;
-
-  return TRUE;
-}
-
-static gboolean
-gtk_sheet_cell_isvisible (GtkSheet *sheet,
-                         gint row, gint column)
-{
-  GtkSheetRange range;
-
-  range.row0 = row;
-  range.col0 = column;
-  range.rowi = row;
-  range.coli = column;
-
-  return gtk_sheet_range_isvisible (sheet, &range);
-}
-
-void
-gtk_sheet_get_visible_range (GtkSheet *sheet, GtkSheetRange *range)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet)) ;
-  g_return_if_fail (range != NULL);
-
-  range->row0 = min_visible_row (sheet);
-  range->col0 = min_visible_column (sheet);
-  range->rowi = max_visible_row (sheet);
-  range->coli = max_visible_column (sheet);
-}
-
-
-static gboolean
-gtk_sheet_set_scroll_adjustments (GtkSheet *sheet,
-                                 GtkAdjustment *hadjustment,
-                                 GtkAdjustment *vadjustment)
-{
-  if ( sheet->vadjustment != vadjustment )
-    {
-      if (sheet->vadjustment)
-       g_object_unref (sheet->vadjustment);
-      sheet->vadjustment = vadjustment;
-
-      if ( vadjustment)
-       {
-         g_object_ref (vadjustment);
-
-         g_signal_connect (sheet->vadjustment, "value_changed",
-                           G_CALLBACK (vadjustment_value_changed),
-                           sheet);
-       }
-    }
-
-  if ( sheet->hadjustment != hadjustment )
-    {
-      if (sheet->hadjustment)
-       g_object_unref (sheet->hadjustment);
-
-      sheet->hadjustment = hadjustment;
-
-      if ( hadjustment)
-       {
-         g_object_ref (hadjustment);
-
-         g_signal_connect (sheet->hadjustment, "value_changed",
-                           G_CALLBACK (hadjustment_value_changed),
-                           sheet);
-       }
-    }
-  return TRUE;
-}
-
-static void
-gtk_sheet_finalize (GObject *object)
-{
-  GtkSheet *sheet;
-
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (GTK_IS_SHEET (object));
-
-  sheet = GTK_SHEET (object);
-
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    (*G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-gtk_sheet_dispose  (GObject *object)
-{
-  GtkSheet *sheet = GTK_SHEET (object);
-
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (GTK_IS_SHEET (object));
-
-  if ( sheet->dispose_has_run )
-    return ;
-
-  sheet->dispose_has_run = TRUE;
-
-  if (sheet->model) g_object_unref (sheet->model);
-  if (sheet->vaxis) g_object_unref (sheet->vaxis);
-  if (sheet->haxis) g_object_unref (sheet->haxis);
-
-  g_object_unref (sheet->button);
-  sheet->button = NULL;
-
-  /* unref adjustments */
-  if (sheet->hadjustment)
-    {
-      g_signal_handlers_disconnect_matched (sheet->hadjustment,
-                                           G_SIGNAL_MATCH_DATA,
-                                           0, 0, 0, 0,
-                                           sheet);
-
-      g_object_unref (sheet->hadjustment);
-      sheet->hadjustment = NULL;
-    }
-
-  if (sheet->vadjustment)
-    {
-      g_signal_handlers_disconnect_matched (sheet->vadjustment,
-                                           G_SIGNAL_MATCH_DATA,
-                                           0, 0, 0, 0,
-                                           sheet);
-
-      g_object_unref (sheet->vadjustment);
-
-      sheet->vadjustment = NULL;
-    }
-
-  if (G_OBJECT_CLASS (parent_class)->dispose)
-    (*G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-gtk_sheet_style_set (GtkWidget *widget,
-                    GtkStyle *previous_style)
-{
-  GtkSheet *sheet;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_SHEET (widget));
-
-  if (GTK_WIDGET_CLASS (parent_class)->style_set)
-    (*GTK_WIDGET_CLASS (parent_class)->style_set) (widget, previous_style);
-
-  sheet = GTK_SHEET (widget);
-
-  if (GTK_WIDGET_REALIZED (widget))
-    {
-      gtk_style_set_background (widget->style, widget->window, widget->state);
-    }
-
-  set_entry_widget_font (sheet);
-}
-
-#define BORDER_WIDTH 3
-
-static void
-gtk_sheet_realize (GtkWidget *widget)
-{
-  GtkSheet *sheet;
-  GdkWindowAttr attributes;
-  const gint attributes_mask =
-    GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR;
-
-  GdkGCValues values;
-  GdkColormap *colormap;
-  GdkDisplay *display;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_SHEET (widget));
-
-  sheet = GTK_SHEET (widget);
-
-  colormap = gtk_widget_get_colormap (widget);
-  display = gtk_widget_get_display (widget);
-
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y;
-  attributes.width = widget->allocation.width;
-  attributes.height = widget->allocation.height;
-  attributes.wclass = GDK_INPUT_OUTPUT;
-
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = colormap;
-
-  attributes.event_mask = gtk_widget_get_events (widget);
-  attributes.event_mask |= (GDK_EXPOSURE_MASK |
-                           GDK_BUTTON_PRESS_MASK |
-                           GDK_BUTTON_RELEASE_MASK |
-                           GDK_KEY_PRESS_MASK |
-                           GDK_ENTER_NOTIFY_MASK |
-                           GDK_LEAVE_NOTIFY_MASK |
-                           GDK_POINTER_MOTION_MASK |
-                           GDK_POINTER_MOTION_HINT_MASK);
-
-  attributes.cursor = gdk_cursor_new_for_display (display, GDK_TOP_LEFT_ARROW);
-
-  /* main window */
-  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
-
-  gdk_window_set_user_data (widget->window, sheet);
-
-  widget->style = gtk_style_attach (widget->style, widget->window);
-
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-
-  gdk_color_parse ("white", &sheet->color[BG_COLOR]);
-  gdk_colormap_alloc_color (colormap, &sheet->color[BG_COLOR], FALSE,
-                           TRUE);
-  gdk_color_parse ("gray", &sheet->color[GRID_COLOR]);
-  gdk_colormap_alloc_color (colormap, &sheet->color[GRID_COLOR], FALSE,
-                           TRUE);
-
-  attributes.x = 0;
-  attributes.y = 0;
-  attributes.width = sheet->column_title_area.width;
-  attributes.height = sheet->column_title_area.height;
-
-
-  /* column - title window */
-  sheet->column_title_window =
-    gdk_window_new (widget->window, &attributes, attributes_mask);
-  gdk_window_set_user_data (sheet->column_title_window, sheet);
-  gtk_style_set_background (widget->style, sheet->column_title_window,
-                           GTK_STATE_NORMAL);
-
-
-  attributes.x = 0;
-  attributes.y = 0;
-  attributes.width = sheet->row_title_area.width;
-  attributes.height = sheet->row_title_area.height;
-
-  /* row - title window */
-  sheet->row_title_window = gdk_window_new (widget->window,
-                                           &attributes, attributes_mask);
-  gdk_window_set_user_data (sheet->row_title_window, sheet);
-  gtk_style_set_background (widget->style, sheet->row_title_window,
-                           GTK_STATE_NORMAL);
-
-  /* sheet - window */
-  attributes.cursor = gdk_cursor_new_for_display (display, GDK_PLUS);
-
-  attributes.x = 0;
-  attributes.y = 0;
-
-  sheet->sheet_window = gdk_window_new (widget->window,
-                                       &attributes, attributes_mask);
-  gdk_window_set_user_data (sheet->sheet_window, sheet);
-
-  gdk_cursor_unref (attributes.cursor);
-
-  gdk_window_set_background (sheet->sheet_window, &widget->style->white);
-  gdk_window_show (sheet->sheet_window);
-
-  /* GCs */
-  sheet->fg_gc = gdk_gc_new (widget->window);
-  sheet->bg_gc = gdk_gc_new (widget->window);
-
-  values.foreground = widget->style->white;
-  values.function = GDK_INVERT;
-  values.subwindow_mode = GDK_INCLUDE_INFERIORS;
-  values.line_width = BORDER_WIDTH;
-
-  sheet->xor_gc = gdk_gc_new_with_values (widget->window,
-                                         &values,
-                                         GDK_GC_FOREGROUND |
-                                         GDK_GC_FUNCTION |
-                                         GDK_GC_SUBWINDOW |
-                                         GDK_GC_LINE_WIDTH
-                                         );
-
-
-  gtk_widget_set_parent_window (sheet->entry_widget, sheet->sheet_window);
-  gtk_widget_set_parent (sheet->entry_widget, GTK_WIDGET (sheet));
-
-  gtk_widget_set_parent_window (sheet->button, sheet->sheet_window);
-  gtk_widget_set_parent (sheet->button, GTK_WIDGET (sheet));
-
-
-  sheet->cursor_drag = gdk_cursor_new_for_display (display, GDK_PLUS);
-
-  if (sheet->column_titles_visible)
-    gdk_window_show (sheet->column_title_window);
-  if (sheet->row_titles_visible)
-    gdk_window_show (sheet->row_title_window);
-
-  sheet->hover_window = create_hover_window ();
-
-  draw_row_title_buttons (sheet);
-  draw_column_title_buttons (sheet);
-
-  gtk_sheet_update_primary_selection (sheet);
-
-
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-}
-
-static void
-create_global_button (GtkSheet *sheet)
-{
-  sheet->button = gtk_button_new_with_label (" ");
-
-  GTK_WIDGET_UNSET_FLAGS(sheet->button, GTK_CAN_FOCUS);
-
-  g_object_ref_sink (sheet->button);
-
-  g_signal_connect (sheet->button,
-                   "pressed",
-                   G_CALLBACK (global_button_clicked),
-                   sheet);
-}
-
-static void
-size_allocate_global_button (GtkSheet *sheet)
-{
-  GtkAllocation allocation;
-
-  if (!sheet->column_titles_visible) return;
-  if (!sheet->row_titles_visible) return;
-
-  gtk_widget_size_request (sheet->button, NULL);
-
-  allocation.x = 0;
-  allocation.y = 0;
-  allocation.width = sheet->row_title_area.width;
-  allocation.height = sheet->column_title_area.height;
-
-  gtk_widget_size_allocate (sheet->button, &allocation);
-}
-
-static void
-global_button_clicked (GtkWidget *widget, gpointer data)
-{
-  gtk_sheet_click_cell (GTK_SHEET (data), -1, -1);
-}
-
-
-static void
-gtk_sheet_unrealize (GtkWidget *widget)
-{
-  GtkSheet *sheet;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_SHEET (widget));
-
-  sheet = GTK_SHEET (widget);
-
-  gdk_cursor_unref (sheet->cursor_drag);
-  sheet->cursor_drag = NULL;
-
-  gdk_colormap_free_colors (gtk_widget_get_colormap (widget),
-                           sheet->color, n_COLORS);
-
-  g_object_unref (sheet->xor_gc);
-  g_object_unref (sheet->fg_gc);
-  g_object_unref (sheet->bg_gc);
-
-  destroy_hover_window (sheet->hover_window);
-
-  gdk_window_destroy (sheet->sheet_window);
-  gdk_window_destroy (sheet->column_title_window);
-  gdk_window_destroy (sheet->row_title_window);
-
-  gtk_widget_unparent (sheet->entry_widget);
-  if (sheet->button != NULL)
-    gtk_widget_unparent (sheet->button);
-
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
-
-static void
-gtk_sheet_map (GtkWidget *widget)
-{
-  GtkSheet *sheet = GTK_SHEET (widget);
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_SHEET (widget));
-
-  if (!GTK_WIDGET_MAPPED (widget))
-    {
-      GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-
-      gdk_window_show (widget->window);
-      gdk_window_show (sheet->sheet_window);
-
-      if (sheet->column_titles_visible)
-       {
-         draw_column_title_buttons (sheet);
-         gdk_window_show (sheet->column_title_window);
-       }
-      if (sheet->row_titles_visible)
-       {
-         draw_row_title_buttons (sheet);
-         gdk_window_show (sheet->row_title_window);
-       }
-
-      if (!GTK_WIDGET_MAPPED (sheet->entry_widget)
-         && sheet->active_cell.row >= 0
-         && sheet->active_cell.col >= 0 )
-       {
-         gtk_widget_show (sheet->entry_widget);
-         gtk_widget_map (sheet->entry_widget);
-       }
-
-      if (!GTK_WIDGET_MAPPED (sheet->button))
-       {
-         gtk_widget_show (sheet->button);
-         gtk_widget_map (sheet->button);
-       }
-
-      redraw_range (sheet, NULL);
-      change_active_cell (sheet,
-                    sheet->active_cell.row,
-                    sheet->active_cell.col);
-    }
-}
-
-static void
-gtk_sheet_unmap (GtkWidget *widget)
-{
-  GtkSheet *sheet = GTK_SHEET (widget);
-
-  if (!GTK_WIDGET_MAPPED (widget))
-    return;
-
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-
-  gdk_window_hide (sheet->sheet_window);
-  if (sheet->column_titles_visible)
-    gdk_window_hide (sheet->column_title_window);
-  if (sheet->row_titles_visible)
-    gdk_window_hide (sheet->row_title_window);
-  gdk_window_hide (widget->window);
-
-  if (GTK_WIDGET_MAPPED (sheet->entry_widget))
-    gtk_widget_unmap (sheet->entry_widget);
-
-  if (GTK_WIDGET_MAPPED (sheet->button))
-    gtk_widget_unmap (sheet->button);
-}
-
-
-static void
-gtk_sheet_cell_draw (GtkSheet *sheet, gint row, gint col)
-{
-  PangoLayout *layout;
-  PangoRectangle text;
-  PangoFontDescription *font_desc = GTK_WIDGET (sheet)->style->font_desc;
-  gint font_height;
-
-  gchar *label;
-
-  GtkSheetCellAttr attributes;
-  GdkRectangle area;
-
-  g_return_if_fail (sheet != NULL);
-
-  /* bail now if we aren't yet drawable */
-  if (!GTK_WIDGET_DRAWABLE (sheet)) return;
-
-  if (row < 0 ||
-      row >= psppire_axis_unit_count (sheet->vaxis))
-    return;
-
-  if (col < 0 ||
-      col >= psppire_axis_unit_count (sheet->haxis))
-    return;
-
-  gtk_sheet_get_attributes (sheet, row, col, &attributes);
-
-  /* select GC for background rectangle */
-  gdk_gc_set_foreground (sheet->fg_gc, &attributes.foreground);
-  gdk_gc_set_foreground (sheet->bg_gc, &attributes.background);
-
-  rectangle_from_cell (sheet, row, col, &area);
-
-  gdk_gc_set_line_attributes (sheet->fg_gc, 1, 0, 0, 0);
-
-  if (sheet->show_grid)
-    {
-      gdk_gc_set_foreground (sheet->bg_gc, &sheet->color[GRID_COLOR]);
-
-      gdk_draw_rectangle (sheet->sheet_window,
-                         sheet->bg_gc,
-                         FALSE,
-                         area.x, area.y,
-                         area.width, area.height);
-    }
-
-
-  label = gtk_sheet_cell_get_text (sheet, row, col);
-  if (NULL == label)
-    return;
-
-
-  layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), label);
-  dispose_string (sheet, label);
-
-
-  pango_layout_set_font_description (layout, font_desc);
-
-  pango_layout_get_pixel_extents (layout, NULL, &text);
-
-  gdk_gc_set_clip_rectangle (sheet->fg_gc, &area);
-
-  font_height = pango_font_description_get_size (font_desc);
-  if ( !pango_font_description_get_size_is_absolute (font_desc))
-    font_height /= PANGO_SCALE;
-
-  /* Centre the text vertically */
-  area.y += (area.height - font_height) / 2.0;
-
-  switch (attributes.justification)
-    {
-    case GTK_JUSTIFY_RIGHT:
-      area.x += area.width - text.width;
-      break;
-    case GTK_JUSTIFY_CENTER:
-      area.x += (area.width - text.width) / 2.0;
-      break;
-    case GTK_JUSTIFY_LEFT:
-      /* Do nothing */
-      break;
-    default:
-      g_critical ("Unhandled justification %d in column %d\n",
-                attributes.justification, col);
-      break;
-    }
-
-  gdk_draw_layout (sheet->sheet_window, sheet->fg_gc,
-                  area.x,
-                  area.y,
-                  layout);
-
-  gdk_gc_set_clip_rectangle (sheet->fg_gc, NULL);
-  g_object_unref (layout);
-}
-
-
-static void
-draw_sheet_region (GtkSheet *sheet, GdkRegion *region)
-{
-  GtkSheetRange range;
-  GdkRectangle area;
-  gint y, x;
-  gint i, j;
-
-  GtkSheetRange drawing_range;
-
-  gdk_region_get_clipbox (region, &area);
-
-  y = area.y + sheet->vadjustment->value;
-  x = area.x + sheet->hadjustment->value;
-
-  if ( sheet->column_titles_visible)
-    y -= sheet->column_title_area.height;
-
-  if ( sheet->row_titles_visible)
-    x -= sheet->row_title_area.width;
-
-  maximize_int (&x, 0);
-  maximize_int (&y, 0);
-
-  range.row0 = row_from_ypixel (sheet, y);
-  range.rowi = row_from_ypixel (sheet, y + area.height);
-
-  range.col0 = column_from_xpixel (sheet, x);
-  range.coli = column_from_xpixel (sheet, x + area.width);
-
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_SHEET (sheet));
-
-  if (!GTK_WIDGET_DRAWABLE (GTK_WIDGET (sheet))) return;
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-  if (!GTK_WIDGET_MAPPED (GTK_WIDGET (sheet))) return;
-
-
-  drawing_range.row0 = MAX (range.row0, min_visible_row (sheet));
-  drawing_range.col0 = MAX (range.col0, min_visible_column (sheet));
-  drawing_range.rowi = MIN (range.rowi, max_visible_row (sheet));
-  drawing_range.coli = MIN (range.coli, max_visible_column (sheet));
-
-  g_return_if_fail (drawing_range.rowi >= drawing_range.row0);
-  g_return_if_fail (drawing_range.coli >= drawing_range.col0);
-
-  for (i = drawing_range.row0; i <= drawing_range.rowi; i++)
-    {
-      for (j = drawing_range.col0; j <= drawing_range.coli; j++)
-       gtk_sheet_cell_draw (sheet, i, j);
-    }
-
-  if (sheet->state != GTK_SHEET_NORMAL &&
-      gtk_sheet_range_isvisible (sheet, &sheet->range))
-    gtk_sheet_range_draw_selection (sheet, drawing_range);
-
-
-  if (sheet->state == GTK_STATE_NORMAL &&
-      sheet->active_cell.row >= drawing_range.row0 &&
-      sheet->active_cell.row <= drawing_range.rowi &&
-      sheet->active_cell.col >= drawing_range.col0 &&
-      sheet->active_cell.col <= drawing_range.coli)
-    gtk_sheet_show_entry_widget (sheet);
-}
-
-
-static void
-gtk_sheet_range_draw_selection (GtkSheet *sheet, GtkSheetRange range)
-{
-  GdkRectangle area;
-  gint i, j;
-  GtkSheetRange aux;
-
-  if (range.col0 > sheet->range.coli || range.coli < sheet->range.col0 ||
-      range.row0 > sheet->range.rowi || range.rowi < sheet->range.row0)
-    return;
-
-  if (!gtk_sheet_range_isvisible (sheet, &range)) return;
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-
-  aux = range;
-
-  range.col0 = MAX (sheet->range.col0, range.col0);
-  range.coli = MIN (sheet->range.coli, range.coli);
-  range.row0 = MAX (sheet->range.row0, range.row0);
-  range.rowi = MIN (sheet->range.rowi, range.rowi);
-
-  range.col0 = MAX (range.col0, min_visible_column (sheet));
-  range.coli = MIN (range.coli, max_visible_column (sheet));
-  range.row0 = MAX (range.row0, min_visible_row (sheet));
-  range.rowi = MIN (range.rowi, max_visible_row (sheet));
-
-  for (i = range.row0; i <= range.rowi; i++)
-    {
-      for (j = range.col0; j <= range.coli; j++)
-       {
-         if (gtk_sheet_cell_get_state (sheet, i, j) == GTK_STATE_SELECTED)
-           {
-             rectangle_from_cell (sheet, i, j, &area);
-
-             if (i == sheet->range.row0)
-               {
-                 area.y = area.y + 2;
-                 area.height = area.height - 2;
-               }
-             if (i == sheet->range.rowi) area.height = area.height - 3;
-             if (j == sheet->range.col0)
-               {
-                 area.x = area.x + 2;
-                 area.width = area.width - 2;
-               }
-             if (j == sheet->range.coli) area.width = area.width - 3;
-
-             if (i != sheet->active_cell.row || j != sheet->active_cell.col)
-               {
-                 gdk_draw_rectangle (sheet->sheet_window,
-                                     sheet->xor_gc,
-                                     TRUE,
-                                     area.x + 1, area.y + 1,
-                                     area.width, area.height);
-               }
-           }
-
-       }
-    }
-
-  gtk_sheet_draw_border (sheet, sheet->range);
-}
-
-static inline gint
-safe_strcmp (const gchar *s1, const gchar *s2)
-{
-  if ( !s1 && !s2) return 0;
-  if ( !s1) return -1;
-  if ( !s2) return +1;
-  return strcmp (s1, s2);
-}
-
-static void
-gtk_sheet_set_cell (GtkSheet *sheet, gint row, gint col,
-                   GtkJustification justification,
-                   const gchar *text)
-{
-  PsppireSheetModel *model ;
-  gchar *old_text ;
-
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (col >= psppire_axis_unit_count (sheet->haxis)
-      || row >= psppire_axis_unit_count (sheet->vaxis))
-    return;
-
-  if (col < 0 || row < 0) return;
-
-  model = gtk_sheet_get_model (sheet);
-
-  old_text = psppire_sheet_model_get_string (model, row, col);
-
-  if (0 != safe_strcmp (old_text, text))
-    {
-      g_signal_handler_block    (sheet->model, sheet->update_handler_id);
-      psppire_sheet_model_set_string (model, text, row, col);
-      g_signal_handler_unblock  (sheet->model, sheet->update_handler_id);
-    }
-
-  if ( psppire_sheet_model_free_strings (model))
-    g_free (old_text);
-}
-
-
-void
-gtk_sheet_cell_clear (GtkSheet *sheet, gint row, gint column)
-{
-  GtkSheetRange range;
-
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-  if (column >= psppire_axis_unit_count (sheet->haxis) ||
-      row >= psppire_axis_unit_count (sheet->vaxis)) return;
-
-  if (column < 0 || row < 0) return;
-
-  range.row0 = row;
-  range.rowi = row;
-  range.col0 = min_visible_column (sheet);
-  range.coli = max_visible_column (sheet);
-
-  gtk_sheet_real_cell_clear (sheet, row, column);
-
-  redraw_range (sheet, &range);
-}
-
-static void
-gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column)
-{
-  PsppireSheetModel *model = gtk_sheet_get_model (sheet);
-
-  gchar *old_text = gtk_sheet_cell_get_text (sheet, row, column);
-
-  if (old_text && strlen (old_text) > 0 )
-    {
-      psppire_sheet_model_datum_clear (model, row, column);
-    }
-
-  dispose_string (sheet, old_text);
-}
-
-gchar *
-gtk_sheet_cell_get_text (const GtkSheet *sheet, gint row, gint col)
-{
-  PsppireSheetModel *model;
-  g_return_val_if_fail (sheet != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL);
-
-  if (col >= psppire_axis_unit_count (sheet->haxis) || row >= psppire_axis_unit_count (sheet->vaxis))
-    return NULL;
-  if (col < 0 || row < 0) return NULL;
-
-  model = gtk_sheet_get_model (sheet);
-
-  if ( !model )
-    return NULL;
-
-  return psppire_sheet_model_get_string (model, row, col);
-}
-
-
-static GtkStateType
-gtk_sheet_cell_get_state (GtkSheet *sheet, gint row, gint col)
-{
-  gint state;
-  GtkSheetRange *range;
-
-  g_return_val_if_fail (sheet != NULL, 0);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
-  if (col >= psppire_axis_unit_count (sheet->haxis) || row >= psppire_axis_unit_count (sheet->vaxis)) return 0;
-  if (col < 0 || row < 0) return 0;
-
-  state = sheet->state;
-  range = &sheet->range;
-
-  switch (state)
-    {
-    case GTK_SHEET_NORMAL:
-      return GTK_STATE_NORMAL;
-      break;
-    case GTK_SHEET_ROW_SELECTED:
-      if (row >= range->row0 && row <= range->rowi)
-       return GTK_STATE_SELECTED;
-      break;
-    case GTK_SHEET_COLUMN_SELECTED:
-      if (col >= range->col0 && col <= range->coli)
-       return GTK_STATE_SELECTED;
-      break;
-    case GTK_SHEET_RANGE_SELECTED:
-      if (row >= range->row0 && row <= range->rowi && \
-         col >= range->col0 && col <= range->coli)
-       return GTK_STATE_SELECTED;
-      break;
-    }
-  return GTK_STATE_NORMAL;
-}
-
-/* Convert X, Y (in pixels) to *ROW, *COLUMN
-   If the function returns FALSE, then the results will be unreliable.
-*/
-static gboolean
-gtk_sheet_get_pixel_info (GtkSheet *sheet,
-                         gint x,
-                         gint y,
-                         gint *row,
-                         gint *column)
-{
-  gint trow, tcol;
-  *row = -G_MAXINT;
-  *column = -G_MAXINT;
-
-  g_return_val_if_fail (sheet != NULL, 0);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
-
-  /* bounds checking, return false if the user clicked
-     on a blank area */
-  if (y < 0)
-    return FALSE;
-
-  if (x < 0)
-    return FALSE;
-
-  if ( sheet->column_titles_visible)
-    y -= sheet->column_title_area.height;
-
-  y += sheet->vadjustment->value;
-
-  if ( y < 0 && sheet->column_titles_visible)
-    {
-      trow = -1;
-    }
-  else
-    {
-      trow = row_from_ypixel (sheet, y);
-      if (trow > psppire_axis_unit_count (sheet->vaxis))
-       return FALSE;
-    }
-
-  *row = trow;
-
-  if ( sheet->row_titles_visible)
-    x -= sheet->row_title_area.width;
-
-  x += sheet->hadjustment->value;
-
-  if ( x < 0 && sheet->row_titles_visible)
-    {
-      tcol = -1;
-    }
-  else
-    {
-      tcol = column_from_xpixel (sheet, x);
-      if (tcol > psppire_axis_unit_count (sheet->haxis))
-       return FALSE;
-    }
-
-  *column = tcol;
-
-  return TRUE;
-}
-
-gboolean
-gtk_sheet_get_cell_area (GtkSheet *sheet,
-                        gint row,
-                        gint column,
-                        GdkRectangle *area)
-{
-  g_return_val_if_fail (sheet != NULL, 0);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
-
-  if (row >= psppire_axis_unit_count (sheet->vaxis) || column >= psppire_axis_unit_count (sheet->haxis))
-    return FALSE;
-
-  area->x = (column == -1) ? 0 : psppire_axis_start_pixel (sheet->haxis, column);
-  area->y = (row == -1)    ? 0 : psppire_axis_start_pixel (sheet->vaxis, row);
-
-  area->width= (column == -1) ? sheet->row_title_area.width
-    : psppire_axis_unit_size (sheet->haxis, column);
-
-  area->height= (row == -1) ? sheet->column_title_area.height
-    : psppire_axis_unit_size (sheet->vaxis, row);
-
-  return TRUE;
-}
-
-void
-gtk_sheet_set_active_cell (GtkSheet *sheet, gint row, gint col)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (row < -1 || col < -1)
-    return;
-
-  if (row >= psppire_axis_unit_count (sheet->vaxis)
-      ||
-      col >= psppire_axis_unit_count (sheet->haxis))
-    return;
-
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    return;
-
-  if ( row == -1 || col == -1)
-    {
-      gtk_sheet_hide_entry_widget (sheet);
-      return;
-    }
-
-  change_active_cell (sheet, row, col);
-}
-
-void
-gtk_sheet_get_active_cell (GtkSheet *sheet, gint *row, gint *column)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if ( row ) *row = sheet->active_cell.row;
-  if (column) *column = sheet->active_cell.col;
-}
-
-static void
-entry_load_text (GtkSheet *sheet)
-{
-  gint row, col;
-  const char *text;
-  GtkJustification justification;
-  GtkSheetCellAttr attributes;
-
-  if (!GTK_WIDGET_VISIBLE (sheet->entry_widget)) return;
-  if (sheet->state != GTK_STATE_NORMAL) return;
-
-  row = sheet->active_cell.row;
-  col = sheet->active_cell.col;
-
-  if (row < 0 || col < 0) return;
-
-  text = gtk_entry_get_text (gtk_sheet_get_entry (sheet));
-
-  if (text && strlen (text) > 0)
-    {
-      gtk_sheet_get_attributes (sheet, row, col, &attributes);
-      justification = attributes.justification;
-      gtk_sheet_set_cell (sheet, row, col, justification, text);
-    }
-}
-
-
-static void
-gtk_sheet_hide_entry_widget (GtkSheet *sheet)
-{
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    return;
-
-  if (sheet->active_cell.row < 0 ||
-      sheet->active_cell.col < 0) return;
-
-  gtk_widget_hide (sheet->entry_widget);
-  gtk_widget_unmap (sheet->entry_widget);
-
-  GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE);
-}
-
-static void
-change_active_cell (GtkSheet *sheet, gint row, gint col)
-{
-  gint old_row, old_col;
-
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (row < 0 || col < 0)
-    return;
-
-  if ( row > psppire_axis_unit_count (sheet->vaxis)
-       || col > psppire_axis_unit_count (sheet->haxis))
-    return;
-
-  if (sheet->state != GTK_SHEET_NORMAL)
-    {
-      sheet->state = GTK_SHEET_NORMAL;
-      gtk_sheet_real_unselect_range (sheet, NULL);
-    }
-
-  old_row = sheet->active_cell.row;
-  old_col = sheet->active_cell.col;
-
-  /* Erase the old cell */
-  gtk_sheet_draw_active_cell (sheet);
-
-  entry_load_text (sheet);
-
-  sheet->range.row0 = row;
-  sheet->range.col0 = col;
-  sheet->range.rowi = row;
-  sheet->range.coli = col;
-  sheet->active_cell.row = row;
-  sheet->active_cell.col = col;
-  sheet->selection_cell.row = row;
-  sheet->selection_cell.col = col;
-
-  GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-
-  GTK_WIDGET_UNSET_FLAGS (sheet->entry_widget, GTK_HAS_FOCUS);
-
-  gtk_sheet_draw_active_cell (sheet);
-  gtk_sheet_show_entry_widget (sheet);
-
-  GTK_WIDGET_SET_FLAGS (sheet->entry_widget, GTK_HAS_FOCUS);
-
-  g_signal_emit (sheet, sheet_signals [ACTIVATE], 0,
-                row, col, old_row, old_col);
-
-}
-
-static void
-gtk_sheet_show_entry_widget (GtkSheet *sheet)
-{
-  GtkEntry *sheet_entry;
-  GtkSheetCellAttr attributes;
-
-  gint row, col;
-
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  row = sheet->active_cell.row;
-  col = sheet->active_cell.col;
-
-  /* Don't show the active cell, if there is no active cell: */
-  if (! (row >= 0 && col >= 0)) /* e.g row or coll == -1. */
-    return;
-
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-  if (sheet->state != GTK_SHEET_NORMAL) return;
-  if (GTK_SHEET_IN_SELECTION (sheet)) return;
-
-  GTK_WIDGET_SET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE);
-
-  sheet_entry = gtk_sheet_get_entry (sheet);
-
-  gtk_sheet_get_attributes (sheet, row, col, &attributes);
-
-  if (GTK_IS_ENTRY (sheet_entry))
-    {
-      gchar *text = gtk_sheet_cell_get_text (sheet, row, col);
-      const gchar *old_text = gtk_entry_get_text (GTK_ENTRY (sheet_entry));
-
-      if ( ! text )
-       text = g_strdup ("");
-
-      if (strcmp (old_text, text) != 0)
-       gtk_entry_set_text (sheet_entry, text);
-      
-      dispose_string (sheet, text);
-
-       {
-         switch (attributes.justification)
-           {
-           case GTK_JUSTIFY_RIGHT:
-             gtk_entry_set_alignment (GTK_ENTRY (sheet_entry), 1.0);
-             break;
-           case GTK_JUSTIFY_CENTER:
-             gtk_entry_set_alignment (GTK_ENTRY (sheet_entry), 0.5);
-             break;
-           case GTK_JUSTIFY_LEFT:
-           default:
-             gtk_entry_set_alignment (GTK_ENTRY (sheet_entry), 0.0);
-             break;
-           }
-       }
-    }
-
-  gtk_sheet_size_allocate_entry (sheet);
-
-  gtk_widget_set_sensitive (GTK_WIDGET (sheet_entry),
-                           psppire_sheet_model_is_editable (sheet->model,
-                                                      row, col));
-  gtk_widget_map (sheet->entry_widget);
-}
-
-static gboolean
-gtk_sheet_draw_active_cell (GtkSheet *sheet)
-{
-  gint row, col;
-  GtkSheetRange range;
-
-  row = sheet->active_cell.row;
-  col = sheet->active_cell.col;
-
-  if (row < 0 || col < 0) return FALSE;
-
-  if (!gtk_sheet_cell_isvisible (sheet, row, col))
-    return FALSE;
-
-  range.col0 = range.coli = col;
-  range.row0 = range.rowi = row;
-
-  gtk_sheet_draw_border (sheet, range);
-
-  return FALSE;
-}
-
-
-
-static void
-gtk_sheet_new_selection (GtkSheet *sheet, GtkSheetRange *range)
-{
-  gint i, j, mask1, mask2;
-  gint state, selected;
-  gint x, y, width, height;
-  GtkSheetRange new_range, aux_range;
-
-  g_return_if_fail (sheet != NULL);
-
-  if (range == NULL) range=&sheet->range;
-
-  new_range=*range;
-
-  range->row0 = MIN (range->row0, sheet->range.row0);
-  range->rowi = MAX (range->rowi, sheet->range.rowi);
-  range->col0 = MIN (range->col0, sheet->range.col0);
-  range->coli = MAX (range->coli, sheet->range.coli);
-
-  range->row0 = MAX (range->row0, min_visible_row (sheet));
-  range->rowi = MIN (range->rowi, max_visible_row (sheet));
-  range->col0 = MAX (range->col0, min_visible_column (sheet));
-  range->coli = MIN (range->coli, max_visible_column (sheet));
-
-  aux_range.row0 = MAX (new_range.row0, min_visible_row (sheet));
-  aux_range.rowi = MIN (new_range.rowi, max_visible_row (sheet));
-  aux_range.col0 = MAX (new_range.col0, min_visible_column (sheet));
-  aux_range.coli = MIN (new_range.coli, max_visible_column (sheet));
-
-  for (i = range->row0; i <= range->rowi; i++)
-    {
-      for (j = range->col0; j <= range->coli; j++)
-       {
-
-         state = gtk_sheet_cell_get_state (sheet, i, j);
-         selected= (i <= new_range.rowi && i >= new_range.row0 &&
-                    j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
-
-         if (state == GTK_STATE_SELECTED && selected &&
-             (i == sheet->range.row0 || i == sheet->range.rowi ||
-              j == sheet->range.col0 || j == sheet->range.coli ||
-              i == new_range.row0 || i == new_range.rowi ||
-              j == new_range.col0 || j == new_range.coli))
-           {
-
-             mask1 = i == sheet->range.row0 ? 1 : 0;
-             mask1 = i == sheet->range.rowi ? mask1 + 2 : mask1;
-             mask1 = j == sheet->range.col0 ? mask1 + 4 : mask1;
-             mask1 = j == sheet->range.coli ? mask1 + 8 : mask1;
-
-             mask2 = i == new_range.row0 ? 1 : 0;
-             mask2 = i == new_range.rowi ? mask2 + 2 : mask2;
-             mask2 = j == new_range.col0 ? mask2 + 4 : mask2;
-             mask2 = j == new_range.coli ? mask2 + 8 : mask2;
-
-             if (mask1 != mask2)
-               {
-                 x = psppire_axis_start_pixel (sheet->haxis, j);
-                 y = psppire_axis_start_pixel (sheet->vaxis, i);
-                 width = psppire_axis_start_pixel (sheet->haxis, j)- x+
-                   psppire_axis_unit_size (sheet->haxis, j);
-                 height = psppire_axis_start_pixel (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
-
-                 if (i == sheet->range.row0)
-                   {
-                     y = y - 3;
-                     height = height + 3;
-                   }
-                 if (i == sheet->range.rowi) height = height + 3;
-                 if (j == sheet->range.col0)
-                   {
-                     x = x - 3;
-                     width = width + 3;
-                   }
-                 if (j == sheet->range.coli) width = width + 3;
-
-                 if (i != sheet->active_cell.row || j != sheet->active_cell.col)
-                   {
-                     x = psppire_axis_start_pixel (sheet->haxis, j);
-                     y = psppire_axis_start_pixel (sheet->vaxis, i);
-                     width = psppire_axis_start_pixel (sheet->haxis, j)- x+
-                       psppire_axis_unit_size (sheet->haxis, j);
-
-                     height = psppire_axis_start_pixel (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
-
-                     if (i == new_range.row0)
-                       {
-                         y = y+2;
-                         height = height - 2;
-                       }
-                     if (i == new_range.rowi) height = height - 3;
-                     if (j == new_range.col0)
-                       {
-                         x = x+2;
-                         width = width - 2;
-                       }
-                     if (j == new_range.coli) width = width - 3;
-
-                     gdk_draw_rectangle (sheet->sheet_window,
-                                         sheet->xor_gc,
-                                         TRUE,
-                                         x + 1, y + 1,
-                                         width, height);
-                   }
-               }
-           }
-       }
-    }
-
-  for (i = range->row0; i <= range->rowi; i++)
-    {
-      for (j = range->col0; j <= range->coli; j++)
-       {
-
-         state = gtk_sheet_cell_get_state (sheet, i, j);
-         selected= (i <= new_range.rowi && i >= new_range.row0 &&
-                    j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
-
-         if (state == GTK_STATE_SELECTED && !selected)
-           {
-
-             x = psppire_axis_start_pixel (sheet->haxis, j);
-             y = psppire_axis_start_pixel (sheet->vaxis, i);
-             width = psppire_axis_start_pixel (sheet->haxis, j) - x + psppire_axis_unit_size (sheet->haxis, j);
-             height = psppire_axis_start_pixel (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
-
-             if (i == sheet->range.row0)
-               {
-                 y = y - 3;
-                 height = height + 3;
-               }
-             if (i == sheet->range.rowi) height = height + 3;
-             if (j == sheet->range.col0)
-               {
-                 x = x - 3;
-                 width = width + 3;
-               }
-             if (j == sheet->range.coli) width = width + 3;
-
-           }
-       }
-    }
-
-  for (i = range->row0; i <= range->rowi; i++)
-    {
-      for (j = range->col0; j <= range->coli; j++)
-       {
-
-         state = gtk_sheet_cell_get_state (sheet, i, j);
-         selected= (i <= new_range.rowi && i >= new_range.row0 &&
-                    j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
-
-         if (state != GTK_STATE_SELECTED && selected &&
-             (i != sheet->active_cell.row || j != sheet->active_cell.col))
-           {
-
-             x = psppire_axis_start_pixel (sheet->haxis, j);
-             y = psppire_axis_start_pixel (sheet->vaxis, i);
-             width = psppire_axis_start_pixel (sheet->haxis, j) - x + psppire_axis_unit_size (sheet->haxis, j);
-             height = psppire_axis_start_pixel (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
-
-             if (i == new_range.row0)
-               {
-                 y = y+2;
-                 height = height - 2;
-               }
-             if (i == new_range.rowi) height = height - 3;
-             if (j == new_range.col0)
-               {
-                 x = x+2;
-                 width = width - 2;
-               }
-             if (j == new_range.coli) width = width - 3;
-
-             gdk_draw_rectangle (sheet->sheet_window,
-                                 sheet->xor_gc,
-                                 TRUE,
-                                 x + 1, y + 1,
-                                 width, height);
-
-           }
-
-       }
-    }
-
-  for (i = aux_range.row0; i <= aux_range.rowi; i++)
-    {
-      for (j = aux_range.col0; j <= aux_range.coli; j++)
-       {
-         state = gtk_sheet_cell_get_state (sheet, i, j);
-
-         mask1 = i == sheet->range.row0 ? 1 : 0;
-         mask1 = i == sheet->range.rowi ? mask1 + 2 : mask1;
-         mask1 = j == sheet->range.col0 ? mask1 + 4 : mask1;
-         mask1 = j == sheet->range.coli ? mask1 + 8 : mask1;
-
-         mask2 = i == new_range.row0 ? 1 : 0;
-         mask2 = i == new_range.rowi ? mask2 + 2 : mask2;
-         mask2 = j == new_range.col0 ? mask2 + 4 : mask2;
-         mask2 = j == new_range.coli ? mask2 + 8 : mask2;
-         if (mask2 != mask1 || (mask2 == mask1 && state != GTK_STATE_SELECTED))
-           {
-             x = psppire_axis_start_pixel (sheet->haxis, j);
-             y = psppire_axis_start_pixel (sheet->vaxis, i);
-             width = psppire_axis_unit_size (sheet->haxis, j);
-             height = psppire_axis_unit_size (sheet->vaxis, i);
-             if (mask2 & 1)
-               gdk_draw_rectangle (sheet->sheet_window,
-                                   sheet->xor_gc,
-                                   TRUE,
-                                   x + 1, y - 1,
-                                   width, 3);
-
-
-             if (mask2 & 2)
-               gdk_draw_rectangle (sheet->sheet_window,
-                                   sheet->xor_gc,
-                                   TRUE,
-                                   x + 1, y + height - 1,
-                                   width, 3);
-
-             if (mask2 & 4)
-               gdk_draw_rectangle (sheet->sheet_window,
-                                   sheet->xor_gc,
-                                   TRUE,
-                                   x - 1, y + 1,
-                                   3, height);
-
-
-             if (mask2 & 8)
-               gdk_draw_rectangle (sheet->sheet_window,
-                                   sheet->xor_gc,
-                                   TRUE,
-                                   x + width - 1, y + 1,
-                                   3, height);
-           }
-       }
-    }
-
-  *range = new_range;
-}
-
-
-
-static void
-gtk_sheet_draw_border (GtkSheet *sheet, GtkSheetRange new_range)
-{
-  GdkRectangle area;
-
-  rectangle_from_range (sheet, &new_range, &area);
-
-  gdk_draw_rectangle (sheet->sheet_window,
-                     sheet->xor_gc,
-                     FALSE,
-                     area.x, area.y,
-                     area.width, area.height);
-}
-
-
-static void
-gtk_sheet_real_select_range (GtkSheet *sheet,
-                            const GtkSheetRange *range)
-{
-  gint state;
-
-  g_return_if_fail (sheet != NULL);
-
-  if (range == NULL) range = &sheet->range;
-
-  memcpy (&sheet->range, range, sizeof (*range));
-
-  if (range->row0 < 0 || range->rowi < 0) return;
-  if (range->col0 < 0 || range->coli < 0) return;
-
-  state = sheet->state;
-
-#if 0
-  if (range->coli != sheet->range.coli || range->col0 != sheet->range.col0 ||
-      range->rowi != sheet->range.rowi || range->row0 != sheet->range.row0)
-    {
-      gtk_sheet_new_selection (sheet, &sheet->range);
-    }
-  else
-    {
-      gtk_sheet_range_draw_selection (sheet, sheet->range);
-    }
-#endif
-
-  gtk_sheet_update_primary_selection (sheet);
-
-  g_signal_emit (sheet, sheet_signals[SELECT_RANGE], 0, &sheet->range);
-}
-
-
-void
-gtk_sheet_get_selected_range (GtkSheet *sheet, GtkSheetRange *range)
-{
-  g_return_if_fail (sheet != NULL);
-  *range = sheet->range;
-}
-
-
-void
-gtk_sheet_select_range (GtkSheet *sheet, const GtkSheetRange *range)
-{
-  g_return_if_fail (sheet != NULL);
-
-  if (range == NULL) range=&sheet->range;
-
-  if (range->row0 < 0 || range->rowi < 0) return;
-  if (range->col0 < 0 || range->coli < 0) return;
-
-
-  if (sheet->state != GTK_SHEET_NORMAL)
-    gtk_sheet_real_unselect_range (sheet, NULL);
-
-  sheet->range.row0 = range->row0;
-  sheet->range.rowi = range->rowi;
-  sheet->range.col0 = range->col0;
-  sheet->range.coli = range->coli;
-  sheet->active_cell.row = range->row0;
-  sheet->active_cell.col = range->col0;
-  sheet->selection_cell.row = range->rowi;
-  sheet->selection_cell.col = range->coli;
-
-  sheet->state = GTK_SHEET_RANGE_SELECTED;
-  gtk_sheet_real_select_range (sheet, NULL);
-}
-
-void
-gtk_sheet_unselect_range (GtkSheet *sheet)
-{
-  if (! GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    return;
-
-  gtk_sheet_real_unselect_range (sheet, NULL);
-  sheet->state = GTK_STATE_NORMAL;
-
-  change_active_cell (sheet,
-                sheet->active_cell.row, sheet->active_cell.col);
-}
-
-
-static void
-gtk_sheet_real_unselect_range (GtkSheet *sheet,
-                              const GtkSheetRange *range)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)));
-
-  if ( range == NULL)
-    range = &sheet->range;
-
-  if (range->row0 < 0 || range->rowi < 0) return;
-  if (range->col0 < 0 || range->coli < 0) return;
-
-  g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, -1);
-  g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, -1);
-
-  sheet->range.row0 = -1;
-  sheet->range.rowi = -1;
-  sheet->range.col0 = -1;
-  sheet->range.coli = -1;
-}
-
-
-static gint
-gtk_sheet_expose (GtkWidget *widget,
-                 GdkEventExpose *event)
-{
-  GtkSheet *sheet = GTK_SHEET (widget);
-
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  if (!GTK_WIDGET_DRAWABLE (widget))
-    return FALSE;
-
-  /* exposure events on the sheet */
-  if (event->window == sheet->row_title_window &&
-      sheet->row_titles_visible)
-    {
-      draw_row_title_buttons_range (sheet,
-                                   min_visible_row (sheet),
-                                   max_visible_row (sheet));
-    }
-
-  if (event->window == sheet->column_title_window &&
-      sheet->column_titles_visible)
-    {
-      draw_column_title_buttons_range (sheet,
-                                      min_visible_column (sheet),
-                                      max_visible_column (sheet));
-    }
-
-  if (event->window == sheet->sheet_window)
-    {
-      draw_sheet_region (sheet, event->region);
-
-#if 0
-      if (sheet->state != GTK_SHEET_NORMAL)
-       {
-         if (gtk_sheet_range_isvisible (sheet, &sheet->range))
-           gtk_sheet_range_draw (sheet, &sheet->range);
-
-         if (GTK_SHEET_IN_RESIZE (sheet) || GTK_SHEET_IN_DRAG (sheet))
-           gtk_sheet_range_draw (sheet, &sheet->drag_range);
-
-         if (gtk_sheet_range_isvisible (sheet, &sheet->range))
-           gtk_sheet_range_draw_selection (sheet, sheet->range);
-         if (GTK_SHEET_IN_RESIZE (sheet) || GTK_SHEET_IN_DRAG (sheet))
-           draw_xor_rectangle (sheet, sheet->drag_range);
-       }
-#endif
-
-      if ((!GTK_SHEET_IN_XDRAG (sheet)) && (!GTK_SHEET_IN_YDRAG (sheet)))
-       {
-         GdkRectangle rect;
-         GtkSheetRange range;
-         range.row0 = range.rowi =  sheet->active_cell.row;
-         range.col0 = range.coli =  sheet->active_cell.col;
-
-         rectangle_from_range (sheet, &range, &rect);
-
-         if (GDK_OVERLAP_RECTANGLE_OUT !=
-             gdk_region_rect_in (event->region, &rect))
-           {
-             gtk_sheet_draw_active_cell (sheet);
-           }
-       }
-
-    }
-
-  (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
-
-  return FALSE;
-}
-
-
-static gboolean
-gtk_sheet_button_press (GtkWidget *widget,
-                       GdkEventButton *event)
-{
-  GtkSheet *sheet;
-  GdkModifierType mods;
-  gint x, y;
-  gint  row, column;
-  gboolean veto;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_SHEET (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  sheet = GTK_SHEET (widget);
-
-  /* Cancel any pending tooltips */
-  if (sheet->motion_timer)
-    {
-      g_source_remove (sheet->motion_timer);
-      sheet->motion_timer = 0;
-    }
-
-  gtk_widget_get_pointer (widget, &x, &y);
-  gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
-
-
-  if (event->window == sheet->column_title_window)
-    {
-      sheet->x_drag = event->x;
-      g_signal_emit (sheet,
-                    sheet_signals[BUTTON_EVENT_COLUMN], 0,
-                    column, event);
-
-      if (psppire_sheet_model_get_column_sensitivity (sheet->model, column))
-       {
-         if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
-           g_signal_emit (sheet,
-                          sheet_signals[DOUBLE_CLICK_COLUMN], 0, column);
-       }
-    }
-  else if (event->window == sheet->row_title_window)
-    {
-      g_signal_emit (sheet,
-                    sheet_signals[BUTTON_EVENT_ROW], 0,
-                    row, event);
-
-      if (psppire_sheet_model_get_row_sensitivity (sheet->model, row))
-       {
-         if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
-           g_signal_emit (sheet,
-                          sheet_signals[DOUBLE_CLICK_ROW], 0, row);
-       }
-    }
-
-  gdk_window_get_pointer (widget->window, NULL, NULL, &mods);
-
-  if (! (mods & GDK_BUTTON1_MASK)) return TRUE;
-
-
-  /* press on resize windows */
-  if (event->window == sheet->column_title_window)
-    {
-      sheet->x_drag = event->x;
-
-      if (on_column_boundary (sheet, sheet->x_drag, &sheet->drag_cell.col))
-       {
-         GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_XDRAG);
-         gdk_pointer_grab (sheet->column_title_window, FALSE,
-                           GDK_POINTER_MOTION_HINT_MASK |
-                           GDK_BUTTON1_MOTION_MASK |
-                           GDK_BUTTON_RELEASE_MASK,
-                           NULL, NULL, event->time);
-
-         draw_xor_vline (sheet);
-         return TRUE;
-       }
-    }
-
-  if (event->window == sheet->row_title_window)
-    {
-      sheet->y_drag = event->y;
-
-      if (on_row_boundary (sheet, sheet->y_drag, &sheet->drag_cell.row))
-       {
-         GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_YDRAG);
-         gdk_pointer_grab (sheet->row_title_window, FALSE,
-                           GDK_POINTER_MOTION_HINT_MASK |
-                           GDK_BUTTON1_MOTION_MASK |
-                           GDK_BUTTON_RELEASE_MASK,
-                           NULL, NULL, event->time);
-
-         draw_xor_hline (sheet);
-         return TRUE;
-       }
-    }
-
-  /* the sheet itself does not handle other than single click events */
-  if (event->type != GDK_BUTTON_PRESS) return FALSE;
-
-  /* selections on the sheet */
-  if (event->window == sheet->sheet_window)
-    {
-      gtk_widget_get_pointer (widget, &x, &y);
-      gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
-      gdk_pointer_grab (sheet->sheet_window, FALSE,
-                       GDK_POINTER_MOTION_HINT_MASK |
-                       GDK_BUTTON1_MOTION_MASK |
-                       GDK_BUTTON_RELEASE_MASK,
-                       NULL, NULL, event->time);
-      gtk_grab_add (GTK_WIDGET (sheet));
-
-      if (sheet->selection_mode != GTK_SELECTION_SINGLE &&
-         sheet->selection_mode != GTK_SELECTION_NONE &&
-         sheet->cursor_drag->type == GDK_SIZING &&
-         !GTK_SHEET_IN_SELECTION (sheet) && !GTK_SHEET_IN_RESIZE (sheet))
-       {
-         if (sheet->state == GTK_STATE_NORMAL)
-           {
-             row = sheet->active_cell.row;
-             column = sheet->active_cell.col;
-             sheet->active_cell.row = row;
-             sheet->active_cell.col = column;
-             sheet->drag_range = sheet->range;
-             sheet->state = GTK_SHEET_RANGE_SELECTED;
-             gtk_sheet_select_range (sheet, &sheet->drag_range);
-           }
-         sheet->x_drag = x;
-         sheet->y_drag = y;
-         if (row > sheet->range.rowi) row--;
-         if (column > sheet->range.coli) column--;
-         sheet->drag_cell.row = row;
-         sheet->drag_cell.col = column;
-         sheet->drag_range = sheet->range;
-         draw_xor_rectangle (sheet, sheet->drag_range);
-         GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_RESIZE);
-       }
-      else if (sheet->cursor_drag->type == GDK_TOP_LEFT_ARROW &&
-              !GTK_SHEET_IN_SELECTION (sheet)
-              && ! GTK_SHEET_IN_DRAG (sheet)
-              && sheet->active_cell.row >= 0
-              && sheet->active_cell.col >= 0
-              )
-       {
-         if (sheet->state == GTK_STATE_NORMAL)
-           {
-             row = sheet->active_cell.row;
-             column = sheet->active_cell.col;
-             sheet->active_cell.row = row;
-             sheet->active_cell.col = column;
-             sheet->drag_range = sheet->range;
-             sheet->state = GTK_SHEET_RANGE_SELECTED;
-             gtk_sheet_select_range (sheet, &sheet->drag_range);
-           }
-         sheet->x_drag = x;
-         sheet->y_drag = y;
-         if (row < sheet->range.row0) row++;
-         if (row > sheet->range.rowi) row--;
-         if (column < sheet->range.col0) column++;
-         if (column > sheet->range.coli) column--;
-         sheet->drag_cell.row = row;
-         sheet->drag_cell.col = column;
-         sheet->drag_range = sheet->range;
-         draw_xor_rectangle (sheet, sheet->drag_range);
-         GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_DRAG);
-       }
-      else
-       {
-         veto = gtk_sheet_click_cell (sheet, row, column);
-         if (veto) GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-       }
-    }
-
-  if (event->window == sheet->column_title_window)
-    {
-      gtk_widget_get_pointer (widget, &x, &y);
-      if ( sheet->row_titles_visible)
-       x -= sheet->row_title_area.width;
-
-      x += sheet->hadjustment->value;
-
-      column = column_from_xpixel (sheet, x);
-
-      if (psppire_sheet_model_get_column_sensitivity (sheet->model, column))
-       {
-         veto = gtk_sheet_click_cell (sheet, -1, column);
-         gtk_grab_add (GTK_WIDGET (sheet));
-         GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-       }
-    }
-
-  if (event->window == sheet->row_title_window)
-    {
-      gtk_widget_get_pointer (widget, &x, &y);
-      if ( sheet->column_titles_visible)
-       y -= sheet->column_title_area.height;
-
-      y += sheet->vadjustment->value;
-
-      row = row_from_ypixel (sheet, y);
-      if (psppire_sheet_model_get_row_sensitivity (sheet->model, row))
-       {
-         veto = gtk_sheet_click_cell (sheet, row, -1);
-         gtk_grab_add (GTK_WIDGET (sheet));
-         GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-       }
-    }
-
-  return TRUE;
-}
-
-static gboolean
-gtk_sheet_click_cell (GtkSheet *sheet, gint row, gint column)
-{
-  GtkSheetCell cell;
-  gboolean forbid_move;
-
-  cell.row = row;
-  cell.col = column;
-
-  if (row >= psppire_axis_unit_count (sheet->vaxis)
-      || column >= psppire_axis_unit_count (sheet->haxis))
-    {
-      return FALSE;
-    }
-
-  g_signal_emit (sheet, sheet_signals[TRAVERSE], 0,
-                &sheet->active_cell,
-                &cell,
-                &forbid_move);
-
-  if (forbid_move)
-    {
-      if (sheet->state == GTK_STATE_NORMAL)
-       return FALSE;
-
-      row = sheet->active_cell.row;
-      column = sheet->active_cell.col;
-
-      change_active_cell (sheet, row, column);
-      return FALSE;
-    }
-
-  if (row == -1 && column >= 0)
-    {
-      gtk_sheet_select_column (sheet, column);
-      return TRUE;
-    }
-
-  if (column == -1 && row >= 0)
-    {
-      gtk_sheet_select_row (sheet, row);
-      return TRUE;
-    }
-
-  if (row == -1 && column == -1)
-    {
-      sheet->range.row0 = 0;
-      sheet->range.col0 = 0;
-      sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
-      sheet->range.coli =
-       psppire_axis_unit_count (sheet->haxis) - 1;
-      sheet->active_cell.row = 0;
-      sheet->active_cell.col = 0;
-      gtk_sheet_select_range (sheet, NULL);
-      return TRUE;
-    }
-
-  if (sheet->state != GTK_SHEET_NORMAL)
-    {
-      sheet->state = GTK_SHEET_NORMAL;
-      gtk_sheet_real_unselect_range (sheet, NULL);
-    }
-  else
-    {
-      change_active_cell (sheet, row, column);
-    }
-
-  sheet->active_cell.row = row;
-  sheet->active_cell.col = column;
-  sheet->selection_cell.row = row;
-  sheet->selection_cell.col = column;
-  sheet->range.row0 = row;
-  sheet->range.col0 = column;
-  sheet->range.rowi = row;
-  sheet->range.coli = column;
-  sheet->state = GTK_SHEET_NORMAL;
-  GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-
-  gtk_widget_grab_focus (GTK_WIDGET (sheet->entry_widget));
-
-  return TRUE;
-}
-
-static gint
-gtk_sheet_button_release (GtkWidget *widget,
-                         GdkEventButton *event)
-{
-  GdkDisplay *display = gtk_widget_get_display (widget);
-
-  GtkSheet *sheet = GTK_SHEET (widget);
-
-  /* release on resize windows */
-  if (GTK_SHEET_IN_XDRAG (sheet))
-    {
-      gint width;
-      GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_XDRAG);
-      GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-
-      gdk_display_pointer_ungrab (display, event->time);
-      draw_xor_vline (sheet);
-
-      width = event->x -
-       psppire_axis_start_pixel (sheet->haxis, sheet->drag_cell.col)
-       + sheet->hadjustment->value;
-
-      set_column_width (sheet, sheet->drag_cell.col, width);
-
-      return TRUE;
-    }
-
-  if (GTK_SHEET_IN_YDRAG (sheet))
-    {
-      gint height;
-      GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_YDRAG);
-      GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-
-      gdk_display_pointer_ungrab (display, event->time);
-      draw_xor_hline (sheet);
-
-      height = event->y -
-       psppire_axis_start_pixel (sheet->vaxis, sheet->drag_cell.row) +
-       sheet->vadjustment->value;
-
-      set_row_height (sheet, sheet->drag_cell.row, height);
-
-      return TRUE;
-    }
-
-  if (GTK_SHEET_IN_DRAG (sheet))
-    {
-      GtkSheetRange old_range;
-      draw_xor_rectangle (sheet, sheet->drag_range);
-      GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_DRAG);
-      gdk_display_pointer_ungrab (display, event->time);
-
-      gtk_sheet_real_unselect_range (sheet, NULL);
-
-      sheet->active_cell.row = sheet->active_cell.row +
-       (sheet->drag_range.row0 - sheet->range.row0);
-      sheet->active_cell.col = sheet->active_cell.col +
-       (sheet->drag_range.col0 - sheet->range.col0);
-      sheet->selection_cell.row = sheet->selection_cell.row +
-       (sheet->drag_range.row0 - sheet->range.row0);
-      sheet->selection_cell.col = sheet->selection_cell.col +
-       (sheet->drag_range.col0 - sheet->range.col0);
-      old_range = sheet->range;
-      sheet->range = sheet->drag_range;
-      sheet->drag_range = old_range;
-      g_signal_emit (sheet, sheet_signals[MOVE_RANGE], 0,
-                    &sheet->drag_range, &sheet->range);
-      gtk_sheet_select_range (sheet, &sheet->range);
-    }
-
-  if (GTK_SHEET_IN_RESIZE (sheet))
-    {
-      GtkSheetRange old_range;
-      draw_xor_rectangle (sheet, sheet->drag_range);
-      GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_RESIZE);
-      gdk_display_pointer_ungrab (display, event->time);
-
-      gtk_sheet_real_unselect_range (sheet, NULL);
-
-      sheet->active_cell.row = sheet->active_cell.row +
-       (sheet->drag_range.row0 - sheet->range.row0);
-      sheet->active_cell.col = sheet->active_cell.col +
-       (sheet->drag_range.col0 - sheet->range.col0);
-      if (sheet->drag_range.row0 < sheet->range.row0)
-       sheet->selection_cell.row = sheet->drag_range.row0;
-      if (sheet->drag_range.rowi >= sheet->range.rowi)
-       sheet->selection_cell.row = sheet->drag_range.rowi;
-      if (sheet->drag_range.col0 < sheet->range.col0)
-       sheet->selection_cell.col = sheet->drag_range.col0;
-      if (sheet->drag_range.coli >= sheet->range.coli)
-       sheet->selection_cell.col = sheet->drag_range.coli;
-      old_range = sheet->range;
-      sheet->range = sheet->drag_range;
-      sheet->drag_range = old_range;
-
-      if (sheet->state == GTK_STATE_NORMAL) sheet->state = GTK_SHEET_RANGE_SELECTED;
-      g_signal_emit (sheet, sheet_signals[RESIZE_RANGE], 0,
-                    &sheet->drag_range, &sheet->range);
-      gtk_sheet_select_range (sheet, &sheet->range);
-    }
-
-  if (sheet->state == GTK_SHEET_NORMAL && GTK_SHEET_IN_SELECTION (sheet))
-    {
-      GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-      gdk_display_pointer_ungrab (display, event->time);
-      change_active_cell (sheet, sheet->active_cell.row,
-                              sheet->active_cell.col);
-    }
-
-  if (GTK_SHEET_IN_SELECTION)
-    gdk_display_pointer_ungrab (display, event->time);
-  gtk_grab_remove (GTK_WIDGET (sheet));
-
-  GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-
-  return TRUE;
-}
-
-\f
-
-
-
-/* Shamelessly lifted from gtktooltips */
-static gboolean
-gtk_sheet_subtitle_paint_window (GtkWidget *tip_window)
-{
-  GtkRequisition req;
-
-  gtk_widget_size_request (tip_window, &req);
-  gtk_paint_flat_box (tip_window->style, tip_window->window,
-                     GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                     NULL, GTK_WIDGET(tip_window), "tooltip",
-                     0, 0, req.width, req.height);
-
-  return FALSE;
-}
-
-static void
-destroy_hover_window (GtkSheetHoverTitle *h)
-{
-  gtk_widget_destroy (h->window);
-  g_free (h);
-}
-
-static GtkSheetHoverTitle *
-create_hover_window (void)
-{
-  GtkSheetHoverTitle *hw = g_malloc (sizeof (*hw));
-
-  hw->window = gtk_window_new (GTK_WINDOW_POPUP);
-
-#if GTK_CHECK_VERSION (2, 9, 0)
-  gtk_window_set_type_hint (GTK_WINDOW (hw->window),
-                           GDK_WINDOW_TYPE_HINT_TOOLTIP);
-#endif
-
-  gtk_widget_set_app_paintable (hw->window, TRUE);
-  gtk_window_set_resizable (GTK_WINDOW (hw->window), FALSE);
-  gtk_widget_set_name (hw->window, "gtk-tooltips");
-  gtk_container_set_border_width (GTK_CONTAINER (hw->window), 4);
-
-  g_signal_connect (hw->window,
-                   "expose_event",
-                   G_CALLBACK (gtk_sheet_subtitle_paint_window),
-                   NULL);
-
-  hw->label = gtk_label_new (NULL);
-
-
-  gtk_label_set_line_wrap (GTK_LABEL (hw->label), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (hw->label), 0.5, 0.5);
-
-  gtk_container_add (GTK_CONTAINER (hw->window), hw->label);
-
-  gtk_widget_show (hw->label);
-
-  g_signal_connect (hw->window,
-                   "destroy",
-                   G_CALLBACK (gtk_widget_destroyed),
-                   &hw->window);
-
-  return hw;
-}
-
-#define HOVER_WINDOW_Y_OFFSET 2
-
-static void
-show_subtitle (GtkSheet *sheet, gint row, gint column, const gchar *subtitle)
-{
-  gint x, y;
-  gint px, py;
-  gint width;
-
-  if ( ! subtitle )
-    return;
-
-  gtk_label_set_text (GTK_LABEL (sheet->hover_window->label),
-                     subtitle);
-
-
-  sheet->hover_window->row = row;
-  sheet->hover_window->column = column;
-
-  gdk_window_get_origin (GTK_WIDGET (sheet)->window, &x, &y);
-
-  gtk_widget_get_pointer (GTK_WIDGET (sheet), &px, &py);
-
-  gtk_widget_show (sheet->hover_window->window);
-
-  width = GTK_WIDGET (sheet->hover_window->label)->allocation.width;
-
-  if (row == -1 )
-    {
-      x += px;
-      x -= width / 2;
-      y += sheet->column_title_area.y;
-      y += sheet->column_title_area.height;
-      y += HOVER_WINDOW_Y_OFFSET;
-    }
-
-  if ( column == -1 )
-    {
-      y += py;
-      x += sheet->row_title_area.x;
-      x += sheet->row_title_area.width * 2 / 3.0;
-    }
-
-  gtk_window_move (GTK_WINDOW (sheet->hover_window->window),
-                  x, y);
-}
-
-static gboolean
-motion_timeout_callback (gpointer data)
-{
-  GtkSheet *sheet = GTK_SHEET (data);
-  gint x, y;
-  gint row, column;
-  gtk_widget_get_pointer (GTK_WIDGET (sheet), &x, &y);
-
-  if ( gtk_sheet_get_pixel_info (sheet, x, y, &row, &column) )
-    {
-      if (sheet->row_title_under && row >= 0)
-       {
-         gchar *text = psppire_sheet_model_get_row_subtitle (sheet->model, row);
-
-         show_subtitle (sheet, row, -1, text);
-         g_free (text);
-       }
-
-      if (sheet->column_title_under && column >= 0)
-       {
-         gchar *text = psppire_sheet_model_get_column_subtitle (sheet->model,
-                                                          column);
-
-         show_subtitle (sheet, -1, column, text);
-
-         g_free (text);
-       }
-    }
-
-  return FALSE;
-}
-
-static gboolean
-gtk_sheet_motion (GtkWidget *widget,  GdkEventMotion *event)
-{
-  GtkSheet *sheet = GTK_SHEET (widget);
-  GdkModifierType mods;
-  GdkCursorType new_cursor;
-  gint x, y;
-  gint row, column;
-  GdkDisplay *display;
-
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  display = gtk_widget_get_display (widget);
-
-  /* selections on the sheet */
-  x = event->x;
-  y = event->y;
-
-  if (!GTK_WIDGET_VISIBLE (sheet->hover_window->window))
-    {
-      if ( sheet->motion_timer > 0 )
-       g_source_remove (sheet->motion_timer);
-      sheet->motion_timer =
-       g_timeout_add (TIMEOUT_HOVER, motion_timeout_callback, sheet);
-    }
-  else
-    {
-      gint row, column;
-      gint wx, wy;
-      gtk_widget_get_pointer (widget, &wx, &wy);
-
-      if ( gtk_sheet_get_pixel_info (sheet, wx, wy, &row, &column) )
-       {
-         if ( row != sheet->hover_window->row ||
-              column != sheet->hover_window->column)
-           {
-             gtk_widget_hide (sheet->hover_window->window);
-           }
-       }
-    }
-
-  if (event->window == sheet->column_title_window)
-    {
-      if (!GTK_SHEET_IN_SELECTION (sheet) &&
-         on_column_boundary (sheet, x, &column))
-       {
-         new_cursor = GDK_SB_H_DOUBLE_ARROW;
-         if (new_cursor != sheet->cursor_drag->type)
-           {
-             gdk_cursor_unref (sheet->cursor_drag);
-             sheet->cursor_drag =
-               gdk_cursor_new_for_display (display, new_cursor);
-
-             gdk_window_set_cursor (sheet->column_title_window,
-                                    sheet->cursor_drag);
-           }
-       }
-      else
-       {
-         new_cursor = GDK_TOP_LEFT_ARROW;
-         if (!GTK_SHEET_IN_XDRAG (sheet) &&
-             new_cursor != sheet->cursor_drag->type)
-           {
-             gdk_cursor_unref (sheet->cursor_drag);
-             sheet->cursor_drag =
-               gdk_cursor_new_for_display (display, new_cursor);
-             gdk_window_set_cursor (sheet->column_title_window,
-                                    sheet->cursor_drag);
-           }
-       }
-    }
-  else if (event->window == sheet->row_title_window)
-    {
-      if (!GTK_SHEET_IN_SELECTION (sheet) &&
-         on_row_boundary (sheet, y, &row))
-       {
-         new_cursor = GDK_SB_V_DOUBLE_ARROW;
-         if (new_cursor != sheet->cursor_drag->type)
-           {
-             gdk_cursor_unref (sheet->cursor_drag);
-             sheet->cursor_drag =
-               gdk_cursor_new_for_display (display, new_cursor);
-             gdk_window_set_cursor (sheet->row_title_window,
-                                    sheet->cursor_drag);
-           }
-       }
-      else
-       {
-         new_cursor = GDK_TOP_LEFT_ARROW;
-         if (!GTK_SHEET_IN_YDRAG (sheet) &&
-             new_cursor != sheet->cursor_drag->type)
-           {
-             gdk_cursor_unref (sheet->cursor_drag);
-             sheet->cursor_drag =
-               gdk_cursor_new_for_display (display, new_cursor);
-             gdk_window_set_cursor (sheet->row_title_window,
-                                    sheet->cursor_drag);
-           }
-       }
-    }
-
-  new_cursor = GDK_PLUS;
-  if ( event->window == sheet->sheet_window &&
-       !POSSIBLE_DRAG (sheet, x, y, &row, &column) &&
-       !GTK_SHEET_IN_DRAG (sheet) &&
-       !POSSIBLE_RESIZE (sheet, x, y, &row, &column) &&
-       !GTK_SHEET_IN_RESIZE (sheet) &&
-       new_cursor != sheet->cursor_drag->type)
-    {
-      gdk_cursor_unref (sheet->cursor_drag);
-      sheet->cursor_drag = gdk_cursor_new_for_display (display, GDK_PLUS);
-      gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
-    }
-
-  new_cursor = GDK_TOP_LEFT_ARROW;
-  if ( event->window == sheet->sheet_window &&
-       ! (POSSIBLE_RESIZE (sheet, x, y, &row, &column) ||
-         GTK_SHEET_IN_RESIZE (sheet)) &&
-       (POSSIBLE_DRAG (sheet, x, y, &row, &column) ||
-       GTK_SHEET_IN_DRAG (sheet)) &&
-       new_cursor != sheet->cursor_drag->type)
-    {
-      gdk_cursor_unref (sheet->cursor_drag);
-      sheet->cursor_drag = gdk_cursor_new_for_display (display, GDK_TOP_LEFT_ARROW);
-      gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
-    }
-
-  new_cursor = GDK_SIZING;
-  if ( event->window == sheet->sheet_window &&
-       sheet->selection_mode != GTK_SELECTION_NONE &&
-       !GTK_SHEET_IN_DRAG (sheet) &&
-       (POSSIBLE_RESIZE (sheet, x, y, &row, &column) ||
-       GTK_SHEET_IN_RESIZE (sheet)) &&
-       new_cursor != sheet->cursor_drag->type)
-    {
-      gdk_cursor_unref (sheet->cursor_drag);
-      sheet->cursor_drag = gdk_cursor_new_for_display (display, GDK_SIZING);
-      gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
-    }
-
-
-  gdk_window_get_pointer (widget->window, &x, &y, &mods);
-  if (! (mods & GDK_BUTTON1_MASK)) return FALSE;
-
-  if (GTK_SHEET_IN_XDRAG (sheet))
-    {
-      if (event->x != sheet->x_drag)
-       {
-         draw_xor_vline (sheet);
-         sheet->x_drag = event->x;
-         draw_xor_vline (sheet);
-       }
-
-      return TRUE;
-    }
-
-  if (GTK_SHEET_IN_YDRAG (sheet))
-    {
-      if (event->y != sheet->y_drag)
-       {
-         draw_xor_hline (sheet);
-         sheet->y_drag = event->y;
-         draw_xor_hline (sheet);
-       }
-
-      return TRUE;
-    }
-
-  if (GTK_SHEET_IN_DRAG (sheet))
-    {
-      GtkSheetRange aux;
-      column = column_from_xpixel (sheet, x)- sheet->drag_cell.col;
-      row = row_from_ypixel (sheet, y) - sheet->drag_cell.row;
-      if (sheet->state == GTK_SHEET_COLUMN_SELECTED) row = 0;
-      if (sheet->state == GTK_SHEET_ROW_SELECTED) column = 0;
-      sheet->x_drag = x;
-      sheet->y_drag = y;
-      aux = sheet->range;
-      if (aux.row0 + row >= 0 && aux.rowi + row < psppire_axis_unit_count (sheet->vaxis) &&
-         aux.col0 + column >= 0 && aux.coli + column < psppire_axis_unit_count (sheet->haxis))
-       {
-         aux = sheet->drag_range;
-         sheet->drag_range.row0 = sheet->range.row0 + row;
-         sheet->drag_range.col0 = sheet->range.col0 + column;
-         sheet->drag_range.rowi = sheet->range.rowi + row;
-         sheet->drag_range.coli = sheet->range.coli + column;
-         if (aux.row0 != sheet->drag_range.row0 ||
-             aux.col0 != sheet->drag_range.col0)
-           {
-             draw_xor_rectangle (sheet, aux);
-             draw_xor_rectangle (sheet, sheet->drag_range);
-           }
-       }
-      return TRUE;
-    }
-
-  if (GTK_SHEET_IN_RESIZE (sheet))
-    {
-      GtkSheetRange aux;
-      gint v_h, current_col, current_row, col_threshold, row_threshold;
-      v_h = 1;
-      if (abs (x - psppire_axis_start_pixel (sheet->haxis, sheet->drag_cell.col)) >
-         abs (y - psppire_axis_start_pixel (sheet->vaxis, sheet->drag_cell.row))) v_h = 2;
-
-      current_col = column_from_xpixel (sheet, x);
-      current_row = row_from_ypixel (sheet, y);
-      column = current_col - sheet->drag_cell.col;
-      row = current_row - sheet->drag_cell.row;
-
-      /*use half of column width resp. row height as threshold to
-       expand selection*/
-      col_threshold = psppire_axis_start_pixel (sheet->haxis, current_col) +
-       psppire_axis_unit_size (sheet->haxis, current_col) / 2;
-      if (column > 0)
-       {
-         if (x < col_threshold)
-           column -= 1;
-       }
-      else if (column < 0)
-       {
-         if (x > col_threshold)
-           column +=1;
-       }
-      row_threshold = psppire_axis_start_pixel (sheet->vaxis, current_row) +
-       psppire_axis_unit_size (sheet->vaxis, current_row)/2;
-      if (row > 0)
-       {
-         if (y < row_threshold)
-           row -= 1;
-       }
-      else if (row < 0)
-       {
-         if (y > row_threshold)
-           row +=1;
-       }
-
-      if (sheet->state == GTK_SHEET_COLUMN_SELECTED) row = 0;
-      if (sheet->state == GTK_SHEET_ROW_SELECTED) column = 0;
-      sheet->x_drag = x;
-      sheet->y_drag = y;
-      aux = sheet->range;
-
-      if (v_h == 1)
-       column = 0;
-      else
-       row = 0;
-
-      if (aux.row0 + row >= 0 && aux.rowi + row < psppire_axis_unit_count (sheet->vaxis) &&
-         aux.col0 + column >= 0 && aux.coli + column < psppire_axis_unit_count (sheet->haxis))
-       {
-         aux = sheet->drag_range;
-         sheet->drag_range = sheet->range;
-
-         if (row < 0) sheet->drag_range.row0 = sheet->range.row0 + row;
-         if (row > 0) sheet->drag_range.rowi = sheet->range.rowi + row;
-         if (column < 0) sheet->drag_range.col0 = sheet->range.col0 + column;
-         if (column > 0) sheet->drag_range.coli = sheet->range.coli + column;
-
-         if (aux.row0 != sheet->drag_range.row0 ||
-             aux.rowi != sheet->drag_range.rowi ||
-             aux.col0 != sheet->drag_range.col0 ||
-             aux.coli != sheet->drag_range.coli)
-           {
-             draw_xor_rectangle (sheet, aux);
-             draw_xor_rectangle (sheet, sheet->drag_range);
-           }
-       }
-      return TRUE;
-    }
-
-  gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
-
-  if (sheet->state == GTK_SHEET_NORMAL && row == sheet->active_cell.row &&
-      column == sheet->active_cell.col) return TRUE;
-
-  if (GTK_SHEET_IN_SELECTION (sheet) && mods&GDK_BUTTON1_MASK)
-    gtk_sheet_extend_selection (sheet, row, column);
-
-  return TRUE;
-}
-
-static gboolean
-gtk_sheet_crossing_notify (GtkWidget *widget,
-                          GdkEventCrossing *event)
-{
-  GtkSheet *sheet = GTK_SHEET (widget);
-
-  if (event->window == sheet->column_title_window)
-    sheet->column_title_under = event->type == GDK_ENTER_NOTIFY;
-  else if (event->window == sheet->row_title_window)
-    sheet->row_title_under = event->type == GDK_ENTER_NOTIFY;
-
-  return TRUE;
-}
-
-static void
-gtk_sheet_extend_selection (GtkSheet *sheet, gint row, gint column)
-{
-  GtkSheetRange range;
-  gint state;
-  gint r, c;
-
-  if (row == sheet->selection_cell.row && column == sheet->selection_cell.col)
-    return;
-
-  if (sheet->selection_mode == GTK_SELECTION_SINGLE) return;
-
-  gtk_widget_grab_focus (GTK_WIDGET (sheet));
-
-  if (GTK_SHEET_IN_DRAG (sheet)) return;
-
-  state = sheet->state;
-
-  switch (sheet->state)
-    {
-    case GTK_SHEET_ROW_SELECTED:
-      column = psppire_axis_unit_count (sheet->haxis) - 1;
-      break;
-    case GTK_SHEET_COLUMN_SELECTED:
-      row = psppire_axis_unit_count (sheet->vaxis) - 1;
-      break;
-    case GTK_SHEET_NORMAL:
-      sheet->state = GTK_SHEET_RANGE_SELECTED;
-      r = sheet->active_cell.row;
-      c = sheet->active_cell.col;
-      sheet->range.col0 = c;
-      sheet->range.row0 = r;
-      sheet->range.coli = c;
-      sheet->range.rowi = r;
-      gtk_sheet_range_draw_selection (sheet, sheet->range);
-    case GTK_SHEET_RANGE_SELECTED:
-      sheet->state = GTK_SHEET_RANGE_SELECTED;
-    }
-
-  sheet->selection_cell.row = row;
-  sheet->selection_cell.col = column;
-
-  range.col0 = MIN (column, sheet->active_cell.col);
-  range.coli = MAX (column, sheet->active_cell.col);
-  range.row0 = MIN (row, sheet->active_cell.row);
-  range.rowi = MAX (row, sheet->active_cell.row);
-
-  if (range.row0 != sheet->range.row0 || range.rowi != sheet->range.rowi ||
-      range.col0 != sheet->range.col0 || range.coli != sheet->range.coli ||
-      state == GTK_SHEET_NORMAL)
-    gtk_sheet_real_select_range (sheet, &range);
-
-}
-
-static gint
-gtk_sheet_entry_key_press (GtkWidget *widget,
-                          GdkEventKey *key)
-{
-  gboolean focus;
-  g_signal_emit_by_name (widget, "key_press_event", key, &focus);
-  return focus;
-}
-
-
-/* Number of rows in a step-increment */
-#define ROWS_PER_STEP 1
-
-
-static void
-page_vertical (GtkSheet *sheet, GtkScrollType dir)
-{
-  gint old_row = sheet->active_cell.row ;
-  glong vpixel = psppire_axis_start_pixel (sheet->vaxis, old_row);
-
-  gint new_row;
-
-  vpixel -= psppire_axis_start_pixel (sheet->vaxis,
-                                    min_visible_row (sheet));
-
-  switch ( dir)
-    {
-    case GTK_SCROLL_PAGE_DOWN:
-      gtk_adjustment_set_value (sheet->vadjustment,
-                               sheet->vadjustment->value +
-                               sheet->vadjustment->page_increment);
-      break;
-    case GTK_SCROLL_PAGE_UP:
-      gtk_adjustment_set_value (sheet->vadjustment,
-                               sheet->vadjustment->value -
-                               sheet->vadjustment->page_increment);
-
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-
-
-  vpixel += psppire_axis_start_pixel (sheet->vaxis,
-                                    min_visible_row (sheet));
-
-  new_row =  row_from_ypixel (sheet, vpixel);
-
-  change_active_cell (sheet, new_row,
-                          sheet->active_cell.col);
-}
-
-
-static void
-step_sheet (GtkSheet *sheet, GtkScrollType dir)
-{
-  gint current_row = sheet->active_cell.row;
-  gint current_col = sheet->active_cell.col;
-  GtkSheetCell new_cell ;
-  gboolean forbidden = FALSE;
-
-  new_cell.row = current_row;
-  new_cell.col = current_col;
-
-  switch ( dir)
-    {
-    case GTK_SCROLL_STEP_DOWN:
-      new_cell.row++;
-      break;
-    case GTK_SCROLL_STEP_UP:
-      new_cell.row--;
-      break;
-    case GTK_SCROLL_STEP_RIGHT:
-      new_cell.col++;
-      break;
-    case GTK_SCROLL_STEP_LEFT:
-      new_cell.col--;
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-
-
-  g_signal_emit (sheet, sheet_signals[TRAVERSE], 0,
-                &sheet->active_cell,
-                &new_cell,
-                &forbidden);
-
-  if (forbidden)
-    return;
-
-
-  maximize_int (&new_cell.row, 0);
-  maximize_int (&new_cell.col, 0);
-
-  minimize_int (&new_cell.row,
-               psppire_axis_unit_count (sheet->vaxis) - 1);
-
-  minimize_int (&new_cell.col,
-               psppire_axis_unit_count (sheet->haxis) - 1);
-
-  change_active_cell (sheet, new_cell.row, new_cell.col);
-
-
-  if ( new_cell.col > max_fully_visible_column (sheet))
-    {
-      glong hpos  =
-       psppire_axis_start_pixel (sheet->haxis,
-                                   new_cell.col + 1);
-      hpos -= sheet->hadjustment->page_size;
-
-      gtk_adjustment_set_value (sheet->hadjustment,
-                               hpos);
-    }
-  else if ( new_cell.col < min_fully_visible_column (sheet))
-    {
-      glong hpos  =
-       psppire_axis_start_pixel (sheet->haxis,
-                                   new_cell.col);
-
-      gtk_adjustment_set_value (sheet->hadjustment,
-                               hpos);
-    }
-
-
-  if ( new_cell.row > max_fully_visible_row (sheet))
-    {
-      glong vpos  =
-       psppire_axis_start_pixel (sheet->vaxis,
-                                   new_cell.row + 1);
-      vpos -= sheet->vadjustment->page_size;
-
-      gtk_adjustment_set_value (sheet->vadjustment,
-                               vpos);
-    }
-  else if ( new_cell.row < min_fully_visible_row (sheet))
-    {
-      glong vpos  =
-       psppire_axis_start_pixel (sheet->vaxis,
-                                   new_cell.row);
-
-      gtk_adjustment_set_value (sheet->vadjustment,
-                               vpos);
-    }
-
-  gtk_widget_grab_focus (GTK_WIDGET (sheet->entry_widget));
-}
-
-
-static gboolean
-gtk_sheet_key_press (GtkWidget *widget,
-                    GdkEventKey *key)
-{
-  GtkSheet *sheet = GTK_SHEET (widget);
-
-  GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-
-  switch (key->keyval)
-    {
-    case GDK_Tab:
-    case GDK_Right:
-      step_sheet (sheet, GTK_SCROLL_STEP_RIGHT);
-      break;
-    case GDK_ISO_Left_Tab:
-    case GDK_Left:
-      step_sheet (sheet, GTK_SCROLL_STEP_LEFT);
-      break;
-    case GDK_Return:
-    case GDK_Down:
-      step_sheet (sheet, GTK_SCROLL_STEP_DOWN);
-      break;
-    case GDK_Up:
-      step_sheet (sheet, GTK_SCROLL_STEP_UP);
-      break;
-
-    case GDK_Page_Down:
-      page_vertical (sheet, GTK_SCROLL_PAGE_DOWN);
-      break;
-    case GDK_Page_Up:
-      page_vertical (sheet, GTK_SCROLL_PAGE_UP);
-      break;
-
-    case GDK_Home:
-      gtk_adjustment_set_value (sheet->vadjustment,
-                               sheet->vadjustment->lower);
-
-      change_active_cell (sheet,  0,
-                              sheet->active_cell.col);
-
-      break;
-
-    case GDK_End:
-      gtk_adjustment_set_value (sheet->vadjustment,
-                               sheet->vadjustment->upper -
-                               sheet->vadjustment->page_size -
-                               sheet->vadjustment->page_increment);
-
-      /*
-       change_active_cellx (sheet,
-       psppire_axis_unit_count (sheet->vaxis) - 1,
-       sheet->active_cell.col);
-      */
-      break;
-    case GDK_Delete:
-      gtk_sheet_real_cell_clear (sheet, sheet->active_cell.row, sheet->active_cell.col);
-      break;
-    default:
-      return FALSE;
-      break;
-    }
-
-  return TRUE;
-}
-
-static void
-gtk_sheet_size_request (GtkWidget *widget,
-                       GtkRequisition *requisition)
-{
-  GtkSheet *sheet;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_SHEET (widget));
-  g_return_if_fail (requisition != NULL);
-
-  sheet = GTK_SHEET (widget);
-
-  requisition->width = 3 * DEFAULT_COLUMN_WIDTH;
-  requisition->height = 3 * DEFAULT_ROW_HEIGHT;
-
-  /* compute the size of the column title area */
-  if (sheet->column_titles_visible)
-    requisition->height += sheet->column_title_area.height;
-
-  /* compute the size of the row title area */
-  if (sheet->row_titles_visible)
-    requisition->width += sheet->row_title_area.width;
-}
-
-
-static void
-gtk_sheet_size_allocate (GtkWidget *widget,
-                        GtkAllocation *allocation)
-{
-  GtkSheet *sheet;
-  GtkAllocation sheet_allocation;
-  gint border_width;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_SHEET (widget));
-  g_return_if_fail (allocation != NULL);
-
-  sheet = GTK_SHEET (widget);
-  widget->allocation = *allocation;
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  if (GTK_WIDGET_REALIZED (widget))
-    gdk_window_move_resize (widget->window,
-                           allocation->x + border_width,
-                           allocation->y + border_width,
-                           allocation->width - 2 * border_width,
-                           allocation->height - 2 * border_width);
-
-  sheet_allocation.x = 0;
-  sheet_allocation.y = 0;
-  sheet_allocation.width = allocation->width - 2 * border_width;
-  sheet_allocation.height = allocation->height - 2 * border_width;
-
-  if (GTK_WIDGET_REALIZED (widget))
-    gdk_window_move_resize (sheet->sheet_window,
-                           sheet_allocation.x,
-                           sheet_allocation.y,
-                           sheet_allocation.width,
-                           sheet_allocation.height);
-
-  /* position the window which holds the column title buttons */
-  sheet->column_title_area.x = 0;
-  sheet->column_title_area.y = 0;
-  sheet->column_title_area.width = sheet_allocation.width ;
-
-
-  /* position the window which holds the row title buttons */
-  sheet->row_title_area.x = 0;
-  sheet->row_title_area.y = 0;
-  sheet->row_title_area.height = sheet_allocation.height;
-
-  if (sheet->row_titles_visible)
-    sheet->column_title_area.x += sheet->row_title_area.width;
-
-  if (sheet->column_titles_visible)
-    sheet->row_title_area.y += sheet->column_title_area.height;
-
-  if (GTK_WIDGET_REALIZED (widget) && sheet->column_titles_visible)
-    gdk_window_move_resize (sheet->column_title_window,
-                           sheet->column_title_area.x,
-                           sheet->column_title_area.y,
-                           sheet->column_title_area.width,
-                           sheet->column_title_area.height);
-
-
-  if (GTK_WIDGET_REALIZED (widget) && sheet->row_titles_visible)
-    gdk_window_move_resize (sheet->row_title_window,
-                           sheet->row_title_area.x,
-                           sheet->row_title_area.y,
-                           sheet->row_title_area.width,
-                           sheet->row_title_area.height);
-
-  size_allocate_global_button (sheet);
-
-  if (sheet->haxis)
-    {
-      gint width = sheet->column_title_area.width;
-
-      if ( sheet->row_titles_visible)
-       width -= sheet->row_title_area.width;
-
-      g_object_set (sheet->haxis,
-                   "minimum-extent", width,
-                   NULL);
-    }
-
-
-  if (sheet->vaxis)
-    {
-      gint height = sheet->row_title_area.height;
-
-      if ( sheet->column_titles_visible)
-       height -= sheet->column_title_area.height;
-
-      g_object_set (sheet->vaxis,
-                   "minimum-extent", height,
-                   NULL);
-    }
-
-
-  /* set the scrollbars adjustments */
-  adjust_scrollbars (sheet);
-}
-
-static void
-draw_column_title_buttons (GtkSheet *sheet)
-{
-  gint x, width;
-
-  if (!sheet->column_titles_visible) return;
-  if (!GTK_WIDGET_REALIZED (sheet))
-    return;
-
-  gdk_drawable_get_size (sheet->sheet_window, &width, NULL);
-  x = 0;
-
-  if (sheet->row_titles_visible)
-    {
-      x = sheet->row_title_area.width;
-    }
-
-  if (sheet->column_title_area.width != width || sheet->column_title_area.x != x)
-    {
-      sheet->column_title_area.width = width;
-      sheet->column_title_area.x = x;
-      gdk_window_move_resize (sheet->column_title_window,
-                             sheet->column_title_area.x,
-                             sheet->column_title_area.y,
-                             sheet->column_title_area.width,
-                             sheet->column_title_area.height);
-    }
-
-  if (max_visible_column (sheet) ==
-      psppire_axis_unit_count (sheet->haxis) - 1)
-    gdk_window_clear_area (sheet->column_title_window,
-                          0, 0,
-                          sheet->column_title_area.width,
-                          sheet->column_title_area.height);
-
-  if (!GTK_WIDGET_DRAWABLE (sheet)) return;
-
-  draw_column_title_buttons_range (sheet, min_visible_column (sheet), 
-                                  max_visible_column (sheet));
-}
-
-static void
-draw_row_title_buttons (GtkSheet *sheet)
-{
-  gint y = 0;
-  gint height;
-
-  if (!sheet->row_titles_visible) return;
-  if (!GTK_WIDGET_REALIZED (sheet))
-    return;
-
-  gdk_drawable_get_size (sheet->sheet_window, NULL, &height);
-
-  if (sheet->column_titles_visible)
-    {
-      y = sheet->column_title_area.height;
-    }
-
-  if (sheet->row_title_area.height != height || sheet->row_title_area.y != y)
-    {
-      sheet->row_title_area.y = y;
-      sheet->row_title_area.height = height;
-      gdk_window_move_resize (sheet->row_title_window,
-                             sheet->row_title_area.x,
-                             sheet->row_title_area.y,
-                             sheet->row_title_area.width,
-                             sheet->row_title_area.height);
-    }
-
-  if (max_visible_row (sheet) == psppire_axis_unit_count (sheet->vaxis) - 1)
-    gdk_window_clear_area (sheet->row_title_window,
-                          0, 0,
-                          sheet->row_title_area.width,
-                          sheet->row_title_area.height);
-
-  if (!GTK_WIDGET_DRAWABLE (sheet)) return;
-
-  draw_row_title_buttons_range (sheet, min_visible_row (sheet),
-                               max_visible_row (sheet));
-}
-
-
-static void
-gtk_sheet_size_allocate_entry (GtkSheet *sheet)
-{
-  GtkAllocation entry_alloc;
-  GtkSheetCellAttr attributes = { 0 };
-  GtkEntry *sheet_entry;
-
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-  if (!GTK_WIDGET_MAPPED (GTK_WIDGET (sheet))) return;
-
-  sheet_entry = gtk_sheet_get_entry (sheet);
-
-  if ( ! gtk_sheet_get_attributes (sheet, sheet->active_cell.row,
-                                  sheet->active_cell.col,
-                                  &attributes) )
-    return ;
-
-  if ( GTK_WIDGET_REALIZED (sheet->entry_widget) )
-    {
-      GtkStyle *style = GTK_WIDGET (sheet_entry)->style;
-
-      style->bg[GTK_STATE_NORMAL] = attributes.background;
-      style->fg[GTK_STATE_NORMAL] = attributes.foreground;
-      style->text[GTK_STATE_NORMAL] = attributes.foreground;
-      style->bg[GTK_STATE_ACTIVE] = attributes.background;
-      style->fg[GTK_STATE_ACTIVE] = attributes.foreground;
-      style->text[GTK_STATE_ACTIVE] = attributes.foreground;
-    }
-
-  rectangle_from_cell (sheet, sheet->active_cell.row,
-                      sheet->active_cell.col, &entry_alloc);
-
-  entry_alloc.width -= BORDER_WIDTH ;
-  entry_alloc.height -= BORDER_WIDTH ;
-  entry_alloc.x += DIV_RND_UP (BORDER_WIDTH, 2);
-  entry_alloc.y += DIV_RND_UP (BORDER_WIDTH, 2);
-
-
-  gtk_widget_set_size_request (sheet->entry_widget, entry_alloc.width,
-                              entry_alloc.height);
-  gtk_widget_size_allocate (sheet->entry_widget, &entry_alloc);
-}
-
-
-/* Copy the sheet's font to the entry widget */
-static void
-set_entry_widget_font (GtkSheet *sheet)
-{
-  GtkRcStyle *style = gtk_widget_get_modifier_style (sheet->entry_widget);
-
-  pango_font_description_free (style->font_desc);
-  style->font_desc = pango_font_description_copy (GTK_WIDGET (sheet)->style->font_desc);
-
-  gtk_widget_modify_style (sheet->entry_widget, style);
-}
-
-
-
-static void
-create_sheet_entry (GtkSheet *sheet)
-{
-  if (sheet->entry_widget)
-    {
-      gtk_widget_unparent (sheet->entry_widget);
-    }
-
-  sheet->entry_widget = g_object_new (sheet->entry_type, NULL);
-  g_object_ref_sink (sheet->entry_widget);
-
-  gtk_widget_size_request (sheet->entry_widget, NULL);
-
-  if ( GTK_IS_ENTRY (sheet->entry_widget))
-    {
-      g_object_set (sheet->entry_widget,
-                   "has-frame", FALSE,
-                   NULL);
-    }
-
-  if (GTK_WIDGET_REALIZED (sheet))
-    {
-      gtk_widget_set_parent_window (sheet->entry_widget, sheet->sheet_window);
-      gtk_widget_set_parent (sheet->entry_widget, GTK_WIDGET (sheet));
-      gtk_widget_realize (sheet->entry_widget);
-    }
-
-  g_signal_connect_swapped (sheet->entry_widget, "key_press_event",
-                           G_CALLBACK (gtk_sheet_entry_key_press),
-                           sheet);
-
-  set_entry_widget_font (sheet);
-
-  gtk_widget_show (sheet->entry_widget);
-}
-
-
-/* Finds the last child widget that happens to be of type GtkEntry */
-static void
-find_entry (GtkWidget *w, gpointer user_data)
-{
-  GtkWidget **entry = user_data;
-  if ( GTK_IS_ENTRY (w))
-    {
-      *entry = w;
-    }
-}
-
-
-GtkEntry *
-gtk_sheet_get_entry (GtkSheet *sheet)
-{
-  GtkWidget *w = sheet->entry_widget;
-
-  g_return_val_if_fail (sheet != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL);
-  g_return_val_if_fail (sheet->entry_widget != NULL, NULL);
-
-  while (! GTK_IS_ENTRY (w))
-    {
-      GtkWidget *entry = NULL;
-
-      if (GTK_IS_CONTAINER (w))
-       {
-         gtk_container_forall (GTK_CONTAINER (w), find_entry, &entry);
-
-         if (NULL == entry)
-           break;
-
-         w = entry;
-       }
-    }
-
-  return GTK_ENTRY (w);
-}
-
-
-static void
-draw_button (GtkSheet *sheet, GdkWindow *window,
-                      GtkSheetButton *button, gboolean is_sensitive,
-                      GdkRectangle allocation)
-{
-  GtkShadowType shadow_type;
-  gint text_width = 0, text_height = 0;
-  PangoAlignment align = PANGO_ALIGN_LEFT;
-
-  gboolean rtl ;
-
-  gint state = 0;
-
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (button != NULL);
-
-
-  rtl = gtk_widget_get_direction (GTK_WIDGET (sheet)) == GTK_TEXT_DIR_RTL;
-
-  gdk_window_clear_area (window,
-                        allocation.x, allocation.y,
-                        allocation.width, allocation.height);
-
-  gtk_widget_ensure_style (sheet->button);
-
-  gtk_paint_box (sheet->button->style, window,
-                GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                &allocation, GTK_WIDGET (sheet->button),
-                "buttondefault",
-                allocation.x, allocation.y,
-                allocation.width, allocation.height);
-
-  state = button->state;
-  if (!is_sensitive) state = GTK_STATE_INSENSITIVE;
-
-  if (state == GTK_STATE_ACTIVE)
-    shadow_type = GTK_SHADOW_IN;
-  else
-    shadow_type = GTK_SHADOW_OUT;
-
-  if (state != GTK_STATE_NORMAL && state != GTK_STATE_INSENSITIVE)
-    gtk_paint_box (sheet->button->style, window,
-                  button->state, shadow_type,
-                  &allocation, GTK_WIDGET (sheet->button),
-                  "button",
-                  allocation.x, allocation.y,
-                  allocation.width, allocation.height);
-
-  if (button->label_visible)
-    {
-      text_height = DEFAULT_ROW_HEIGHT -
-       2 * COLUMN_TITLES_HEIGHT;
-
-      gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->fg_gc[button->state],
-                                &allocation);
-      gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->white_gc,
-                                &allocation);
-
-      allocation.y += 2 * sheet->button->style->ythickness;
-
-      if (button->label && strlen (button->label) > 0)
-       {
-         PangoRectangle rect;
-         gchar *line = button->label;
-
-         PangoLayout *layout = NULL;
-         gint real_x = allocation.x;
-         gint real_y = allocation.y;
-
-         layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), line);
-         pango_layout_get_extents (layout, NULL, &rect);
-
-         text_width = PANGO_PIXELS (rect.width);
-         switch (button->justification)
-           {
-           case GTK_JUSTIFY_LEFT:
-             real_x = allocation.x + COLUMN_TITLES_HEIGHT;
-             align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
-             break;
-           case GTK_JUSTIFY_RIGHT:
-             real_x = allocation.x + allocation.width - text_width - COLUMN_TITLES_HEIGHT;
-             align = rtl ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT;
-             break;
-           case GTK_JUSTIFY_CENTER:
-           default:
-             real_x = allocation.x + (allocation.width - text_width)/2;
-             align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
-             pango_layout_set_justify (layout, TRUE);
-           }
-         pango_layout_set_alignment (layout, align);
-         gtk_paint_layout (GTK_WIDGET (sheet)->style,
-                           window,
-                           state,
-                           FALSE,
-                           &allocation,
-                           GTK_WIDGET (sheet),
-                           "label",
-                           real_x, real_y,
-                           layout);
-         g_object_unref (layout);
-       }
-
-      gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->fg_gc[button->state],
-                                NULL);
-      gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->white_gc, NULL);
-
-    }
-
-  gtk_sheet_button_free (button);
-}
-
-
-/* Draw the column title buttons FIRST through to LAST */
-static void
-draw_column_title_buttons_range (GtkSheet *sheet, gint first, gint last)
-{
-  GdkRectangle rect;
-  gint col;
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-
-  if (!sheet->column_titles_visible) return;
-
-  g_return_if_fail (first >= min_visible_column (sheet));
-  g_return_if_fail (last <= max_visible_column (sheet));
-
-  rect.y = 0;
-  rect.height = sheet->column_title_area.height;
-  rect.x = psppire_axis_start_pixel (sheet->haxis, first) + CELL_SPACING;
-  rect.width = psppire_axis_start_pixel (sheet->haxis, last) + CELL_SPACING
-    + psppire_axis_unit_size (sheet->haxis, last);
-
-  rect.x -= sheet->hadjustment->value;
-
-  minimize_int (&rect.width, sheet->column_title_area.width);
-  maximize_int (&rect.x, 0);
-
-  gdk_window_begin_paint_rect (sheet->column_title_window, &rect);
-
-  for (col = first ; col <= last ; ++col)
-    {
-      GdkRectangle allocation;
-      gboolean is_sensitive = FALSE;
-
-      GtkSheetButton *
-       button = psppire_sheet_model_get_column_button (sheet->model, col);
-      allocation.y = 0;
-      allocation.x = psppire_axis_start_pixel (sheet->haxis, col)
-       + CELL_SPACING;
-      allocation.x -= sheet->hadjustment->value;
-
-      allocation.height = sheet->column_title_area.height;
-      allocation.width = psppire_axis_unit_size (sheet->haxis, col);
-      is_sensitive = psppire_sheet_model_get_column_sensitivity (sheet->model, col);
-
-      draw_button (sheet, sheet->column_title_window,
-                  button, is_sensitive, allocation);
-    }
-
-  gdk_window_end_paint (sheet->column_title_window);
-}
-
-
-static void
-draw_row_title_buttons_range (GtkSheet *sheet, gint first, gint last)
-{
-  GdkRectangle rect;
-  gint row;
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-
-  if (!sheet->row_titles_visible) return;
-
-  g_return_if_fail (first >= min_visible_row (sheet));
-  g_return_if_fail (last <= max_visible_row (sheet));
-
-  rect.x = 0;
-  rect.width = sheet->row_title_area.width;
-  rect.y = psppire_axis_start_pixel (sheet->vaxis, first) + CELL_SPACING;
-  rect.height = psppire_axis_start_pixel (sheet->vaxis, last) + CELL_SPACING
-    + psppire_axis_unit_size (sheet->vaxis, last);
-
-  rect.y -= sheet->vadjustment->value;
-
-  minimize_int (&rect.height, sheet->row_title_area.height);
-  maximize_int (&rect.y, 0);
-
-  gdk_window_begin_paint_rect (sheet->row_title_window, &rect);
-  for (row = first; row <= last; ++row)
-    {
-      GdkRectangle allocation;
-
-      gboolean is_sensitive = FALSE;
-
-      GtkSheetButton *button =
-       psppire_sheet_model_get_row_button (sheet->model, row);
-      allocation.x = 0;
-      allocation.y = psppire_axis_start_pixel (sheet->vaxis, row)
-       + CELL_SPACING;
-      allocation.y -= sheet->vadjustment->value;
-
-      allocation.width = sheet->row_title_area.width;
-      allocation.height = psppire_axis_unit_size (sheet->vaxis, row);
-      is_sensitive = psppire_sheet_model_get_row_sensitivity (sheet->model, row);
-
-      draw_button (sheet, sheet->row_title_window,
-                  button, is_sensitive, allocation);
-    }
-
-  gdk_window_end_paint (sheet->row_title_window);
-}
-
-/* SCROLLBARS
- *
- * functions:
- * adjust_scrollbars
- * vadjustment_value_changed
- * hadjustment_value_changed */
-
-
-static void
-update_adjustment (GtkAdjustment *adj, PsppireAxis *axis, gint page_size)
-{
-  double position =
-    (adj->value + adj->page_size)
-    /
-    (adj->upper - adj->lower);
-
-  const glong last_item = psppire_axis_unit_count (axis) - 1;
-
-  if (isnan (position) || position < 0)
-    position = 0;
-
-  adj->upper =
-    psppire_axis_start_pixel (axis, last_item)
-    +
-    psppire_axis_unit_size (axis, last_item)
-    ;
-
-  adj->lower = 0;
-  adj->page_size = page_size;
-
-#if 0
-  adj->value = position * (adj->upper - adj->lower) - adj->page_size;
-
-  if ( adj->value < adj->lower)
-    adj->value = adj->lower;
-#endif
-
-  gtk_adjustment_changed (adj);
-}
-
-
-static void
-adjust_scrollbars (GtkSheet *sheet)
-{
-  gint width, height;
-
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    return;
-
-  gdk_drawable_get_size (sheet->sheet_window, &width, &height);
-
-  if ( sheet->row_titles_visible)
-    width -= sheet->row_title_area.width;
-
-  if (sheet->column_titles_visible)
-    height -= sheet->column_title_area.height;
-
-  if (sheet->vadjustment)
-    {
-      glong last_row = psppire_axis_unit_count (sheet->vaxis) - 1;
-
-      sheet->vadjustment->step_increment =
-       ROWS_PER_STEP *
-       psppire_axis_unit_size (sheet->vaxis, last_row);
-
-      sheet->vadjustment->page_increment =
-       height -
-       sheet->column_title_area.height -
-       psppire_axis_unit_size (sheet->vaxis, last_row);
-
-      update_adjustment (sheet->vadjustment, sheet->vaxis, height);
-    }
-
-  if (sheet->hadjustment)
-    {
-      gint last_col = psppire_axis_unit_count (sheet->haxis) - 1;
-      sheet->hadjustment->step_increment = 1;
-
-      sheet->hadjustment->page_increment = width;
-
-      sheet->hadjustment->upper =
-       psppire_axis_start_pixel (sheet->haxis, last_col)
-       +
-       psppire_axis_unit_size (sheet->haxis, last_col)
-       ;
-
-      update_adjustment (sheet->hadjustment, sheet->haxis, width);
-    }
-}
-
-/* Subtracts the region of WIDGET from REGION */
-static void
-subtract_widget_region (GdkRegion *region, GtkWidget *widget)
-{
-  GdkRectangle rect;
-  GdkRectangle intersect;
-  GdkRegion *region2;
-
-  gdk_region_get_clipbox (region, &rect);
-  gtk_widget_intersect (widget,
-                       &rect,
-                       &intersect);
-
-  region2 = gdk_region_rectangle (&intersect);
-  gdk_region_subtract (region, region2);
-  gdk_region_destroy (region2);
-}
-
-static void
-vadjustment_value_changed (GtkAdjustment *adjustment,
-                          gpointer data)
-{
-  GdkRegion *region;
-  GtkSheet *sheet = GTK_SHEET (data);
-
-  g_return_if_fail (adjustment != NULL);
-
-  if ( ! GTK_WIDGET_REALIZED (sheet)) return;
-
-  gtk_widget_hide (sheet->entry_widget);
-
-  region =
-    gdk_drawable_get_visible_region (GDK_DRAWABLE (sheet->sheet_window));
-
-  subtract_widget_region (region, sheet->button);
-  gdk_window_begin_paint_region (sheet->sheet_window, region);
-
-  draw_sheet_region (sheet, region);
-
-  draw_row_title_buttons (sheet);
-  gtk_sheet_draw_active_cell (sheet);
-
-  gdk_window_end_paint (sheet->sheet_window);
-  gdk_region_destroy (region);
-}
-
-
-static void
-hadjustment_value_changed (GtkAdjustment *adjustment,
-                          gpointer data)
-{
-  GdkRegion *region;
-  GtkSheet *sheet = GTK_SHEET (data);
-
-  g_return_if_fail (adjustment != NULL);
-
-  if ( ! GTK_WIDGET_REALIZED (sheet)) return;
-
-  gtk_widget_hide (sheet->entry_widget);
-
-
-  region =
-    gdk_drawable_get_visible_region (GDK_DRAWABLE (sheet->sheet_window));
-
-  subtract_widget_region (region, sheet->button);
-  gdk_window_begin_paint_region (sheet->sheet_window, region);
-
-  draw_sheet_region (sheet, region);
-
-  draw_column_title_buttons (sheet);
-
-  gtk_sheet_draw_active_cell (sheet);
-
-  gdk_window_end_paint (sheet->sheet_window);
-
-  gdk_region_destroy (region);
-}
-
-
-/* COLUMN RESIZING */
-static void
-draw_xor_vline (GtkSheet *sheet)
-{
-  gint height;
-  gint xpos = sheet->x_drag;
-  gdk_drawable_get_size (sheet->sheet_window,
-                        NULL, &height);
-
-  if (sheet->row_titles_visible)
-    xpos += sheet->row_title_area.width;
-
-  gdk_draw_line (GTK_WIDGET (sheet)->window, sheet->xor_gc,
-                xpos,
-                sheet->column_title_area.height,
-                xpos,
-                height + CELL_SPACING);
-}
-
-/* ROW RESIZING */
-static void
-draw_xor_hline (GtkSheet *sheet)
-
-{
-  gint width;
-  gint ypos = sheet->y_drag;
-
-  gdk_drawable_get_size (sheet->sheet_window,
-                        &width, NULL);
-
-
-  if (sheet->column_titles_visible)
-    ypos += sheet->column_title_area.height;
-
-  gdk_draw_line (GTK_WIDGET (sheet)->window, sheet->xor_gc,
-                sheet->row_title_area.width,
-                ypos,
-                width + CELL_SPACING,
-                ypos);
-}
-
-/* SELECTED RANGE */
-static void
-draw_xor_rectangle (GtkSheet *sheet, GtkSheetRange range)
-{
-  gint i = 0;
-  GdkRectangle clip_area, area;
-  GdkGCValues values;
-
-  area.x = psppire_axis_start_pixel (sheet->haxis, range.col0);
-  area.y = psppire_axis_start_pixel (sheet->vaxis, range.row0);
-  area.width = psppire_axis_start_pixel (sheet->haxis, range.coli)- area.x+
-    psppire_axis_unit_size (sheet->haxis, range.coli);
-  area.height = psppire_axis_start_pixel (sheet->vaxis, range.rowi)- area.y +
-    psppire_axis_unit_size (sheet->vaxis, range.rowi);
-
-  clip_area.x = sheet->row_title_area.width;
-  clip_area.y = sheet->column_title_area.height;
-
-  gdk_drawable_get_size (sheet->sheet_window,
-                        &clip_area.width, &clip_area.height);
-
-  if (!sheet->row_titles_visible) clip_area.x = 0;
-  if (!sheet->column_titles_visible) clip_area.y = 0;
-
-  if (area.x < 0)
-    {
-      area.width = area.width + area.x;
-      area.x = 0;
-    }
-  if (area.width > clip_area.width) area.width = clip_area.width + 10;
-  if (area.y < 0)
-    {
-      area.height = area.height + area.y;
-      area.y = 0;
-    }
-  if (area.height > clip_area.height) area.height = clip_area.height + 10;
-
-  clip_area.x--;
-  clip_area.y--;
-  clip_area.width += 3;
-  clip_area.height += 3;
-
-  gdk_gc_get_values (sheet->xor_gc, &values);
-
-  gdk_gc_set_clip_rectangle (sheet->xor_gc, &clip_area);
-
-  gdk_draw_rectangle (sheet->sheet_window,
-                     sheet->xor_gc,
-                     FALSE,
-                     area.x + i, area.y + i,
-                     area.width - 2 * i, area.height - 2 * i);
-
-
-  gdk_gc_set_clip_rectangle (sheet->xor_gc, NULL);
-
-  gdk_gc_set_foreground (sheet->xor_gc, &values.foreground);
-}
-
-
-static void
-set_column_width (GtkSheet *sheet,
-                 gint column,
-                 gint width)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (column < 0 || column >= psppire_axis_unit_count (sheet->haxis))
-    return;
-
-  if ( width <= 0)
-    return;
-
-  psppire_axis_resize (sheet->haxis, column, width);
-
-  if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    {
-      draw_column_title_buttons (sheet);
-      adjust_scrollbars (sheet);
-      gtk_sheet_size_allocate_entry (sheet);
-      redraw_range (sheet, NULL);
-    }
-}
-
-static void
-set_row_height (GtkSheet *sheet,
-               gint row,
-               gint height)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  if (row < 0 || row >= psppire_axis_unit_count (sheet->vaxis))
-    return;
-
-  if (height <= 0)
-    return;
-
-  psppire_axis_resize (sheet->vaxis, row, height);
-
-  if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)) )
-    {
-      draw_row_title_buttons (sheet);
-      adjust_scrollbars (sheet);
-      gtk_sheet_size_allocate_entry (sheet);
-      redraw_range (sheet, NULL);
-    }
-}
-
-gboolean
-gtk_sheet_get_attributes (const GtkSheet *sheet, gint row, gint col,
-                         GtkSheetCellAttr *attr)
-{
-  GdkColor *fg, *bg;
-  const GtkJustification *j ;
-  GdkColormap *colormap;
-
-  g_return_val_if_fail (sheet != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
-
-  if (row < 0 || col < 0) return FALSE;
-
-  attr->foreground = GTK_WIDGET (sheet)->style->black;
-  attr->background = sheet->color[BG_COLOR];
-
-  attr->border.width = 0;
-  attr->border.line_style = GDK_LINE_SOLID;
-  attr->border.cap_style = GDK_CAP_NOT_LAST;
-  attr->border.join_style = GDK_JOIN_MITER;
-  attr->border.mask = 0;
-  attr->border.color = GTK_WIDGET (sheet)->style->black;
-
-  attr->is_editable = psppire_sheet_model_is_editable (sheet->model, row, col);
-
-  colormap = gtk_widget_get_colormap (GTK_WIDGET (sheet));
-  fg = psppire_sheet_model_get_foreground (sheet->model, row, col);
-  if ( fg )
-    {
-      gdk_colormap_alloc_color (colormap, fg, TRUE, TRUE);
-      attr->foreground = *fg;
-    }
-
-  bg = psppire_sheet_model_get_background (sheet->model, row, col);
-  if ( bg )
-    {
-      gdk_colormap_alloc_color (colormap, bg, TRUE, TRUE);
-      attr->background = *bg;
-    }
-
-  attr->justification =
-    psppire_sheet_model_get_column_justification (sheet->model, col);
-
-  j = psppire_sheet_model_get_justification (sheet->model, row, col);
-  if (j)
-    attr->justification = *j;
-
-  return TRUE;
-}
-
-static void
-gtk_sheet_button_size_request   (GtkSheet *sheet,
-                                 const GtkSheetButton *button,
-                                 GtkRequisition *button_requisition)
-{
-  GtkRequisition requisition;
-  GtkRequisition label_requisition;
-
-  label_requisition.height = DEFAULT_ROW_HEIGHT;
-  label_requisition.width = COLUMN_MIN_WIDTH;
-
-  requisition.height = DEFAULT_ROW_HEIGHT;
-  requisition.width = COLUMN_MIN_WIDTH;
-
-
-  *button_requisition = requisition;
-  button_requisition->width = MAX (requisition.width, label_requisition.width);
-  button_requisition->height = MAX (requisition.height, label_requisition.height);
-
-}
-
-static void
-gtk_sheet_forall (GtkContainer *container,
-                 gboolean include_internals,
-                 GtkCallback callback,
-                 gpointer callback_data)
-{
-  GtkSheet *sheet = GTK_SHEET (container);
-
-  g_return_if_fail (callback != NULL);
-
-  if (sheet->button && sheet->button->parent)
-    (* callback) (sheet->button, callback_data);
-
-  if (sheet->entry_widget && GTK_IS_CONTAINER (sheet->entry_widget))
-    (* callback) (sheet->entry_widget, callback_data);
-}
-
-
-PsppireSheetModel *
-gtk_sheet_get_model (const GtkSheet *sheet)
-{
-  g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL);
-
-  return sheet->model;
-}
-
-
-GtkSheetButton *
-gtk_sheet_button_new (void)
-{
-  GtkSheetButton *button = g_malloc (sizeof (GtkSheetButton));
-
-  button->state = GTK_STATE_NORMAL;
-  button->label = NULL;
-  button->label_visible = TRUE;
-  button->justification = GTK_JUSTIFY_FILL;
-
-  return button;
-}
-
-
-void
-gtk_sheet_button_free (GtkSheetButton *button)
-{
-  if (!button) return ;
-
-  g_free (button->label);
-  g_free (button);
-}
-
-static void
-append_cell_text (GString *string, const GtkSheet *sheet, gint r, gint c)
-{
-  gchar *celltext = gtk_sheet_cell_get_text (sheet, r, c);
-
-  if ( NULL == celltext)
-    return;
-
-  g_string_append (string, celltext);
-  g_free (celltext);
-}
-
-
-static GString *
-range_to_text (const GtkSheet *sheet)
-{
-  gint r, c;
-  GString *string;
-
-  if ( !gtk_sheet_range_isvisible (sheet, &sheet->range))
-    return NULL;
-
-  string = g_string_sized_new (80);
-
-  for (r = sheet->range.row0; r <= sheet->range.rowi; ++r)
-    {
-      for (c = sheet->range.col0; c < sheet->range.coli; ++c)
-       {
-         append_cell_text (string, sheet, r, c);
-         g_string_append (string, "\t");
-       }
-      append_cell_text (string, sheet, r, c);
-      if ( r < sheet->range.rowi)
-       g_string_append (string, "\n");
-    }
-
-  return string;
-}
-
-static GString *
-range_to_html (const GtkSheet *sheet)
-{
-  gint r, c;
-  GString *string;
-
-  if ( !gtk_sheet_range_isvisible (sheet, &sheet->range))
-    return NULL;
-
-  string = g_string_sized_new (480);
-
-  g_string_append (string, "<html>\n");
-  g_string_append (string, "<body>\n");
-  g_string_append (string, "<table>\n");
-  for (r = sheet->range.row0; r <= sheet->range.rowi; ++r)
-    {
-      g_string_append (string, "<tr>\n");
-      for (c = sheet->range.col0; c <= sheet->range.coli; ++c)
-       {
-         g_string_append (string, "<td>");
-         append_cell_text (string, sheet, r, c);
-         g_string_append (string, "</td>\n");
-       }
-      g_string_append (string, "</tr>\n");
-    }
-  g_string_append (string, "</table>\n");
-  g_string_append (string, "</body>\n");
-  g_string_append (string, "</html>\n");
-
-  return string;
-}
-
-enum {
-  SELECT_FMT_NULL,
-  SELECT_FMT_TEXT,
-  SELECT_FMT_HTML
-};
-
-static void
-primary_get_cb (GtkClipboard     *clipboard,
-               GtkSelectionData *selection_data,
-               guint             info,
-               gpointer          data)
-{
-  GtkSheet *sheet = GTK_SHEET (data);
-  GString *string = NULL;
-
-  switch (info)
-    {
-    case SELECT_FMT_TEXT:
-      string = range_to_text (sheet);
-      break;
-    case SELECT_FMT_HTML:
-      string = range_to_html (sheet);
-      break;
-    default:
-      g_assert_not_reached ();
-    }
-
-  gtk_selection_data_set (selection_data, selection_data->target,
-                         8,
-                         (const guchar *) string->str, string->len);
-  g_string_free (string, TRUE);
-}
-
-static void
-primary_clear_cb (GtkClipboard *clipboard,
-                 gpointer      data)
-{
-  GtkSheet *sheet = GTK_SHEET (data);
-  if ( ! GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
-    return;
-
-  gtk_sheet_real_unselect_range (sheet, NULL);
-}
-
-static void
-gtk_sheet_update_primary_selection (GtkSheet *sheet)
-{
-  static const GtkTargetEntry targets[] = {
-    { "UTF8_STRING",   0, SELECT_FMT_TEXT },
-    { "STRING",        0, SELECT_FMT_TEXT },
-    { "TEXT",          0, SELECT_FMT_TEXT },
-    { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT },
-    { "text/plain;charset=utf-8", 0, SELECT_FMT_TEXT },
-    { "text/plain",    0, SELECT_FMT_TEXT },
-    { "text/html",     0, SELECT_FMT_HTML }
-  };
-
-  GtkClipboard *clipboard;
-
-  if (!GTK_WIDGET_REALIZED (sheet))
-    return;
-
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (sheet),
-                                       GDK_SELECTION_PRIMARY);
-
-  if (gtk_sheet_range_isvisible (sheet, &sheet->range))
-    {
-      if (!gtk_clipboard_set_with_owner (clipboard, targets,
-                                        G_N_ELEMENTS (targets),
-                                        primary_get_cb, primary_clear_cb,
-                                        G_OBJECT (sheet)))
-       primary_clear_cb (clipboard, sheet);
-    }
-  else
-    {
-      if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (sheet))
-       gtk_clipboard_clear (clipboard);
-    }
-}
diff --git a/lib/gtksheet/gtksheet.h b/lib/gtksheet/gtksheet.h
deleted file mode 100644 (file)
index bdefc41..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-/* This version of GtkSheet has been heavily modified, for the specific
-   requirements of PSPPIRE. */
-
-
-/* GtkSheet widget for Gtk+.
- * Copyright (C) 1999-2001 Adrian E. Feiguin <adrian@ifir.ifir.edu.ar>
- *
- * Based on GtkClist widget by Jay Painter, but major changes.
- * Memory allocation routines inspired on SC (Spreadsheet Calculator)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __GTK_SHEET_H__
-#define __GTK_SHEET_H__
-
-#include <gtk/gtk.h>
-
-#include "gtkextra-sheet.h"
-#include "psppire-sheetmodel.h"
-#include "psppire-axis.h"
-
-G_BEGIN_DECLS
-
-/* sheet->state */
-enum
-{
-  GTK_SHEET_NORMAL,
-  GTK_SHEET_ROW_SELECTED,
-  GTK_SHEET_COLUMN_SELECTED,
-  GTK_SHEET_RANGE_SELECTED
-};
-
-
-#define GTK_TYPE_SHEET_RANGE (gtk_sheet_range_get_type ())
-#define GTK_TYPE_SHEET_CELL (gtk_sheet_cell_get_type ())
-#define GTK_TYPE_SHEET (gtk_sheet_get_type ())
-
-#define GTK_SHEET(obj)          GTK_CHECK_CAST (obj, gtk_sheet_get_type (), GtkSheet)
-#define GTK_SHEET_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_sheet_get_type (), GtkSheetClass)
-#define GTK_IS_SHEET(obj)       GTK_CHECK_TYPE (obj, gtk_sheet_get_type ())
-
-
-typedef struct _GtkSheetClass GtkSheetClass;
-typedef struct _GtkSheetCellAttr     GtkSheetCellAttr;
-
-typedef struct _GtkSheetHoverTitle GtkSheetHoverTitle;
-
-
-struct _GtkSheetCellAttr
-{
-  GtkJustification justification;
-  GdkColor foreground;
-  GdkColor background;
-  GtkSheetCellBorder border;
-  gboolean is_editable;
-};
-
-struct _GtkSheetHoverTitle
-{
-  GtkWidget *window;
-  GtkWidget *label;
-  gint row, column;
-};
-
-enum
-  {
-    BG_COLOR,
-    GRID_COLOR,
-    n_COLORS
-  };
-
-struct _GtkSheet
-{
-  GtkBin parent;
-
-  gboolean dispose_has_run;
-  PsppireAxis *haxis;
-  PsppireAxis *vaxis;
-
-  guint16 flags;
-
-  PsppireSheetModel *model;
-
-  GtkSelectionMode selection_mode;
-
-  /* Component colors */
-  GdkColor color[n_COLORS];
-  gboolean show_grid;
-
-  /* active cell */
-  GtkSheetCell active_cell;
-
-  /* The GtkEntry used for editing the cells */
-  GtkWidget *entry_widget;
-
-  /* The type of entry_widget */
-  GtkType entry_type;
-
-  /* expanding selection */
-  GtkSheetCell selection_cell;
-
-  /* global selection button */
-  GtkWidget *button;
-
-  /* sheet state */
-  gint state;
-
-  /* selected range */
-  GtkSheetRange range;
-
-  /* the scrolling window and its height and width to
-   * make things a little speedier */
-  GdkWindow *sheet_window;
-
-  /* border shadow style */
-  GtkShadowType shadow_type;
-
-  /* Column Titles */
-  GdkRectangle column_title_area;
-  GdkWindow *column_title_window;
-  gboolean column_titles_visible;
-  /* TRUE if the cursor is over the column title window */
-  gboolean column_title_under;
-
-  /* Row Titles */
-  GdkRectangle row_title_area;
-  GdkWindow *row_title_window;
-  gboolean row_titles_visible;
-  /* TRUE if the cursor is over the row title window */
-  gboolean row_title_under;
-
-  /*scrollbars*/
-  GtkAdjustment *hadjustment;
-  GtkAdjustment *vadjustment;
-
-  /* xor GC for the verticle drag line */
-  GdkGC *xor_gc;
-
-  /* gc for drawing unselected cells */
-  GdkGC *fg_gc;
-  GdkGC *bg_gc;
-
-  /* cursor used to indicate dragging */
-  GdkCursor *cursor_drag;
-
-  /* the current x-pixel location of the xor-drag vline */
-  gint x_drag;
-
-  /* the current y-pixel location of the xor-drag hline */
-  gint y_drag;
-
-  /* current cell being dragged */
-  GtkSheetCell drag_cell;
-  /* current range being dragged */
-  GtkSheetRange drag_range;
-
-  /* Used for the subtitle (popups) */
-  gint motion_timer;
-  GtkSheetHoverTitle *hover_window;
-
-  gulong update_handler_id;
-};
-
-struct _GtkSheetClass
-{
-  GtkBinClass parent_class;
-
- gboolean (*set_scroll_adjustments) (GtkSheet *sheet,
-                                GtkAdjustment *hadjustment,
-                                GtkAdjustment *vadjustment);
-
- void (*select_row)            (GtkSheet *sheet, gint row);
-
- void (*select_column)                 (GtkSheet *sheet, gint column);
-
- void (*select_range)          (GtkSheet *sheet, GtkSheetRange *range);
-
- void (*resize_range)          (GtkSheet *sheet,
-                               GtkSheetRange *old_range,
-                               GtkSheetRange *new_range);
-
- void (*move_range)                    (GtkSheet *sheet,
-                               GtkSheetRange *old_range,
-                               GtkSheetRange *new_range);
-
- gboolean (*traverse)          (GtkSheet *sheet,
-                               gint row, gint column,
-                               gint *new_row, gint *new_column);
-
- gboolean (*activate)          (GtkSheet *sheet,
-                               gint row, gint column);
-
- void (*changed)               (GtkSheet *sheet,
-                               gint row, gint column);
-};
-
-GType gtk_sheet_get_type (void);
-GtkType gtk_sheet_range_get_type (void);
-
-
-/* create a new sheet */
-GtkWidget * gtk_sheet_new (PsppireSheetModel *model);
-
-/* create a new sheet with custom entry */
-GtkWidget *
-gtk_sheet_new_with_custom_entry (GtkType entry_type);
-
-/* Change entry */
-void gtk_sheet_change_entry            (GtkSheet *sheet, GtkType entry_type);
-
-GtkEntry *gtk_sheet_get_entry    (GtkSheet *sheet);
-
-
-void gtk_sheet_get_selected_range (GtkSheet *sheet,
-                                        GtkSheetRange *range);
-
-void gtk_sheet_show_grid         (GtkSheet *sheet,
-                                        gboolean show);
-
-gboolean gtk_sheet_grid_visible   (GtkSheet *sheet);
-
-
-/* scroll the viewing area of the sheet to the given column
- * and row; row_align and col_align are between 0-1 representing the
- * location the row should appear on the screen, 0.0 being top or left,
- * 1.0 being bottom or right; if row or column is negative then there
- * is no change */
-void gtk_sheet_moveto (GtkSheet *sheet,
-                 gint row,
-                 gint column,
-                 gfloat row_align,
-                  gfloat col_align);
-
-
-void gtk_sheet_show_row_titles         (GtkSheet *sheet);
-void gtk_sheet_hide_row_titles         (GtkSheet *sheet);
-void gtk_sheet_show_column_titles       (GtkSheet *sheet);
-void gtk_sheet_hide_column_titles      (GtkSheet *sheet);
-
-/* select the row. The range is then highlighted, and the bounds are stored
- * in sheet->range  */
-void gtk_sheet_select_row    (GtkSheet * sheet,  gint row);
-
-/* select the column. The range is then highlighted, and the bounds are stored
- * in sheet->range  */
-void gtk_sheet_select_column (GtkSheet * sheet,  gint column);
-
-/* highlight the selected range and store bounds in sheet->range */
-void gtk_sheet_select_range (GtkSheet *sheet, const GtkSheetRange *range);
-
-void gtk_sheet_get_visible_range (GtkSheet *sheet, GtkSheetRange *range);
-
-
-/* obvious */
-void gtk_sheet_unselect_range          (GtkSheet *sheet);
-
-/* set active cell where the entry will be displayed */
-void gtk_sheet_set_active_cell (GtkSheet *sheet,
-                               gint row, gint column);
-
-/* Sets *ROW and *COLUMN to be the coordinates of the active cell.
-   ROW and/or COLUMN may be null if the caller is not interested in their
-   values */
-void gtk_sheet_get_active_cell (GtkSheet *sheet,
-                                       gint *row, gint *column);
-
-/* get cell contents */
-gchar *gtk_sheet_cell_get_text (const GtkSheet *sheet, gint row, gint col);
-
-
-/* get cell attributes of the given cell */
-/* TRUE means that the cell is currently allocated */
-gboolean gtk_sheet_get_attributes       (const GtkSheet *sheet,
-                                       gint row, gint col,
-                                       GtkSheetCellAttr *attributes);
-
-void gtk_sheet_set_model (GtkSheet *sheet,
-                                  PsppireSheetModel *model);
-
-PsppireSheetModel * gtk_sheet_get_model (const GtkSheet *sheet);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_SHEET_H__ */
-
-
index 92250255f501eea0316a023dc44709d7309961c7..ef2c8826f554579d9d226c835563bc99c20062b5 100644 (file)
@@ -108,14 +108,14 @@ psppire_data_editor_finalize (GObject *obj)
 
 
 
-static void popup_variable_column_menu (GtkSheet *sheet, gint column,
+static void popup_variable_column_menu (PsppireSheet *sheet, gint column,
                                        GdkEventButton *event, gpointer data);
 
-static void popup_variable_row_menu (GtkSheet *sheet, gint row,
+static void popup_variable_row_menu (PsppireSheet *sheet, gint row,
                                     GdkEventButton *event, gpointer data);
 
 
-static void popup_cases_menu (GtkSheet *sheet, gint row,
+static void popup_cases_menu (PsppireSheet *sheet, gint row,
                              GdkEventButton *event, gpointer data);
 
 
@@ -127,22 +127,22 @@ static void popup_cases_menu (GtkSheet *sheet, gint row,
 static gboolean
 on_data_column_clicked (PsppireDataEditor *de, gint col, gpointer data)
 {
-  GtkSheetRange visible_range;
+  PsppireSheetRange visible_range;
   gint current_row, current_column;
 
   gtk_notebook_set_current_page (GTK_NOTEBOOK (de),
                                 PSPPIRE_DATA_EDITOR_VARIABLE_VIEW);
 
-  gtk_sheet_get_active_cell (GTK_SHEET (de->var_sheet),
+  psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->var_sheet),
                             &current_row, &current_column);
 
-  gtk_sheet_set_active_cell (GTK_SHEET (de->var_sheet), col, current_column);
+  psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->var_sheet), col, current_column);
 
 
-  gtk_sheet_get_visible_range (GTK_SHEET (de->var_sheet), &visible_range);
+  psppire_sheet_get_visible_range (PSPPIRE_SHEET (de->var_sheet), &visible_range);
 
   if ( col < visible_range.row0 || col > visible_range.rowi)
-    gtk_sheet_moveto (GTK_SHEET (de->var_sheet), col, current_column, 0.5, 0.5);
+    psppire_sheet_moveto (PSPPIRE_SHEET (de->var_sheet), col, current_column, 0.5, 0.5);
 
 
   return FALSE;
@@ -154,21 +154,21 @@ on_data_column_clicked (PsppireDataEditor *de, gint col, gpointer data)
 static gboolean
 on_var_row_clicked (PsppireDataEditor *de, gint row, gpointer data)
 {
-  GtkSheetRange visible_range;
+  PsppireSheetRange visible_range;
 
   gint current_row, current_column;
 
   gtk_notebook_set_current_page (GTK_NOTEBOOK(de), PSPPIRE_DATA_EDITOR_DATA_VIEW);
 
-  gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]),
+  psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]),
                             &current_row, &current_column);
 
-  gtk_sheet_set_active_cell (GTK_SHEET (de->data_sheet[0]), current_row, row);
+  psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), current_row, row);
 
-  gtk_sheet_get_visible_range (GTK_SHEET (de->data_sheet[0]), &visible_range);
+  psppire_sheet_get_visible_range (PSPPIRE_SHEET (de->data_sheet[0]), &visible_range);
 
   if ( row < visible_range.col0 || row > visible_range.coli)
-    gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), -1, row, 0.5, 0.5);
+    psppire_sheet_moveto (PSPPIRE_SHEET (de->data_sheet[0]), -1, row, 0.5, 0.5);
 
   return FALSE;
 }
@@ -177,9 +177,9 @@ on_var_row_clicked (PsppireDataEditor *de, gint row, gpointer data)
 /* Moves the focus to a new cell.
    Returns TRUE iff the move should be disallowed */
 static gboolean
-traverse_cell_callback (GtkSheet *sheet,
-                       GtkSheetCell *existing_cell,
-                       GtkSheetCell *new_cell,
+traverse_cell_callback (PsppireSheet *sheet,
+                       PsppireSheetCell *existing_cell,
+                       PsppireSheetCell *new_cell,
                        gpointer data)
 {
   PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
@@ -446,14 +446,14 @@ psppire_data_editor_set_property (GObject         *object,
        switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (object)))
          {
          case PSPPIRE_DATA_EDITOR_DATA_VIEW:
-           gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
-           gtk_sheet_set_active_cell (GTK_SHEET (de->data_sheet[0]), row, var);
-           gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), -1, var, 0.5, 0.5);
+           psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
+           psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), row, var);
+           psppire_sheet_moveto (PSPPIRE_SHEET (de->data_sheet[0]), -1, var, 0.5, 0.5);
            break;
          case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
-           gtk_sheet_get_active_cell (GTK_SHEET (de->var_sheet), &row, &col);
-           gtk_sheet_set_active_cell (GTK_SHEET (de->var_sheet), var, col);
-           gtk_sheet_moveto (GTK_SHEET (de->var_sheet), var, -1,  0.5, 0.5);
+           psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->var_sheet), &row, &col);
+           psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->var_sheet), var, col);
+           psppire_sheet_moveto (PSPPIRE_SHEET (de->var_sheet), var, -1,  0.5, 0.5);
            break;
          default:
            g_assert_not_reached ();
@@ -465,9 +465,9 @@ psppire_data_editor_set_property (GObject         *object,
       {
        gint row, col;
        gint case_num = g_value_get_long (value);
-       gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
-       gtk_sheet_set_active_cell (GTK_SHEET (de->data_sheet[0]), case_num, col);
-       gtk_sheet_moveto (GTK_SHEET (de->data_sheet[0]), case_num, -1, 0.5, 0.5);
+       psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
+       psppire_sheet_set_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), case_num, col);
+       psppire_sheet_moveto (PSPPIRE_SHEET (de->data_sheet[0]), case_num, -1, 0.5, 0.5);
       }
       break;
     case PROP_VALUE_LABELS:
@@ -504,14 +504,14 @@ psppire_data_editor_get_property (GObject         *object,
     case PROP_CURRENT_CASE:
       {
        gint row, column;
-       gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &column);
+       psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &column);
        g_value_set_long (value, row);
       }
       break;
     case PROP_CURRENT_VAR:
       {
        gint row, column;
-       gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &column);
+       psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &column);
        g_value_set_long (value, column);
       }
       break;
@@ -715,7 +715,7 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass)
 
 /* Update the data_ref_entry with the reference of the active cell */
 static gint
-update_data_ref_entry (const GtkSheet *sheet,
+update_data_ref_entry (const PsppireSheet *sheet,
                       gint row, gint col,
                       gint old_row, gint old_col,
                       gpointer data)
@@ -723,7 +723,7 @@ update_data_ref_entry (const GtkSheet *sheet,
   PsppireDataEditor *de = data;
 
   PsppireDataStore *data_store =
-    PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+    PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet));
 
   if (data_store)
     {
@@ -783,7 +783,7 @@ datum_entry_activate (GtkEntry *entry, gpointer data)
 
   const gchar *text = gtk_entry_get_text (entry);
 
-  gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &column);
+  psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &column);
 
   if ( row == -1 || column == -1)
     return;
@@ -795,8 +795,8 @@ static void on_activate (PsppireDataEditor *de);
 static gboolean on_switch_page (PsppireDataEditor *de, GtkNotebookPage *p, gint pagenum, gpointer data);
 static void on_select_range (PsppireDataEditor *de);
 
-static void on_select_row (GtkSheet *, gint, PsppireDataEditor *);
-static void on_select_variable (GtkSheet *, gint, PsppireDataEditor *);
+static void on_select_row (PsppireSheet *, gint, PsppireDataEditor *);
+static void on_select_variable (PsppireSheet *, gint, PsppireDataEditor *);
 
 
 static void on_owner_change (GtkClipboard *,
@@ -820,7 +820,7 @@ init_sheet (PsppireDataEditor *de, int i,
 {
   de->sheet_bin[i] = gtk_scrolled_window_new (hadj, vadj);
 
-  de->data_sheet[i] = gtk_sheet_new (NULL);
+  de->data_sheet[i] = psppire_sheet_new (NULL);
 
   g_object_set (de->sheet_bin[i],
                "border-width", 3,
@@ -873,7 +873,7 @@ init_data_sheet (PsppireDataEditor *de)
   init_sheet (de, 1, NULL, vadj0, de->vaxis[0], de->haxis);
   gtk_widget_show (de->sheet_bin[1]);
   sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[1]));
-  gtk_sheet_hide_row_titles (GTK_SHEET (sheet));
+  psppire_sheet_hide_row_titles (PSPPIRE_SHEET (sheet));
   hadj1 = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[1]));
   g_object_set (de->sheet_bin[1], "vscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
   g_object_set (de->sheet_bin[1], "hscrollbar-policy", GTK_POLICY_NEVER, NULL);
@@ -881,7 +881,7 @@ init_data_sheet (PsppireDataEditor *de)
   init_sheet (de, 2, hadj0, NULL, de->vaxis[1], de->haxis);
   gtk_widget_show (de->sheet_bin[2]);
   sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[2]));
-  gtk_sheet_hide_column_titles (GTK_SHEET (sheet));
+  psppire_sheet_hide_column_titles (PSPPIRE_SHEET (sheet));
   g_object_set (de->sheet_bin[2], "vscrollbar-policy", GTK_POLICY_NEVER, NULL);
   g_object_set (de->sheet_bin[2], "hscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
   vadj1 = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (de->sheet_bin[2]));
@@ -889,8 +889,8 @@ init_data_sheet (PsppireDataEditor *de)
   init_sheet (de, 3, hadj1, vadj1, de->vaxis[1], de->haxis);
   gtk_widget_show (de->sheet_bin[3]);
   sheet = gtk_bin_get_child (GTK_BIN (de->sheet_bin[3]));
-  gtk_sheet_hide_column_titles (GTK_SHEET (sheet));
-  gtk_sheet_hide_row_titles (GTK_SHEET (sheet));
+  psppire_sheet_hide_column_titles (PSPPIRE_SHEET (sheet));
+  psppire_sheet_hide_row_titles (PSPPIRE_SHEET (sheet));
   g_object_set (de->sheet_bin[3], "vscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
   g_object_set (de->sheet_bin[3], "hscrollbar-policy", GTK_POLICY_ALWAYS, NULL);
 
@@ -995,8 +995,8 @@ psppire_data_editor_init (PsppireDataEditor *de)
 
 
 
-  //     gtk_sheet_hide_column_titles (de->var_sheet);
-  //  gtk_sheet_hide_row_titles (de->data_sheet);
+  //     psppire_sheet_hide_column_titles (de->var_sheet);
+  //  psppire_sheet_hide_row_titles (de->data_sheet);
 
 
   de->dispose_has_run = FALSE;
@@ -1074,7 +1074,7 @@ psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split)
   gtk_widget_show_all (de->data_vbox);
 }
 
-static void data_sheet_set_clip (GtkSheet *sheet);
+static void data_sheet_set_clip (PsppireSheet *sheet);
 static void data_sheet_contents_received_callback (GtkClipboard *clipboard,
                                                   GtkSelectionData *sd,
                                                   gpointer data);
@@ -1083,7 +1083,7 @@ static void data_sheet_contents_received_callback (GtkClipboard *clipboard,
 void
 psppire_data_editor_clip_copy (PsppireDataEditor *de)
 {
-  data_sheet_set_clip (GTK_SHEET (de->data_sheet[0]));
+  data_sheet_set_clip (PSPPIRE_SHEET (de->data_sheet[0]));
 }
 
 void
@@ -1106,19 +1106,19 @@ psppire_data_editor_clip_cut (PsppireDataEditor *de)
 {
   gint max_rows, max_columns;
   gint r;
-  GtkSheetRange range;
+  PsppireSheetRange range;
   PsppireDataStore *ds = de->data_store;
 
-  data_sheet_set_clip (GTK_SHEET (de->data_sheet[0]));
+  data_sheet_set_clip (PSPPIRE_SHEET (de->data_sheet[0]));
 
   /* Now blank all the cells */
-  gtk_sheet_get_selected_range (GTK_SHEET (de->data_sheet[0]), &range);
+  psppire_sheet_get_selected_range (PSPPIRE_SHEET (de->data_sheet[0]), &range);
 
    /* If nothing selected, then use active cell */
   if ( range.row0 < 0 || range.col0 < 0 )
     {
       gint row, col;
-      gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
+      psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
 
       range.row0 = range.rowi = row;
       range.col0 = range.coli = col;
@@ -1159,7 +1159,7 @@ psppire_data_editor_clip_cut (PsppireDataEditor *de)
     }
 
   /* and remove the selection */
-  gtk_sheet_unselect_range (GTK_SHEET (de->data_sheet[0]));
+  psppire_sheet_unselect_range (PSPPIRE_SHEET (de->data_sheet[0]));
 }
 
 
@@ -1168,20 +1168,20 @@ psppire_data_editor_clip_cut (PsppireDataEditor *de)
 /* Popup menu related stuff */
 
 static void
-popup_variable_column_menu (GtkSheet *sheet, gint column,
+popup_variable_column_menu (PsppireSheet *sheet, gint column,
                     GdkEventButton *event, gpointer data)
 {
   GtkMenu *menu = GTK_MENU (data);
 
   PsppireDataStore *data_store =
-    PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+    PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet));
 
   const struct variable *v =
     psppire_dict_get_variable (data_store->dict, column);
 
   if ( v && event->button == 3)
     {
-      gtk_sheet_select_column (sheet, column);
+      psppire_sheet_select_column (sheet, column);
 
       gtk_menu_popup (menu,
                      NULL, NULL, NULL, NULL,
@@ -1191,20 +1191,20 @@ popup_variable_column_menu (GtkSheet *sheet, gint column,
 
 
 static void
-popup_variable_row_menu (GtkSheet *sheet, gint row,
+popup_variable_row_menu (PsppireSheet *sheet, gint row,
                     GdkEventButton *event, gpointer data)
 {
   GtkMenu *menu = GTK_MENU (data);
 
   PsppireVarStore *var_store =
-    PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
+    PSPPIRE_VAR_STORE (psppire_sheet_get_model (sheet));
 
   const struct variable *v =
     psppire_dict_get_variable (var_store->dict, row);
 
   if ( v && event->button == 3)
     {
-      gtk_sheet_select_row (sheet, row);
+      psppire_sheet_select_row (sheet, row);
 
       gtk_menu_popup (menu,
                      NULL, NULL, NULL, NULL,
@@ -1214,18 +1214,18 @@ popup_variable_row_menu (GtkSheet *sheet, gint row,
 
 
 static void
-popup_cases_menu (GtkSheet *sheet, gint row,
+popup_cases_menu (PsppireSheet *sheet, gint row,
                  GdkEventButton *event, gpointer data)
 {
   GtkMenu *menu = GTK_MENU (data);
 
   PsppireDataStore *data_store =
-    PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+    PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet));
 
   if ( row <= psppire_data_store_get_case_count (data_store) &&
        event->button == 3)
     {
-      gtk_sheet_select_row (sheet, row);
+      psppire_sheet_select_row (sheet, row);
 
       gtk_menu_popup (menu,
                      NULL, NULL, NULL, NULL,
@@ -1263,8 +1263,8 @@ do_sort (PsppireDataStore *ds, int var, gboolean descend)
 void
 psppire_data_editor_sort_ascending  (PsppireDataEditor *de)
 {
-  GtkSheetRange range;
-  gtk_sheet_get_selected_range (GTK_SHEET(de->data_sheet[0]), &range);
+  PsppireSheetRange range;
+  psppire_sheet_get_selected_range (PSPPIRE_SHEET(de->data_sheet[0]), &range);
 
   do_sort (de->data_store,  range.col0, FALSE);
 }
@@ -1275,8 +1275,8 @@ psppire_data_editor_sort_ascending  (PsppireDataEditor *de)
 void
 psppire_data_editor_sort_descending (PsppireDataEditor *de)
 {
-  GtkSheetRange range;
-  gtk_sheet_get_selected_range (GTK_SHEET(de->data_sheet[0]), &range);
+  PsppireSheetRange range;
+  psppire_sheet_get_selected_range (PSPPIRE_SHEET(de->data_sheet[0]), &range);
 
   do_sort (de->data_store,  range.col0, TRUE);
 }
@@ -1294,16 +1294,16 @@ psppire_data_editor_insert_variable (PsppireDataEditor *de)
   switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de)))
     {
     case PSPPIRE_DATA_EDITOR_DATA_VIEW:
-      if ( de->data_sheet[0]->state == GTK_SHEET_COLUMN_SELECTED )
-       posn = GTK_SHEET (de->data_sheet[0])->range.col0;
+      if ( de->data_sheet[0]->state == PSPPIRE_SHEET_COLUMN_SELECTED )
+       posn = PSPPIRE_SHEET (de->data_sheet[0])->range.col0;
       else
-       posn = GTK_SHEET (de->data_sheet[0])->active_cell.col;
+       posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.col;
       break;
     case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
-      if ( de->var_sheet->state == GTK_SHEET_ROW_SELECTED )
-       posn = GTK_SHEET (de->var_sheet)->range.row0;
+      if ( de->var_sheet->state == PSPPIRE_SHEET_ROW_SELECTED )
+       posn = PSPPIRE_SHEET (de->var_sheet)->range.row0;
       else
-       posn = GTK_SHEET (de->var_sheet)->active_cell.row;
+       posn = PSPPIRE_SHEET (de->var_sheet)->active_cell.row;
       break;
     default:
       g_assert_not_reached ();
@@ -1319,10 +1319,10 @@ psppire_data_editor_insert_case (PsppireDataEditor *de)
 {
   glong posn = -1;
 
-  if ( de->data_sheet[0]->state == GTK_SHEET_ROW_SELECTED )
-    posn = GTK_SHEET (de->data_sheet[0])->range.row0;
+  if ( de->data_sheet[0]->state == PSPPIRE_SHEET_ROW_SELECTED )
+    posn = PSPPIRE_SHEET (de->data_sheet[0])->range.row0;
   else
-    posn = GTK_SHEET (de->data_sheet[0])->active_cell.row;
+    posn = PSPPIRE_SHEET (de->data_sheet[0])->active_cell.row;
 
   if ( posn == -1 ) posn = 0;
 
@@ -1333,12 +1333,12 @@ psppire_data_editor_insert_case (PsppireDataEditor *de)
 void
 psppire_data_editor_delete_cases    (PsppireDataEditor *de)
 {
-  gint first = GTK_SHEET (de->data_sheet[0])->range.row0;
-  gint n = GTK_SHEET (de->data_sheet[0])->range.rowi - first + 1;
+  gint first = PSPPIRE_SHEET (de->data_sheet[0])->range.row0;
+  gint n = PSPPIRE_SHEET (de->data_sheet[0])->range.rowi - first + 1;
 
   psppire_data_store_delete_cases (de->data_store, first, n);
 
-  gtk_sheet_unselect_range (GTK_SHEET (de->data_sheet[0]));
+  psppire_sheet_unselect_range (PSPPIRE_SHEET (de->data_sheet[0]));
 }
 
 /* Delete the variables currently selected in the
@@ -1351,12 +1351,12 @@ psppire_data_editor_delete_variables (PsppireDataEditor *de)
   switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (de)))
     {
     case PSPPIRE_DATA_EDITOR_DATA_VIEW:
-      first = GTK_SHEET (de->data_sheet[0])->range.col0;
-      n = GTK_SHEET (de->data_sheet[0])->range.coli - first + 1;
+      first = PSPPIRE_SHEET (de->data_sheet[0])->range.col0;
+      n = PSPPIRE_SHEET (de->data_sheet[0])->range.coli - first + 1;
       break;
     case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
-      first = GTK_SHEET (de->var_sheet)->range.row0;
-      n = GTK_SHEET (de->var_sheet)->range.rowi - first + 1;
+      first = PSPPIRE_SHEET (de->var_sheet)->range.row0;
+      n = PSPPIRE_SHEET (de->var_sheet)->range.rowi - first + 1;
       break;
     default:
       g_assert_not_reached ();
@@ -1365,16 +1365,16 @@ psppire_data_editor_delete_variables (PsppireDataEditor *de)
 
   psppire_dict_delete_variables (de->var_store->dict, first, n);
 
-  gtk_sheet_unselect_range (GTK_SHEET (de->data_sheet[0]));
-  gtk_sheet_unselect_range (GTK_SHEET (de->var_sheet));
+  psppire_sheet_unselect_range (PSPPIRE_SHEET (de->data_sheet[0]));
+  psppire_sheet_unselect_range (PSPPIRE_SHEET (de->var_sheet));
 }
 
 
 void
 psppire_data_editor_show_grid (PsppireDataEditor *de, gboolean grid_visible)
 {
-  gtk_sheet_show_grid (GTK_SHEET (de->var_sheet), grid_visible);
-  gtk_sheet_show_grid (GTK_SHEET (de->data_sheet[0]), grid_visible);
+  psppire_sheet_show_grid (PSPPIRE_SHEET (de->var_sheet), grid_visible);
+  psppire_sheet_show_grid (PSPPIRE_SHEET (de->data_sheet[0]), grid_visible);
 }
 
 
@@ -1417,7 +1417,7 @@ static void
 on_activate (PsppireDataEditor *de)
 {
   gint row, col;
-  gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
+  psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
 
 
   if ( row < psppire_data_store_get_case_count (de->data_store)
@@ -1435,9 +1435,9 @@ on_activate (PsppireDataEditor *de)
 static void
 on_select_range (PsppireDataEditor *de)
 {
-  GtkSheetRange range;
+  PsppireSheetRange range;
 
-  gtk_sheet_get_selected_range (GTK_SHEET (de->data_sheet[0]), &range);
+  psppire_sheet_get_selected_range (PSPPIRE_SHEET (de->data_sheet[0]), &range);
 
   if ( range.rowi < psppire_data_store_get_case_count (de->data_store)
        &&
@@ -1471,13 +1471,13 @@ on_switch_page (PsppireDataEditor *de, GtkNotebookPage *p,
 static gboolean
 data_is_selected (PsppireDataEditor *de)
 {
-  GtkSheetRange range;
+  PsppireSheetRange range;
   gint row, col;
 
   if ( gtk_notebook_get_current_page (GTK_NOTEBOOK (de)) != PSPPIRE_DATA_EDITOR_DATA_VIEW)
     return FALSE;
 
-  gtk_sheet_get_active_cell (GTK_SHEET (de->data_sheet[0]), &row, &col);
+  psppire_sheet_get_active_cell (PSPPIRE_SHEET (de->data_sheet[0]), &row, &col);
 
   if ( row >= psppire_data_store_get_case_count (de->data_store)
        ||
@@ -1486,7 +1486,7 @@ data_is_selected (PsppireDataEditor *de)
       return FALSE;
     }
 
-  gtk_sheet_get_selected_range (GTK_SHEET (de->data_sheet[0]), &range);
+  psppire_sheet_get_selected_range (PSPPIRE_SHEET (de->data_sheet[0]), &range);
 
   if ( range.rowi >= psppire_data_store_get_case_count (de->data_store)
        ||
@@ -1500,14 +1500,14 @@ data_is_selected (PsppireDataEditor *de)
 
 
 static void
-on_select_row (GtkSheet *sheet, gint row, PsppireDataEditor *de)
+on_select_row (PsppireSheet *sheet, gint row, PsppireDataEditor *de)
 {
   g_signal_emit (de, data_editor_signals[CASES_SELECTED], 0, row);
 }
 
 
 static void
-on_select_variable (GtkSheet *sheet, gint var, PsppireDataEditor *de)
+on_select_variable (PsppireSheet *sheet, gint var, PsppireDataEditor *de)
 {
   g_signal_emit (de, data_editor_signals[VARIABLES_SELECTED], 0, var);
 }
@@ -1530,30 +1530,30 @@ static struct casereader *clip_datasheet = NULL;
 static struct dictionary *clip_dict = NULL;
 
 
-static void data_sheet_update_clipboard (GtkSheet *);
+static void data_sheet_update_clipboard (PsppireSheet *);
 
 /* Set the clip according to the currently
    selected range in the data sheet */
 static void
-data_sheet_set_clip (GtkSheet *sheet)
+data_sheet_set_clip (PsppireSheet *sheet)
 {
   int i;
   struct casewriter *writer ;
-  GtkSheetRange range;
+  PsppireSheetRange range;
   PsppireDataStore *ds;
   struct case_map *map = NULL;
   casenumber max_rows;
   size_t max_columns;
 
-  ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+  ds = PSPPIRE_DATA_STORE (psppire_sheet_get_model (sheet));
 
-  gtk_sheet_get_selected_range (sheet, &range);
+  psppire_sheet_get_selected_range (sheet, &range);
 
    /* If nothing selected, then use active cell */
   if ( range.row0 < 0 || range.col0 < 0 )
     {
       gint row, col;
-      gtk_sheet_get_active_cell (sheet, &row, &col);
+      psppire_sheet_get_active_cell (sheet, &row, &col);
 
       range.row0 = range.rowi = row;
       range.col0 = range.coli = col;
@@ -1789,7 +1789,7 @@ static const GtkTargetEntry targets[] = {
 
 
 static void
-data_sheet_update_clipboard (GtkSheet *sheet)
+data_sheet_update_clipboard (PsppireSheet *sheet)
 {
   GtkClipboard *clipboard =
     gtk_widget_get_clipboard (GTK_WIDGET (sheet),
@@ -1826,7 +1826,7 @@ data_sheet_contents_received_callback (GtkClipboard *clipboard,
   c = (char *) sd->data;
 
   /* Paste text to selected position */
-  gtk_sheet_get_active_cell (GTK_SHEET (data_editor->data_sheet[0]),
+  psppire_sheet_get_active_cell (PSPPIRE_SHEET (data_editor->data_sheet[0]),
                             &row, &column);
 
   g_return_if_fail (row >= 0);
index 615dd6520f4e17fce5b215bf89ed07266e49ebc2..429f258cc4109c48c5030c2440b33571d4133c5b 100644 (file)
@@ -58,7 +58,7 @@ psppire_var_sheet_get_type (void)
        (GInstanceInitFunc) psppire_var_sheet_init,
       };
 
-      vs_type = g_type_register_static (GTK_TYPE_SHEET, "PsppireVarSheet",
+      vs_type = g_type_register_static (PSPPIRE_TYPE_SHEET, "PsppireVarSheet",
                                        &vs_info, 0);
     }
 
@@ -240,12 +240,12 @@ change_measure (GtkComboBox *cb,
 /* Moves the focus to a new cell.
    Returns TRUE iff the move should be disallowed */
 static gboolean
-traverse_cell_callback (GtkSheet *sheet,
-                       const GtkSheetCell *existing_cell,
-                       GtkSheetCell *new_cell)
+traverse_cell_callback (PsppireSheet *sheet,
+                       const PsppireSheetCell *existing_cell,
+                       PsppireSheetCell *new_cell)
 {
   PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (sheet);
-  PsppireVarStore *var_store = PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
+  PsppireVarStore *var_store = PSPPIRE_VAR_STORE (psppire_sheet_get_model (sheet));
 
   gint n_vars = psppire_var_store_get_var_cnt (var_store);
 
@@ -254,7 +254,7 @@ traverse_cell_callback (GtkSheet *sheet,
 
   if ( existing_cell->row == n_vars && new_cell->row >= n_vars)
     {
-      GtkEntry *entry = gtk_sheet_get_entry (sheet);
+      GtkEntry *entry = psppire_sheet_get_entry (sheet);
 
       const gchar *name = gtk_entry_get_text (entry);
 
@@ -294,24 +294,24 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
                              gint oldrow, gint oldcolumn,
                              gpointer data)
 {
-  GtkSheetCellAttr attributes;
+  PsppireSheetCellAttr attributes;
   PsppireVarStore *var_store;
   PsppireVarSheetClass *vs_class =
     PSPPIRE_VAR_SHEET_CLASS(G_OBJECT_GET_CLASS (vs));
 
   struct variable *var ;
-  GtkSheet *sheet = GTK_SHEET (vs);
+  PsppireSheet *sheet = PSPPIRE_SHEET (vs);
 
   g_return_if_fail (sheet != NULL);
 
-  var_store = PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
+  var_store = PSPPIRE_VAR_STORE (psppire_sheet_get_model (sheet));
 
   g_assert (var_store);
 
   g_return_if_fail (oldcolumn == PSPPIRE_VAR_STORE_COL_NAME ||
                    row < psppire_var_store_get_var_cnt (var_store));
 
-  gtk_sheet_get_attributes (sheet, row, column, &attributes);
+  psppire_sheet_get_attributes (sheet, row, column, &attributes);
 
   var = psppire_var_store_get_var (var_store, row);
 
@@ -322,8 +322,8 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
        GtkEntry *entry;
        static GtkListStore *list_store = NULL;
        GtkComboBoxEntry *cbe;
-       gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
-       entry = gtk_sheet_get_entry (sheet);
+       psppire_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
+       entry = psppire_sheet_get_entry (sheet);
        cbe = GTK_COMBO_BOX_ENTRY (GTK_WIDGET (entry)->parent);
 
        if ( ! list_store) list_store = create_label_list (alignments);
@@ -342,8 +342,8 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
       {
        GtkEntry *entry;
        GtkComboBoxEntry *cbe;
-       gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
-       entry = gtk_sheet_get_entry (sheet);
+       psppire_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
+       entry = psppire_sheet_get_entry (sheet);
        cbe = GTK_COMBO_BOX_ENTRY (GTK_WIDGET (entry)->parent);
 
        gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
@@ -360,10 +360,10 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
       {
        PsppireCustomEntry *customEntry;
 
-       gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+       psppire_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
 
        customEntry =
-         PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
+         PSPPIRE_CUSTOM_ENTRY (psppire_sheet_get_entry (sheet));
 
        if ( var_is_long_string (var))
          g_object_set (customEntry,
@@ -383,10 +383,10 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
       {
        PsppireCustomEntry *customEntry;
 
-       gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+       psppire_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
 
        customEntry =
-         PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
+         PSPPIRE_CUSTOM_ENTRY (psppire_sheet_get_entry (sheet));
 
        if ( var_is_long_string (var))
          g_object_set (customEntry,
@@ -408,10 +408,10 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
       {
        PsppireCustomEntry *customEntry;
 
-       gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+       psppire_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
 
        customEntry =
-         PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
+         PSPPIRE_CUSTOM_ENTRY (psppire_sheet_get_entry (sheet));
 
 
        /* Popup the Variable Type dialog box */
@@ -432,7 +432,7 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
          {
            gint r_min, r_max;
 
-           const gchar *s = gtk_sheet_cell_get_text (sheet, row, column);
+           const gchar *s = psppire_sheet_cell_get_text (sheet, row, column);
 
            if (s)
              {
@@ -464,10 +464,10 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
                                         1.0, 1.0, 1.0 /* steps */
                                         );
 
-               gtk_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
+               psppire_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
 
                spinButton =
-                 GTK_SPIN_BUTTON (gtk_sheet_get_entry (sheet));
+                 GTK_SPIN_BUTTON (psppire_sheet_get_entry (sheet));
 
                gtk_spin_button_set_adjustment (spinButton, GTK_ADJUSTMENT (adj));
                gtk_spin_button_set_digits (spinButton, 0);
@@ -477,7 +477,7 @@ var_sheet_change_active_cell (PsppireVarSheet *vs,
       break;
 
     default:
-      gtk_sheet_change_entry (sheet, GTK_TYPE_ENTRY);
+      psppire_sheet_change_entry (sheet, GTK_TYPE_ENTRY);
       break;
     }
 }
index e705ef01ca7f4d3221e92e20cc784eb1f412efdb..79f911c887dba4772d7d634bd87d7f50901c017e 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtksheet/gtksheet.h>
+#include <gtksheet/psppire-sheet.h>
 #include "val-labs-dialog.h"
 #include "missing-val-dialog.h"
 #include "var-type-dialog.h"
@@ -40,7 +40,7 @@ typedef struct _PsppireVarSheetClass  PsppireVarSheetClass;
 
 struct _PsppireVarSheet
 {
-  GtkSheet parent;
+  PsppireSheet parent;
 
   gboolean dispose_has_run;
   gboolean may_create_vars;
@@ -53,7 +53,7 @@ struct _PsppireVarSheet
 
 struct _PsppireVarSheetClass
 {
-  GtkSheetClass parent_class;
+  PsppireSheetClass parent_class;
 
   GtkListStore *alignment_list;
   GtkListStore *measure_list;
index 73220e3b9ae4eb843dcd45ba783eed01c80f3b6e..92e3f893026ad110499eb45eb949e450356b6c45 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <errno.h>
 
-#include <gtksheet/gtksheet.h>
+#include <gtksheet/psppire-sheet.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <sys/stat.h>