Added popup menus to column and row title areas in datasheet.
[pspp-builds.git] / lib / gtksheet / gtksheet.c
index 082188bcf8aaee954811f425801a745803d96da7..05cc5fd43c3407f17b6fe235cf0b811fbecec7be 100644 (file)
@@ -460,10 +460,18 @@ static inline gint SHEET_WIDTH (GtkSheet *sheet)
   return cx;
 }
 
-#define MIN_VISIBLE_ROW(sheet) sheet->view.row0
-#define MAX_VISIBLE_ROW(sheet) sheet->view.rowi
-#define MIN_VISIBLE_COLUMN(sheet) sheet->view.col0
-#define MAX_VISIBLE_COLUMN(sheet) sheet->view.coli
+#define MIN_VISIBLE_ROW(sheet) \
+    ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1)
+
+#define MAX_VISIBLE_ROW(sheet) \
+    ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1)
+
+#define MIN_VISIBLE_COLUMN(sheet) \
+    COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1)
+
+#define MAX_VISIBLE_COLUMN(sheet) \
+    COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width)
+
 
 
 static inline gboolean
@@ -586,10 +594,10 @@ POSSIBLE_RESIZE (const GtkSheet *sheet, gint x, gint y,
     yyy_row_height (sheet, sheet->range.rowi);
 
   if (sheet->state == GTK_SHEET_COLUMN_SELECTED)
-    ydrag = ROW_TOP_YPIXEL (sheet, sheet->view.row0);
+    ydrag = ROW_TOP_YPIXEL (sheet, MIN_VISIBLE_ROW (sheet));
 
   if (sheet->state == GTK_SHEET_ROW_SELECTED)
-    xdrag = COLUMN_LEFT_XPIXEL (sheet, sheet->view.col0);
+    xdrag = COLUMN_LEFT_XPIXEL (sheet, MIN_VISIBLE_COLUMN (sheet));
 
   *drag_column = COLUMN_FROM_XPIXEL (sheet,x);
   *drag_row = ROW_FROM_YPIXEL (sheet,y);
@@ -706,10 +714,6 @@ static void gtk_sheet_draw_backing_pixmap   (GtkSheet *sheet,
 /* Scrollbars */
 
 static void adjust_scrollbars                   (GtkSheet * sheet);
-static void vadjustment_changed                         (GtkAdjustment * adjustment,
-                                                 gpointer data);
-static void hadjustment_changed                 (GtkAdjustment * adjustment,
-                                                 gpointer data);
 static void vadjustment_value_changed           (GtkAdjustment * adjustment,
                                                  gpointer data);
 static void hadjustment_value_changed           (GtkAdjustment * adjustment,
@@ -757,12 +761,11 @@ static void init_attributes                        (const GtkSheet *sheet, gint col,
 
 /* Memory allocation routines */
 static void gtk_sheet_real_range_clear                  (GtkSheet *sheet,
-                                                 const GtkSheetRange *range,
-                                                 gboolean delete);
+                                                 const GtkSheetRange *range);
+
 static void gtk_sheet_real_cell_clear           (GtkSheet *sheet,
                                                  gint row,
-                                                 gint column,
-                                                 gboolean delete);
+                                                 gint column);
 
 
 /* Container Functions */
@@ -794,6 +797,8 @@ enum
     SELECT_COLUMN,
     DOUBLE_CLICK_ROW,
     DOUBLE_CLICK_COLUMN,
+    BUTTON_EVENT_ROW,
+    BUTTON_EVENT_COLUMN,
     SELECT_RANGE,
     CLIP_RANGE,
     RESIZE_RANGE,
@@ -900,12 +905,16 @@ gtk_sheet_class_init (GtkSheetClass * klass)
    * A row has been selected.
    */
   sheet_signals[SELECT_ROW] =
-    gtk_signal_new ("select-row",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, select_row),
-                   gtkextra_VOID__INT,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+    g_signal_new ("select-row",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, select_row),
+                 NULL, NULL,
+                 gtkextra_VOID__INT,
+                 G_TYPE_NONE,
+                 1,
+                 G_TYPE_INT);
+
 
   /**
    * GtkSheet::select - column
@@ -915,147 +924,227 @@ gtk_sheet_class_init (GtkSheetClass * klass)
    * A column has been selected.
    */
   sheet_signals[SELECT_COLUMN] =
-    gtk_signal_new ("select-column",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, select_column),
-                   gtkextra_VOID__INT,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+    g_signal_new ("select-column",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, select_column),
+                 NULL, NULL,
+                 gtkextra_VOID__INT,
+                 G_TYPE_NONE,
+                 1,
+                 G_TYPE_INT);
 
 
   /**
-   * GtkSheet::double - click - row
+   * 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] =
-    gtk_signal_new ("double-click-row",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   0,
-                   gtkextra_VOID__INT,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+    g_signal_new ("double-click-row",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 0,
+                 NULL, NULL,
+                 gtkextra_VOID__INT,
+                 G_TYPE_NONE,
+                 1,
+                 G_TYPE_INT);
 
 
   /**
-   * GtkSheet::double - click - column
+   * 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] =
-    gtk_signal_new ("double-click-column",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   0,
-                   gtkextra_VOID__INT,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+    g_signal_new ("double-click-column",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 0,
+                 NULL, NULL,
+                 gtkextra_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,
+                 gtkextra_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,
+                 gtkextra_VOID__INT_POINTER,
+                 G_TYPE_NONE,
+                 2,
+                 G_TYPE_INT,
+                 G_TYPE_POINTER
+                 );
+
 
   sheet_signals[SELECT_RANGE] =
-    gtk_signal_new ("select-range",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, select_range),
-                   gtkextra_VOID__BOXED,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_SHEET_RANGE);
+    g_signal_new ("select-range",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, select_range),
+                 NULL, NULL,
+                 gtkextra_VOID__BOXED,
+                 G_TYPE_NONE,
+                 1,
+                 GTK_TYPE_SHEET_RANGE);
+
 
   sheet_signals[CLIP_RANGE] =
-    gtk_signal_new ("clip-range",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, clip_range),
-                   gtkextra_VOID__BOXED,
-                   GTK_TYPE_NONE, 1, GTK_TYPE_SHEET_RANGE);
+    g_signal_new ("clip-range",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, clip_range),
+                 NULL, NULL,
+                 gtkextra_VOID__BOXED,
+                 G_TYPE_NONE,
+                 1,
+                 GTK_TYPE_SHEET_RANGE);
 
   sheet_signals[RESIZE_RANGE] =
-    gtk_signal_new ("resize-range",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, resize_range),
-                   gtkextra_VOID__BOXED_BOXED,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE);
+    g_signal_new ("resize-range",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, resize_range),
+                 NULL, NULL,
+                 gtkextra_VOID__BOXED_BOXED,
+                 G_TYPE_NONE,
+                 2,
+                 GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE
+                 );
+
   sheet_signals[MOVE_RANGE] =
-    gtk_signal_new ("move-range",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, move_range),
-                   gtkextra_VOID__BOXED_BOXED,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE);
+    g_signal_new ("move-range",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, move_range),
+                 NULL, NULL,
+                 gtkextra_VOID__BOXED_BOXED,
+                 G_TYPE_NONE,
+                 2,
+                 GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE
+                 );
+
   sheet_signals[TRAVERSE] =
-    gtk_signal_new ("traverse",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, traverse),
-                   gtkextra_BOOLEAN__INT_INT_POINTER_POINTER,
-                   GTK_TYPE_BOOL, 4, GTK_TYPE_INT, GTK_TYPE_INT,
-                   GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+    g_signal_new ("traverse",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, traverse),
+                 NULL, NULL,
+                 gtkextra_BOOLEAN__INT_INT_POINTER_POINTER,
+                 G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_INT,
+                 G_TYPE_POINTER, G_TYPE_POINTER);
+
 
   sheet_signals[DEACTIVATE] =
-    gtk_signal_new ("deactivate",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, deactivate),
-                   gtkextra_BOOLEAN__INT_INT,
-                   GTK_TYPE_BOOL, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+    g_signal_new ("deactivate",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, deactivate),
+                 NULL, NULL,
+                 gtkextra_BOOLEAN__INT_INT,
+                 G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT);
 
   sheet_signals[ACTIVATE] =
-    gtk_signal_new ("activate",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, activate),
-                   gtkextra_BOOLEAN__INT_INT,
-                   GTK_TYPE_BOOL, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+    g_signal_new ("activate",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, activate),
+                 NULL, NULL,
+                 gtkextra_BOOLEAN__INT_INT,
+                 G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT);
 
   sheet_signals[SET_CELL] =
-    gtk_signal_new ("set-cell",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, set_cell),
-                   gtkextra_VOID__INT_INT,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+    g_signal_new ("set-cell",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, set_cell),
+                 NULL, NULL,
+                 gtkextra_VOID__INT_INT,
+                 G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+
 
   sheet_signals[CLEAR_CELL] =
-    gtk_signal_new ("clear-cell",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, clear_cell),
-                   gtkextra_VOID__INT_INT,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+    g_signal_new ("clear-cell",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, clear_cell),
+                 NULL, NULL,
+                 gtkextra_VOID__INT_INT,
+                 G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
   sheet_signals[CHANGED] =
-    gtk_signal_new ("changed",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, changed),
-                   gtkextra_VOID__INT_INT,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+    g_signal_new ("changed",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, changed),
+                 NULL, NULL,
+                 gtkextra_VOID__INT_INT,
+                 G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
   sheet_signals[NEW_COL_WIDTH] =
-    gtk_signal_new ("new-column-width",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, changed),
-                   gtkextra_VOID__INT_INT,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+    g_signal_new ("new-column-width",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, new_column_width), /*!!!! */
+                 NULL, NULL,
+                 gtkextra_VOID__INT_INT,
+                 G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
   sheet_signals[NEW_ROW_HEIGHT] =
-    gtk_signal_new ("new-row-height",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, changed),
-                   gtkextra_VOID__INT_INT,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+    g_signal_new ("new-row-height",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, new_row_height), /*!!!! */
+                 NULL, NULL,
+                 gtkextra_VOID__INT_INT,
+                 G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
   widget_class->set_scroll_adjustments_signal =
-    gtk_signal_new ("set-scroll-adjustments",
-                   GTK_RUN_LAST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkSheetClass, set_scroll_adjustments),
-                   gtkextra_VOID__OBJECT_OBJECT,
-                   GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+    g_signal_new ("set-scroll-adjustments",
+                 G_TYPE_FROM_CLASS (object_class),
+                 G_SIGNAL_RUN_LAST,
+                 offsetof (GtkSheetClass, set_scroll_adjustments),
+                 NULL, NULL,
+                 gtkextra_VOID__OBJECT_OBJECT,
+                 G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 
 
   container_class->add = NULL;
@@ -1111,11 +1200,6 @@ gtk_sheet_init (GtkSheet *sheet)
   GTK_WIDGET_UNSET_FLAGS (sheet, GTK_NO_WINDOW);
   GTK_WIDGET_SET_FLAGS (sheet, GTK_CAN_FOCUS);
 
-  sheet->view.row0 = 0;
-  sheet->view.col0 = 0;
-  sheet->view.rowi = 0;
-  sheet->view.coli = 0;
-
   sheet->column_title_window = NULL;
   sheet->column_title_area.x = 0;
   sheet->column_title_area.y = 0;
@@ -1169,7 +1253,7 @@ gtk_sheet_init (GtkSheet *sheet)
   gdk_color_alloc (gdk_colormap_get_system (), &sheet->grid_color);
   sheet->show_grid = TRUE;
 
-  sheet->motion_events = 0;
+  sheet->motion_timer = 0;
 }
 
 
@@ -1194,15 +1278,6 @@ columns_inserted_deleted_callback (GSheetModel *model, gint first_column,
   range.coli = xxx_column_count (sheet) - 1;
   range.rowi = yyy_row_count (sheet) - 1;
 
-  sheet->view.col0 =
-    COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
-
-  sheet->view.coli =
-    COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-
-  if ( sheet->view.coli > range.coli)
-    sheet->view.coli = range.coli;
-
   adjust_scrollbars (sheet);
 
   if (sheet->active_cell.col >= model_columns)
@@ -1235,14 +1310,6 @@ rows_inserted_deleted_callback (GSheetModel *model, gint first_row,
   range.rowi = yyy_row_count (sheet) - 1;
   range.coli = xxx_column_count (sheet) - 1;
 
-  sheet->view.row0 =
-    ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1);
-  sheet->view.rowi =
-    ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
-
-  if ( sheet->view.rowi > range.rowi)
-    sheet->view.rowi = range.rowi;
-
   adjust_scrollbars (sheet);
 
   if (sheet->active_cell.row >= model_rows)
@@ -1273,7 +1340,17 @@ range_update_callback (GSheetModel *m, gint row0, gint col0,
 
   if ( ( row0 < 0 && col0 < 0 ) || ( rowi < 0 && coli < 0 ) )
     {
+      gint i;
       gtk_sheet_range_draw (sheet, NULL);
+      adjust_scrollbars (sheet);
+
+      for (i = MIN_VISIBLE_ROW (sheet); i <= MAX_VISIBLE_ROW (sheet); i++)
+       gtk_sheet_row_title_button_draw (sheet, i);
+
+      for (i = MIN_VISIBLE_COLUMN (sheet);
+          i <= MAX_VISIBLE_COLUMN (sheet); i++)
+       gtk_sheet_column_title_button_draw (sheet, i);
+
       return;
     }
   else if ( row0 < 0 || rowi < 0 )
@@ -1312,9 +1389,7 @@ GtkWidget *
 gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo, const gchar *title,
               GSheetModel *model)
 {
-  GtkWidget *widget;
-
-  widget = gtk_type_new (gtk_sheet_get_type ());
+  GtkWidget *widget = g_object_new (GTK_TYPE_SHEET, NULL);
 
   gtk_sheet_construct (GTK_SHEET (widget), vgeo, hgeo, title);
 
@@ -1383,7 +1458,7 @@ column_titles_changed (GtkWidget *w, gint first, gint n_columns, gpointer data)
       for ( i = first ; i <= first + n_columns ; ++i )
        {
          gtk_sheet_column_title_button_draw (sheet, i);
-         gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[CHANGED], -1, i);
+         g_signal_emit (G_OBJECT (sheet), sheet_signals[CHANGED], 0, -1, i);
        }
     }
 
@@ -1436,9 +1511,7 @@ GtkWidget *
 gtk_sheet_new_with_custom_entry (GSheetRow *rows, GSheetColumn *columns,
                                 const gchar *title, GtkType entry_type)
 {
-  GtkWidget *widget;
-
-  widget = gtk_type_new (gtk_sheet_get_type ());
+  GtkWidget *widget = g_object_new (GTK_TYPE_SHEET, NULL);
 
   gtk_sheet_construct_with_custom_entry (GTK_SHEET (widget),
                                         rows, columns, title, entry_type);
@@ -1724,7 +1797,7 @@ gtk_sheet_set_locked (GtkSheet *sheet, gboolean locked)
        }
     }
 
-  gtk_entry_set_editable (GTK_ENTRY (sheet->sheet_entry), locked);
+  gtk_editable_set_editable (GTK_EDITABLE (sheet->sheet_entry), locked);
 
 }
 
@@ -1790,11 +1863,11 @@ gtk_sheet_thaw (GtkSheet *sheet)
   sheet->old_hadjustment = -1.;
 
   if (sheet->hadjustment)
-    gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
-                            "value_changed");
+    g_signal_emit_by_name (G_OBJECT (sheet->hadjustment),
+                          "value_changed");
   if (sheet->vadjustment)
-    gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
-                            "value_changed");
+    g_signal_emit_by_name (G_OBJECT (sheet->vadjustment),
+                          "value_changed");
 
   if (sheet->state == GTK_STATE_NORMAL)
     if (sheet->sheet_entry && GTK_WIDGET_MAPPED (sheet->sheet_entry))
@@ -1811,16 +1884,13 @@ gtk_sheet_set_row_titles_width (GtkSheet *sheet, guint width)
   if (width < COLUMN_MIN_WIDTH) return;
 
   sheet->row_title_area.width = width;
-  sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
-  sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-
 
   adjust_scrollbars (sheet);
 
   sheet->old_hadjustment = -1.;
   if (sheet->hadjustment)
-    gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
-                            "value_changed");
+    g_signal_emit_by_name (G_OBJECT (sheet->hadjustment),
+                          "value_changed");
   size_allocate_global_button (sheet);
 }
 
@@ -1830,16 +1900,13 @@ gtk_sheet_set_column_titles_height (GtkSheet *sheet, guint height)
   if (height < DEFAULT_ROW_HEIGHT (GTK_WIDGET (sheet))) return;
 
   sheet->column_title_area.height = height;
-  sheet->view.row0 = ROW_FROM_YPIXEL (sheet,
-                                     sheet->column_title_area.height + 1);
-  sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
 
   adjust_scrollbars (sheet);
 
   sheet->old_vadjustment = -1.;
   if (sheet->vadjustment)
-    gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
-                            "value_changed");
+    g_signal_emit_by_name (G_OBJECT (sheet->vadjustment),
+                          "value_changed");
   size_allocate_global_button (sheet);
 }
 
@@ -1877,8 +1944,8 @@ gtk_sheet_show_column_titles (GtkSheet *sheet)
 
   sheet->old_vadjustment = -1.;
   if (sheet->vadjustment)
-    gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
-                            "value_changed");
+    g_signal_emit_by_name (G_OBJECT (sheet->vadjustment),
+                          "value_changed");
   size_allocate_global_button (sheet);
 }
 
@@ -1919,8 +1986,8 @@ gtk_sheet_show_row_titles (GtkSheet *sheet)
 
   sheet->old_hadjustment = -1.;
   if (sheet->hadjustment)
-    gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
-                            "value_changed");
+    g_signal_emit_by_name (G_OBJECT (sheet->hadjustment),
+                          "value_changed");
   size_allocate_global_button (sheet);
 }
 
@@ -1955,8 +2022,8 @@ gtk_sheet_hide_column_titles (GtkSheet *sheet)
 
   sheet->old_vadjustment = -1.;
   if (sheet->vadjustment)
-    gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
-                            "value_changed");
+    g_signal_emit_by_name (G_OBJECT (sheet->vadjustment),
+                          "value_changed");
 }
 
 void
@@ -1990,8 +2057,8 @@ gtk_sheet_hide_row_titles (GtkSheet *sheet)
 
   sheet->old_hadjustment = -1.;
   if (sheet->hadjustment)
-    gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
-                            "value_changed");
+    g_signal_emit_by_name (G_OBJECT (sheet->hadjustment),
+                          "value_changed");
 }
 
 gboolean
@@ -2068,8 +2135,8 @@ gtk_sheet_moveto (GtkSheet *sheet,
        sheet->vadjustment->value = y;
 
       sheet->old_vadjustment = -1.;
-      gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
-                              "value_changed");
+      g_signal_emit_by_name (G_OBJECT (sheet->vadjustment),
+                            "value_changed");
 
     }
 
@@ -2108,8 +2175,8 @@ gtk_sheet_moveto (GtkSheet *sheet,
        sheet->hadjustment->value = x;
 
       sheet->old_vadjustment = -1.;
-      gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
-                              "value_changed");
+      g_signal_emit_by_name (G_OBJECT (sheet->hadjustment),
+                            "value_changed");
 
     }
 }
@@ -2180,7 +2247,7 @@ gtk_sheet_select_row (GtkSheet * sheet,
   sheet->active_cell.row = row;
   sheet->active_cell.col = 0;
 
-  gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[SELECT_ROW], row);
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[SELECT_ROW], 0, row);
   gtk_sheet_real_select_range (sheet, NULL);
 }
 
@@ -2211,7 +2278,7 @@ gtk_sheet_select_column (GtkSheet * sheet, gint column)
   sheet->active_cell.row = 0;
   sheet->active_cell.col = column;
 
-  gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[SELECT_COLUMN], column);
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[SELECT_COLUMN], 0, column);
   gtk_sheet_real_select_range (sheet, NULL);
 }
 
@@ -2234,11 +2301,10 @@ gtk_sheet_clip_range (GtkSheet *sheet, const GtkSheetRange *range)
     sheet->clip_range=*range;
 
   sheet->interval = 0;
-  sheet->clip_timer = gtk_timeout_add (TIMEOUT_FLASH, gtk_sheet_flash, sheet);
-
-  gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[CLIP_RANGE],
-                  &sheet->clip_range);
+  sheet->clip_timer = g_timeout_add (TIMEOUT_FLASH, gtk_sheet_flash, sheet);
 
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[CLIP_RANGE], 0,
+                &sheet->clip_range);
 }
 
 void
@@ -2252,7 +2318,7 @@ gtk_sheet_unclip_range (GtkSheet *sheet)
 
   GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_CLIP);
 
-  gtk_timeout_remove (sheet->clip_timer);
+  g_source_remove  (sheet->clip_timer);
   gtk_sheet_range_draw (sheet, &sheet->clip_range);
 
   if (gtk_sheet_range_isvisible (sheet, sheet->range))
@@ -2493,23 +2559,23 @@ gtk_sheet_set_vadjustment (GtkSheet *sheet,
 
   if (sheet->vadjustment)
     {
-      gtk_signal_disconnect_by_data (GTK_OBJECT (sheet->vadjustment), sheet);
-      gtk_object_unref (GTK_OBJECT (sheet->vadjustment));
+      g_signal_handlers_disconnect_matched (G_OBJECT (sheet->vadjustment),
+                                           G_SIGNAL_MATCH_DATA,
+                                           0, 0, 0, 0,
+                                           sheet);
+      g_object_unref (G_OBJECT (sheet->vadjustment));
     }
 
   sheet->vadjustment = adjustment;
 
   if (sheet->vadjustment)
     {
-      gtk_object_ref (GTK_OBJECT (sheet->vadjustment));
-      gtk_object_sink (GTK_OBJECT (sheet->vadjustment));
+      g_object_ref (G_OBJECT (sheet->vadjustment));
+      g_object_ref_sink (G_OBJECT (sheet->vadjustment));
 
-      gtk_signal_connect (GTK_OBJECT (sheet->vadjustment), "changed",
-                         (GtkSignalFunc) vadjustment_changed,
-                         (gpointer) sheet);
-      gtk_signal_connect (GTK_OBJECT (sheet->vadjustment), "value_changed",
-                         (GtkSignalFunc) vadjustment_value_changed,
-                         (gpointer) sheet);
+      g_signal_connect (G_OBJECT (sheet->vadjustment), "value_changed",
+                       G_CALLBACK (vadjustment_value_changed),
+                       sheet);
     }
 
   if (!sheet->vadjustment || !old_adjustment)
@@ -2539,23 +2605,23 @@ gtk_sheet_set_hadjustment (GtkSheet *sheet,
 
   if (sheet->hadjustment)
     {
-      gtk_signal_disconnect_by_data (GTK_OBJECT (sheet->hadjustment), sheet);
-      gtk_object_unref (GTK_OBJECT (sheet->hadjustment));
+      g_signal_handlers_disconnect_matched (G_OBJECT (sheet->hadjustment),
+                                           G_SIGNAL_MATCH_DATA,
+                                           0, 0, 0, 0,
+                                           sheet);
+      g_object_unref (G_OBJECT (sheet->hadjustment));
     }
 
   sheet->hadjustment = adjustment;
 
   if (sheet->hadjustment)
     {
-      gtk_object_ref (GTK_OBJECT (sheet->hadjustment));
-      gtk_object_sink (GTK_OBJECT (sheet->hadjustment));
+      g_object_ref (G_OBJECT (sheet->hadjustment));
+      g_object_ref_sink (G_OBJECT (sheet->hadjustment));
 
-      gtk_signal_connect (GTK_OBJECT (sheet->hadjustment), "changed",
-                         (GtkSignalFunc) hadjustment_changed,
-                         (gpointer) sheet);
-      gtk_signal_connect (GTK_OBJECT (sheet->hadjustment), "value_changed",
-                         (GtkSignalFunc) hadjustment_value_changed,
-                         (gpointer) sheet);
+      g_signal_connect (G_OBJECT (sheet->hadjustment), "value_changed",
+                       G_CALLBACK (hadjustment_value_changed),
+                       sheet);
     }
 
   if (!sheet->hadjustment || !old_adjustment)
@@ -2589,10 +2655,6 @@ gtk_sheet_finalize (GObject * object)
 
   sheet = GTK_SHEET (object);
 
-  /* get rid of all the cells */
-  gtk_sheet_range_clear (sheet, NULL);
-  gtk_sheet_range_delete (sheet, NULL);
-
   if (sheet->name)
     {
       g_free (sheet->name);
@@ -2630,21 +2692,31 @@ gtk_sheet_destroy (GtkObject * object)
 
   if (sheet->clip_timer)
     {
-      gtk_timeout_remove (sheet->clip_timer);
+      g_source_remove (sheet->clip_timer);
       sheet->clip_timer = 0;
     }
 
   /* unref adjustments */
   if (sheet->hadjustment)
     {
-      gtk_signal_disconnect_by_data (GTK_OBJECT (sheet->hadjustment), sheet);
-      gtk_object_unref (GTK_OBJECT (sheet->hadjustment));
+      g_signal_handlers_disconnect_matched (G_OBJECT (sheet->hadjustment),
+                                           G_SIGNAL_MATCH_DATA,
+                                           0, 0, 0, 0,
+                                           sheet);
+
+      g_object_unref (G_OBJECT (sheet->hadjustment));
       sheet->hadjustment = NULL;
     }
+
   if (sheet->vadjustment)
     {
-      gtk_signal_disconnect_by_data (GTK_OBJECT (sheet->vadjustment), sheet);
-      gtk_object_unref (GTK_OBJECT (sheet->vadjustment));
+      g_signal_handlers_disconnect_matched (G_OBJECT (sheet->vadjustment),
+                                           G_SIGNAL_MATCH_DATA,
+                                           0, 0, 0, 0,
+                                           sheet);
+
+      g_object_unref (G_OBJECT (sheet->vadjustment));
+
       sheet->vadjustment = NULL;
     }
 
@@ -2849,10 +2921,10 @@ create_global_button (GtkSheet *sheet)
 {
   sheet->button = gtk_button_new_with_label (" ");
 
-  gtk_signal_connect (GTK_OBJECT (sheet->button),
-                     "pressed",
-                     (GtkSignalFunc) global_button_clicked,
-                     (gpointer) sheet);
+  g_signal_connect (G_OBJECT (sheet->button),
+                   "pressed",
+                   G_CALLBACK (global_button_clicked),
+                   sheet);
 }
 
 static void
@@ -3306,7 +3378,8 @@ gtk_sheet_range_draw (GtkSheet *sheet, const GtkSheetRange *range)
     {
       drawing_range.row0 = MIN_VISIBLE_ROW (sheet);
       drawing_range.col0 = MIN_VISIBLE_COLUMN (sheet);
-      drawing_range.rowi = MIN (MAX_VISIBLE_ROW (sheet), yyy_row_count (sheet) - 1);
+      drawing_range.rowi = MIN (MAX_VISIBLE_ROW (sheet),
+                               yyy_row_count (sheet) - 1);
       drawing_range.coli = MAX_VISIBLE_COLUMN (sheet);
 
 
@@ -3325,7 +3398,6 @@ gtk_sheet_range_draw (GtkSheet *sheet, const GtkSheetRange *range)
       drawing_range.coli = MIN (range->coli, MAX_VISIBLE_COLUMN (sheet));
     }
 
-
   if (drawing_range.coli == xxx_column_count (sheet) - 1)
     {
       area.x = COLUMN_LEFT_XPIXEL (sheet,
@@ -3455,7 +3527,7 @@ gtk_sheet_range_draw_selection (GtkSheet *sheet, GtkSheetRange range)
                }
              if (j == sheet->range.coli) area.width = area.width - 3;
 
-             if (i!=sheet->active_cell.row || j!=sheet->active_cell.col)
+             if (i != sheet->active_cell.row || j != sheet->active_cell.col)
                {
                  gdk_draw_rectangle (sheet->sheet_window,
                                      sheet->xor_gc,
@@ -3599,8 +3671,8 @@ gtk_sheet_set_cell (GtkSheet *sheet, gint row, gint col,
 
       range.row0 = row;
       range.rowi = row;
-      range.col0 = sheet->view.col0;
-      range.coli = sheet->view.coli;
+      range.col0 = MIN_VISIBLE_COLUMN (sheet);
+      range.coli = MAX_VISIBLE_COLUMN (sheet);
 
       if (gtk_sheet_autoresize (sheet) &&
          text_width > xxx_column_width (sheet, col) -
@@ -3616,7 +3688,7 @@ gtk_sheet_set_cell (GtkSheet *sheet, gint row, gint col,
     }
 
   if ( changed )
-    gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[CHANGED], row, col);
+    g_signal_emit (G_OBJECT (sheet), sheet_signals[CHANGED], 0, row, col);
 
 }
 
@@ -3635,33 +3707,10 @@ gtk_sheet_cell_clear (GtkSheet *sheet, gint row, gint column)
 
   range.row0 = row;
   range.rowi = row;
-  range.col0 = sheet->view.col0;
-  range.coli = sheet->view.coli;
-
-  gtk_sheet_real_cell_clear (sheet, row, column, FALSE);
-
-  if (!GTK_SHEET_IS_FROZEN (sheet))
-    {
-      gtk_sheet_range_draw (sheet, &range);
-    }
-}
-
-void
-gtk_sheet_cell_delete (GtkSheet *sheet, gint row, gint column)
-{
-  GtkSheetRange range;
-
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-  if (column >= xxx_column_count (sheet) || row >= yyy_row_count (sheet)) return;
-  if (column < 0 || row < 0) return;
-
-  range.row0 = row;
-  range.rowi = row;
-  range.col0 = sheet->view.col0;
-  range.coli = sheet->view.coli;
+  range.col0 = MIN_VISIBLE_COLUMN (sheet);
+  range.coli = MAX_VISIBLE_COLUMN (sheet);
 
-  gtk_sheet_real_cell_clear (sheet, row, column, TRUE);
+  gtk_sheet_real_cell_clear (sheet, row, column);
 
   if (!GTK_SHEET_IS_FROZEN (sheet))
     {
@@ -3670,7 +3719,7 @@ gtk_sheet_cell_delete (GtkSheet *sheet, gint row, gint column)
 }
 
 static void
-gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column, gboolean delete)
+gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column)
 {
   GSheetModel *model = gtk_sheet_get_model (sheet);
 
@@ -3681,8 +3730,8 @@ gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column, gboolean dele
       g_sheet_model_datum_clear (model, row, column);
 
       if (GTK_IS_OBJECT (sheet) && G_OBJECT (sheet)->ref_count > 0)
-       gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[CLEAR_CELL],
-                        row, column);
+       g_signal_emit (G_OBJECT (sheet), sheet_signals[CLEAR_CELL], 0,
+                      row, column);
     }
 
   dispose_string (sheet, old_text);
@@ -3694,22 +3743,11 @@ gtk_sheet_range_clear (GtkSheet *sheet, const GtkSheetRange *range)
   g_return_if_fail (sheet != NULL);
   g_return_if_fail (GTK_IS_SHEET (sheet));
 
-  gtk_sheet_real_range_clear (sheet, range, FALSE);
+  gtk_sheet_real_range_clear (sheet, range);
 }
 
-void
-gtk_sheet_range_delete (GtkSheet *sheet, const GtkSheetRange *range)
-{
-  g_return_if_fail (sheet != NULL);
-  g_return_if_fail (GTK_IS_SHEET (sheet));
-
-  gtk_sheet_real_range_clear (sheet, range, TRUE);
-}
-
-
 static void
-gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range,
-                           gboolean delete)
+gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range)
 {
   gint i, j;
   GtkSheetRange clear;
@@ -3732,7 +3770,7 @@ gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range,
   for (i = clear.row0; i <= clear.rowi; i++)
     for (j = clear.col0; j <= clear.coli; j++)
       {
-       gtk_sheet_real_cell_clear (sheet, i, j, delete);
+       gtk_sheet_real_cell_clear (sheet, i, j);
       }
 
   gtk_sheet_range_draw (sheet, NULL);
@@ -3995,9 +4033,9 @@ gtk_sheet_deactivate_cell (GtkSheet *sheet)
   if ( sheet->active_cell.row == -1 || sheet->active_cell.col == -1 )
     return TRUE;
 
-  gtk_signal_disconnect_by_func (GTK_OBJECT (gtk_sheet_get_entry (sheet)),
-                                (GtkSignalFunc) gtk_sheet_entry_changed,
-                                GTK_OBJECT (GTK_WIDGET (sheet)));
+  g_signal_handlers_disconnect_by_func (G_OBJECT (gtk_sheet_get_entry (sheet)),
+                                       G_CALLBACK (gtk_sheet_entry_changed),
+                                       sheet);
 
   gtk_sheet_hide_active_cell (sheet);
   sheet->active_cell.row = -1;
@@ -4038,7 +4076,7 @@ gtk_sheet_hide_active_cell (GtkSheet *sheet)
   if (text && strlen (text) != 0)
     {
       gtk_sheet_set_cell (sheet, row, col, justification, text);
-      gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[SET_CELL], row, col);
+      g_signal_emit (G_OBJECT (sheet),sheet_signals[SET_CELL], 0, row, col);
     }
   else
     {
@@ -4157,9 +4195,9 @@ gtk_sheet_show_active_cell (GtkSheet *sheet)
   gtk_entry_set_visibility (GTK_ENTRY (sheet_entry), attributes.is_visible);
 
   if (gtk_sheet_locked (sheet) || !attributes.is_editable)
-    gtk_entry_set_editable (GTK_ENTRY (sheet_entry), FALSE);
+    gtk_editable_set_editable (GTK_EDITABLE (sheet_entry), FALSE);
   else
-    gtk_entry_set_editable (GTK_ENTRY (sheet_entry), TRUE);
+    gtk_editable_set_editable (GTK_EDITABLE (sheet_entry), TRUE);
 
   /*** Added by John Gotts. Mar 25, 2005 *********/
   old_text = gtk_entry_get_text (GTK_ENTRY (sheet_entry));
@@ -4410,7 +4448,7 @@ gtk_sheet_new_selection (GtkSheet *sheet, GtkSheetRange *range)
          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 &&
+         if (state != GTK_STATE_SELECTED && selected &&
              xxx_column_is_visible (sheet, j) && yyy_row_is_visible (sheet, i) &&
              (i != sheet->active_cell.row || j != sheet->active_cell.col))
            {
@@ -4463,7 +4501,7 @@ gtk_sheet_new_selection (GtkSheet *sheet, GtkSheetRange *range)
              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))
+             if (mask2 != mask1 || (mask2 == mask1 && state != GTK_STATE_SELECTED))
                {
                  x = COLUMN_LEFT_XPIXEL (sheet,j);
                  y = ROW_TOP_YPIXEL (sheet, i);
@@ -4602,7 +4640,7 @@ gtk_sheet_draw_corners (GtkSheet *sheet, GtkSheetRange range)
       width = 1;
       if (sheet->state == GTK_SHEET_COLUMN_SELECTED)
        {
-         y = ROW_TOP_YPIXEL (sheet, sheet->view.row0)+3;
+         y = ROW_TOP_YPIXEL (sheet, MIN_VISIBLE_ROW (sheet))+3;
          width = 3;
        }
       gdk_draw_pixmap (sheet->sheet_window,
@@ -4630,7 +4668,7 @@ gtk_sheet_draw_corners (GtkSheet *sheet, GtkSheetRange range)
       width = 1;
       if (sheet->state == GTK_SHEET_ROW_SELECTED)
        {
-         x = COLUMN_LEFT_XPIXEL (sheet, sheet->view.col0)+3;
+         x = COLUMN_LEFT_XPIXEL (sheet, MIN_VISIBLE_COLUMN (sheet))+3;
          width = 3;
        }
       gdk_draw_pixmap (sheet->sheet_window,
@@ -4706,7 +4744,7 @@ gtk_sheet_real_select_range (GtkSheet * sheet,
       gtk_sheet_range_draw_selection (sheet, sheet->range);
     }
 
-  gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[SELECT_RANGE], &sheet->range);
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[SELECT_RANGE], 0, &sheet->range);
 }
 
 
@@ -4760,6 +4798,7 @@ gtk_sheet_unselect_range (GtkSheet * sheet)
 {
   gtk_sheet_real_unselect_range (sheet, NULL);
   sheet->state = GTK_STATE_NORMAL;
+
   gtk_sheet_activate_cell (sheet,
                           sheet->active_cell.row, sheet->active_cell.col);
 }
@@ -4778,6 +4817,9 @@ gtk_sheet_real_unselect_range (GtkSheet * sheet,
   if (range->row0 < 0 || range->rowi < 0) return;
   if (range->col0 < 0 || range->coli < 0) return;
 
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[SELECT_COLUMN], 0, -1);
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[SELECT_ROW], 0, -1);
+
   if (gtk_sheet_range_isvisible (sheet, *range))
     gtk_sheet_draw_backing_pixmap (sheet, *range);
 
@@ -4881,21 +4923,37 @@ gtk_sheet_button_press (GtkWidget * widget,
 
   sheet = GTK_SHEET (widget);
 
-  if ( event->type == GDK_2BUTTON_PRESS)
+  /* Cancel any pending tooltips */
+  if (sheet->motion_timer)
     {
-      gtk_widget_get_pointer (widget, &x, &y);
-      gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
+      g_source_remove (sheet->motion_timer);
+      sheet->motion_timer = 0;
+    }
 
-      if (event->window == sheet->column_title_window)
-       {
-         gtk_signal_emit (GTK_OBJECT (sheet),
-                          sheet_signals[DOUBLE_CLICK_COLUMN], column);
-       }
-      else if (event->window == sheet->row_title_window)
-       {
-         gtk_signal_emit (GTK_OBJECT (sheet),
-                          sheet_signals[DOUBLE_CLICK_ROW], row);
-       }
+  gtk_widget_get_pointer (widget, &x, &y);
+  gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
+
+
+  if (event->window == sheet->column_title_window)
+    {
+      g_signal_emit (G_OBJECT (sheet),
+                    sheet_signals[BUTTON_EVENT_COLUMN], 0,
+                    column, event);
+
+      if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
+       g_signal_emit (G_OBJECT (sheet),
+                      sheet_signals[DOUBLE_CLICK_COLUMN], 0, column);
+
+    }
+  else if (event->window == sheet->row_title_window)
+    {
+      g_signal_emit (G_OBJECT (sheet),
+                    sheet_signals[BUTTON_EVENT_ROW], 0,
+                    row, event);
+
+      if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
+       g_signal_emit (G_OBJECT (sheet),
+                      sheet_signals[DOUBLE_CLICK_ROW], 0, row);
     }
 
 
@@ -5216,7 +5274,7 @@ gtk_sheet_button_release (GtkWidget * widget,
       gtk_sheet_set_column_width (sheet, sheet->drag_cell.col,
                                  new_column_width (sheet, sheet->drag_cell.col, &x));
       sheet->old_hadjustment = -1.;
-      gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment), "value_changed");
+      g_signal_emit_by_name (G_OBJECT (sheet->hadjustment), "value_changed");
       return TRUE;
     }
 
@@ -5230,7 +5288,7 @@ gtk_sheet_button_release (GtkWidget * widget,
 
       gtk_sheet_set_row_height (sheet, sheet->drag_cell.row, new_row_height (sheet, sheet->drag_cell.row, &y));
       sheet->old_vadjustment = -1.;
-      gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment), "value_changed");
+      g_signal_emit_by_name (G_OBJECT (sheet->vadjustment), "value_changed");
       return TRUE;
     }
 
@@ -5255,8 +5313,8 @@ gtk_sheet_button_release (GtkWidget * widget,
       old_range = sheet->range;
       sheet->range = sheet->drag_range;
       sheet->drag_range = old_range;
-      gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[MOVE_RANGE],
-                      &sheet->drag_range, &sheet->range);
+      g_signal_emit (G_OBJECT (sheet), sheet_signals[MOVE_RANGE], 0,
+                    &sheet->drag_range, &sheet->range);
       gtk_sheet_select_range (sheet, &sheet->range);
     }
 
@@ -5286,8 +5344,8 @@ gtk_sheet_button_release (GtkWidget * widget,
       sheet->drag_range = old_range;
 
       if (sheet->state == GTK_STATE_NORMAL) sheet->state = GTK_SHEET_RANGE_SELECTED;
-      gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[RESIZE_RANGE],
-                      &sheet->drag_range, &sheet->range);
+      g_signal_emit (G_OBJECT (sheet), sheet_signals[RESIZE_RANGE], 0,
+                    &sheet->drag_range, &sheet->range);
       gtk_sheet_select_range (sheet, &sheet->range);
     }
 
@@ -5424,39 +5482,36 @@ static gboolean
 motion_timeout_callback (gpointer data)
 {
   GtkSheet *sheet = GTK_SHEET (data);
-  if ( --sheet->motion_events == 0 )
+  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) )
     {
-      gint x, y;
-      gint row, column;
-      gtk_widget_get_pointer (GTK_WIDGET (sheet), &x, &y);
+      if ( column == -1 && row == -1 )
+       return FALSE;
 
-      if ( gtk_sheet_get_pixel_info (sheet, x, y, &row, &column) )
+      if ( column == -1)
        {
-         if ( column == -1 && row == -1 )
-           return FALSE;
+         GSheetRow *row_geo = sheet->row_geometry;
+         gchar *text;
 
-         if ( column == -1)
-           {
-             GSheetRow *row_geo = sheet->row_geometry;
-             gchar *text;
+         text = g_sheet_row_get_subtitle (row_geo, row);
 
-             text = g_sheet_row_get_subtitle (row_geo, row);
-
-             show_subtitle (sheet, row, column, text);
-             g_free (text);
-           }
+         show_subtitle (sheet, row, column, text);
+         g_free (text);
+       }
 
-         if ( row == -1)
-           {
-             GSheetColumn *col_geo = sheet->column_geometry;
-             gchar *text;
+      if ( row == -1)
+       {
+         GSheetColumn *col_geo = sheet->column_geometry;
+         gchar *text;
 
-             text = g_sheet_column_get_subtitle (col_geo, column);
+         text = g_sheet_column_get_subtitle (col_geo, column);
 
-             show_subtitle (sheet, row, column, text );
+         show_subtitle (sheet, row, column, text );
 
-             g_free (text);
-           }
+         g_free (text);
        }
     }
 
@@ -5485,8 +5540,9 @@ gtk_sheet_motion (GtkWidget * widget,
 
   if (!sheet->hover_window || ! GTK_WIDGET_VISIBLE (sheet->hover_window->window))
     {
-      sheet->motion_events++;
-      g_timeout_add (TIMEOUT_HOVER, motion_timeout_callback, sheet);
+      if ( sheet->motion_timer > 0 )
+       g_source_remove (sheet->motion_timer);
+      sheet->motion_timer = g_timeout_add (TIMEOUT_HOVER, motion_timeout_callback, sheet);
     }
   else
     {
@@ -5766,7 +5822,7 @@ gtk_sheet_move_query (GtkSheet *sheet, gint row, gint column)
   height = sheet->sheet_window_height;
   width = sheet->sheet_window_width;
 
-  if (row >= MAX_VISIBLE_ROW (sheet) && sheet->state!=GTK_SHEET_COLUMN_SELECTED)
+  if (row >= MAX_VISIBLE_ROW (sheet) && sheet->state != GTK_SHEET_COLUMN_SELECTED)
     {
       row_align = 1.;
       new_row = MIN (yyy_row_count (sheet), row + 1);
@@ -5779,12 +5835,12 @@ gtk_sheet_move_query (GtkSheet *sheet, gint row, gint column)
          row_align = -1.;
        }
     }
-  if (row < MIN_VISIBLE_ROW (sheet) && sheet->state!=GTK_SHEET_COLUMN_SELECTED)
+  if (row < MIN_VISIBLE_ROW (sheet) && sheet->state != GTK_SHEET_COLUMN_SELECTED)
     {
       row_align= 0.;
       row_move = TRUE;
     }
-  if (column >= MAX_VISIBLE_COLUMN (sheet) && sheet->state!=GTK_SHEET_ROW_SELECTED)
+  if (column >= MAX_VISIBLE_COLUMN (sheet) && sheet->state != GTK_SHEET_ROW_SELECTED)
     {
       col_align = 1.;
       new_col = MIN (xxx_column_count (sheet) - 1, column + 1);
@@ -5797,7 +5853,7 @@ gtk_sheet_move_query (GtkSheet *sheet, gint row, gint column)
          col_align = -1.;
        }
     }
-  if (column < MIN_VISIBLE_COLUMN (sheet) && sheet->state!=GTK_SHEET_ROW_SELECTED)
+  if (column < MIN_VISIBLE_COLUMN (sheet) && sheet->state != GTK_SHEET_ROW_SELECTED)
     {
       col_align = 0.;
       column_move = TRUE;
@@ -5880,7 +5936,7 @@ gtk_sheet_entry_key_press (GtkWidget *widget,
                           GdkEventKey *key)
 {
   gboolean focus;
-  gtk_signal_emit_by_name (GTK_OBJECT (widget), "key_press_event", key, &focus);
+  g_signal_emit_by_name (G_OBJECT (widget), "key_press_event", key, &focus);
   return focus;
 }
 
@@ -5914,8 +5970,8 @@ gtk_sheet_key_press (GtkWidget *widget,
     case GDK_Return: case GDK_KP_Enter:
       if (sheet->state == GTK_SHEET_NORMAL &&
          !GTK_SHEET_IN_SELECTION (sheet))
-       gtk_signal_emit_stop_by_name (GTK_OBJECT (gtk_sheet_get_entry (sheet)),
-                                     "key_press_event");
+       g_signal_stop_emission_by_name (gtk_sheet_get_entry (sheet),
+                                        "key-press-event");
       row = sheet->active_cell.row;
       col = sheet->active_cell.col;
       if (sheet->state == GTK_SHEET_COLUMN_SELECTED)
@@ -6167,17 +6223,6 @@ gtk_sheet_size_request (GtkWidget * widget,
   if (sheet->row_titles_visible)
     requisition->width += sheet->row_title_area.width;
 
-  sheet->view.row0 = ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1);
-  sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
-  sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
-  sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-
-  if (!sheet->column_titles_visible)
-    sheet->view.row0 = ROW_FROM_YPIXEL (sheet, 1);
-
-  if (!sheet->row_titles_visible)
-    sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, 1);
-
   children = sheet->children;
   while (children)
     {
@@ -6273,20 +6318,7 @@ gtk_sheet_size_allocate (GtkWidget * widget,
 
   /* row button allocation */
   size_allocate_row_title_buttons (sheet);
-
-  sheet->view.row0 = ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1);
-  sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
-  sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
-  sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-
-  if (!sheet->column_titles_visible)
-    sheet->view.row0 = ROW_FROM_YPIXEL (sheet, 1);
-
-  if (!sheet->row_titles_visible)
-    sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, 1);
-
   size_allocate_column_title_buttons (sheet);
-  size_allocate_row_title_buttons (sheet);
 
   /* re - scale backing pixmap */
   gtk_sheet_make_backing_pixmap (sheet, 0, 0);
@@ -6499,7 +6531,7 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet)
 
   gtk_widget_size_allocate (sheet->sheet_entry, &shentry_allocation);
 
-  if (previous_style == style) gtk_style_unref (previous_style);
+  if (previous_style == style) g_object_unref (previous_style);
 }
 
 static void
@@ -6569,6 +6601,7 @@ gtk_sheet_entry_set_max_size (GtkSheet *sheet)
   GTK_ITEM_ENTRY (sheet->sheet_entry)->text_max_size = size;
 }
 
+
 static void
 create_sheet_entry (GtkSheet *sheet)
 {
@@ -6591,7 +6624,7 @@ create_sheet_entry (GtkSheet *sheet)
     {
       if (!g_type_is_a (sheet->entry_type, GTK_TYPE_ENTRY))
        {
-         parent = GTK_WIDGET (gtk_type_new (sheet->entry_type));
+         parent = g_object_new (sheet->entry_type, NULL);
 
          sheet->sheet_entry = parent;
 
@@ -6601,7 +6634,7 @@ create_sheet_entry (GtkSheet *sheet)
        }
       else
        {
-         parent = GTK_WIDGET (gtk_type_new (sheet->entry_type));
+         parent = g_object_new (sheet->entry_type, NULL);
          entry = parent;
          found_entry = TRUE;
        }
@@ -6630,9 +6663,9 @@ create_sheet_entry (GtkSheet *sheet)
       gtk_widget_realize (sheet->sheet_entry);
     }
 
-  gtk_signal_connect_object (GTK_OBJECT (entry),"key_press_event",
-                            (GtkSignalFunc) gtk_sheet_entry_key_press,
-                            GTK_OBJECT (sheet));
+  g_signal_connect_swapped (G_OBJECT (entry), "key_press_event",
+                           G_CALLBACK (gtk_sheet_entry_key_press),
+                           sheet);
 
   gtk_widget_show (sheet->sheet_entry);
 }
@@ -6957,15 +6990,12 @@ gtk_sheet_row_title_button_draw (GtkSheet *sheet, gint row)
  *
  * functions:
  * adjust_scrollbars
- * vadjustment_changed
- * hadjustment_changed
  * vadjustment_value_changed
  * hadjustment_value_changed */
 
 static void
 adjust_scrollbars (GtkSheet * sheet)
 {
-
   if (sheet->vadjustment)
     {
       sheet->vadjustment->page_size = sheet->sheet_window_height;
@@ -6973,7 +7003,7 @@ adjust_scrollbars (GtkSheet * sheet)
       sheet->vadjustment->step_increment = DEFAULT_ROW_HEIGHT (GTK_WIDGET (sheet));
       sheet->vadjustment->lower = 0;
       sheet->vadjustment->upper = SHEET_HEIGHT (sheet) + 80;
-      gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment), "changed");
+      g_signal_emit_by_name (G_OBJECT (sheet->vadjustment), "changed");
 
     }
 
@@ -6984,38 +7014,11 @@ adjust_scrollbars (GtkSheet * sheet)
       sheet->hadjustment->step_increment = DEFAULT_COLUMN_WIDTH;
       sheet->hadjustment->lower = 0;
       sheet->hadjustment->upper = SHEET_WIDTH (sheet)+ 80;
-      gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment), "changed");
+      g_signal_emit_by_name (G_OBJECT (sheet->hadjustment), "changed");
 
     }
 }
 
-
-static void
-vadjustment_changed (GtkAdjustment * adjustment,
-                    gpointer data)
-{
-  GtkSheet *sheet;
-
-  g_return_if_fail (adjustment != NULL);
-  g_return_if_fail (data != NULL);
-
-  sheet = GTK_SHEET (data);
-
-}
-
-static void
-hadjustment_changed (GtkAdjustment * adjustment,
-                    gpointer data)
-{
-  GtkSheet *sheet;
-
-  g_return_if_fail (adjustment != NULL);
-  g_return_if_fail (data != NULL);
-
-  sheet = GTK_SHEET (data);
-}
-
-
 static void
 vadjustment_value_changed (GtkAdjustment * adjustment,
                           gpointer data)
@@ -7097,11 +7100,6 @@ vadjustment_value_changed (GtkAdjustment * adjustment,
 
   sheet->voffset = - value;
 
-  sheet->view.row0 = ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1);
-  sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
-  if (!sheet->column_titles_visible)
-    sheet->view.row0 = ROW_FROM_YPIXEL (sheet, 1);
-
   if (GTK_WIDGET_REALIZED (sheet->sheet_entry) &&
       sheet->state == GTK_SHEET_NORMAL &&
       sheet->active_cell.row >= 0 && sheet->active_cell.col >= 0 &&
@@ -7208,12 +7206,6 @@ hadjustment_value_changed (GtkAdjustment * adjustment,
     }
 
   sheet->hoffset = - value;
-
-  sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
-  sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-  if (!sheet->row_titles_visible)
-    sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, 1);
-
   if (GTK_WIDGET_REALIZED (sheet->sheet_entry) &&
       sheet->state == GTK_SHEET_NORMAL &&
       sheet->active_cell.row >= 0 && sheet->active_cell.col >= 0 &&
@@ -7361,7 +7353,6 @@ new_column_width (GtkSheet * sheet,
     width = min_width;
 
   xxx_set_column_width (sheet, column, width);
-  sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
   size_allocate_column_title_buttons (sheet);
 
   return width;
@@ -7395,7 +7386,6 @@ new_row_height (GtkSheet * sheet,
     height = min_height;
 
   yyy_set_row_height (sheet, row, height);
-  sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
   size_allocate_row_title_buttons (sheet);
 
   return height;
@@ -7427,9 +7417,9 @@ gtk_sheet_set_column_width (GtkSheet * sheet,
       gtk_sheet_range_draw (sheet, NULL);
     }
 
-  gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[CHANGED], - 1, column);
-  gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[NEW_COL_WIDTH],
-                  column, width);
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[CHANGED], 0, -1, column);
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[NEW_COL_WIDTH], 0,
+                column, width);
 }
 
 
@@ -7460,8 +7450,9 @@ gtk_sheet_set_row_height (GtkSheet * sheet,
       gtk_sheet_range_draw (sheet, NULL);
     }
 
-  gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[CHANGED], row, - 1);
-  gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[NEW_ROW_HEIGHT], row, height);
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[CHANGED], 0, row, - 1);
+  g_signal_emit (G_OBJECT (sheet), sheet_signals[NEW_ROW_HEIGHT], 0,
+                row, height);
 
 }
 
@@ -7634,7 +7625,8 @@ gtk_sheet_attach_default (GtkSheet *sheet,
       return;
     }
 
-  gtk_sheet_attach (sheet, widget, row, col, GTK_EXPAND|GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0);
+  gtk_sheet_attach (sheet, widget, row, col,
+                   GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 }
 
 void