X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgtksheet.c;h=942b0233117b4641a61b9dadccbec4fed9f51866;hb=7f37cbe10c05cf3b046452691eb4a3d821c3ae7c;hp=7da94891d1764192a79d494336a1812b0970fe1f;hpb=04752a092964c66d468ca820ff066aac42a38cb0;p=pspp-builds.git diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c index 7da94891..942b0233 100644 --- a/lib/gtksheet/gtksheet.c +++ b/lib/gtksheet/gtksheet.c @@ -5,7 +5,7 @@ * 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 @@ -96,15 +96,10 @@ enum #define CELL_SPACING 1 #define DRAG_WIDTH 6 #define TIMEOUT_HOVER 300 -#define TIME_INTERVAL 8 #define COLUMN_MIN_WIDTH 10 -#define MINROWS 1 -#define MINCOLS 1 -#define MAXLENGTH 30 #define CELLOFFSET 4 #define DEFAULT_COLUMN_WIDTH 80 - static void gtk_sheet_update_primary_selection (GtkSheet *sheet); static void gtk_sheet_column_title_button_draw (GtkSheet *sheet, gint column); @@ -202,7 +197,7 @@ yyy_row_is_visible (const GtkSheet *sheet, gint row) { GSheetRow *row_geo = sheet->row_geometry; - return g_sheet_row_get_visibility (row_geo, row, 0); + return g_sheet_row_get_visibility (row_geo, row); } @@ -211,7 +206,7 @@ yyy_row_is_sensitive (const GtkSheet *sheet, gint row) { GSheetRow *row_geo = sheet->row_geometry; - return g_sheet_row_get_sensitivity (row_geo, row, 0); + return g_sheet_row_get_sensitivity (row_geo, row); } @@ -221,7 +216,7 @@ yyy_row_count (const GtkSheet *sheet) { GSheetRow *row_geo = sheet->row_geometry; - return g_sheet_row_get_row_count (row_geo, 0); + return g_sheet_row_get_row_count (row_geo); } static inline gint @@ -229,7 +224,7 @@ yyy_row_height (const GtkSheet *sheet, gint row) { GSheetRow *row_geo = sheet->row_geometry; - return g_sheet_row_get_height (row_geo, row, 0); + return g_sheet_row_get_height (row_geo, row); } static gint @@ -237,7 +232,7 @@ yyy_row_top_ypixel (const GtkSheet *sheet, gint row) { GSheetRow *geo = sheet->row_geometry; - gint y = g_sheet_row_start_pixel (geo, row, 0); + gint y = g_sheet_row_start_pixel (geo, row); if ( sheet->column_titles_visible ) y += sheet->column_title_area.height; @@ -259,7 +254,7 @@ yyy_row_ypixel_to_row (const GtkSheet *sheet, gint y) if (y < cy) return 0; - return g_sheet_row_pixel_to_row (geo, y - cy, 0); + return g_sheet_row_pixel_to_row (geo, y - cy); } @@ -434,7 +429,7 @@ yyy_row_button (GtkSheet *sheet, gint row) { GSheetRow *row_geo = sheet->row_geometry; - return g_sheet_row_get_button (row_geo, row, sheet); + return g_sheet_row_get_button (row_geo, row); } @@ -444,7 +439,7 @@ static inline void yyy_set_row_height (GtkSheet *sheet, gint row, gint height) { if ( sheet->row_geometry ) - g_sheet_row_set_height (sheet->row_geometry, row, height, sheet); + g_sheet_row_set_height (sheet->row_geometry, row, height); } @@ -881,12 +876,33 @@ static void column_titles_changed (GtkWidget *w, gint first, gint n_columns, gpo /* Properties */ enum + { + PROP_0, + PROP_ROW_GEO, + PROP_COL_GEO, + PROP_MODEL + }; + +static void +gtk_sheet_set_row_geometry (GtkSheet *sheet, GSheetRow *geo) { - PROP_0, - PROP_ROW_GEO, - PROP_COL_GEO, - PROP_MODEL -}; + if ( sheet->row_geometry ) g_object_unref (sheet->row_geometry); + + sheet->row_geometry = geo; + + if ( sheet->row_geometry ) g_object_ref (sheet->row_geometry); +} + +static void +gtk_sheet_set_column_geometry (GtkSheet *sheet, GSheetColumn *geo) +{ + if ( sheet->column_geometry ) g_object_unref (sheet->column_geometry); + + sheet->column_geometry = geo; + + if ( sheet->column_geometry ) g_object_ref (sheet->column_geometry); +} + static void gtk_sheet_set_property (GObject *object, @@ -900,10 +916,10 @@ gtk_sheet_set_property (GObject *object, switch (prop_id) { case PROP_ROW_GEO: - sheet->row_geometry = g_value_get_pointer (value); + gtk_sheet_set_row_geometry (sheet, g_value_get_pointer (value)); break; case PROP_COL_GEO: - sheet->column_geometry = g_value_get_pointer (value); + gtk_sheet_set_column_geometry (sheet, g_value_get_pointer (value)); if ( sheet->column_geometry) g_signal_connect (sheet->column_geometry, "columns_changed", G_CALLBACK (column_titles_changed), sheet); @@ -1232,6 +1248,7 @@ gtk_sheet_class_init (GtkSheetClass * klass) static void gtk_sheet_init (GtkSheet *sheet) { + sheet->model = NULL; sheet->column_geometry = NULL; sheet->row_geometry = NULL; @@ -1263,7 +1280,6 @@ gtk_sheet_init (GtkSheet *sheet) sheet->selection_cell.row = 0; sheet->selection_cell.col = 0; - sheet->sheet_entry = NULL; sheet->pixmap = NULL; sheet->range.row0 = 0; @@ -1276,7 +1292,8 @@ gtk_sheet_init (GtkSheet *sheet) sheet->sheet_window = NULL; sheet->sheet_window_width = 0; sheet->sheet_window_height = 0; - sheet->sheet_entry = NULL; + sheet->entry_widget = NULL; + sheet->entry_container = NULL; sheet->button = NULL; sheet->hoffset = 0; @@ -1291,11 +1308,13 @@ gtk_sheet_init (GtkSheet *sheet) sheet->bg_gc = NULL; sheet->x_drag = 0; sheet->y_drag = 0; - gdk_color_parse ("white", &sheet->bg_color); - gdk_color_alloc (gdk_colormap_get_system (), &sheet->bg_color); + gdk_colormap_alloc_color (gdk_colormap_get_system (), &sheet->bg_color, FALSE, + TRUE); gdk_color_parse ("gray", &sheet->grid_color); - gdk_color_alloc (gdk_colormap_get_system (), &sheet->grid_color); + gdk_colormap_alloc_color (gdk_colormap_get_system (), &sheet->grid_color, FALSE, + TRUE); + sheet->show_grid = TRUE; sheet->motion_timer = 0; @@ -1482,20 +1501,22 @@ gtk_sheet_set_model (GtkSheet *sheet, GSheetModel *model) if ( model) { - g_signal_connect (model, "range_changed", - G_CALLBACK (range_update_callback), sheet); + g_object_ref (model); + + 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_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, "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_inserted", + G_CALLBACK (columns_inserted_deleted_callback), sheet); - g_signal_connect (model, "columns_deleted", - G_CALLBACK (columns_inserted_deleted_callback), sheet); + g_signal_connect (model, "columns_deleted", + G_CALLBACK (columns_inserted_deleted_callback), sheet); } } @@ -1591,7 +1612,7 @@ gtk_sheet_set_background (GtkSheet *sheet, GdkColor *color) if (!color) { gdk_color_parse ("white", &sheet->bg_color); - gdk_color_alloc (gdk_colormap_get_system (), &sheet->bg_color); + gdk_colormap_alloc_color (gdk_colormap_get_system (), &sheet->bg_color, FALSE, TRUE); } else sheet->bg_color = *color; @@ -1609,7 +1630,7 @@ gtk_sheet_set_grid (GtkSheet *sheet, GdkColor *color) if (!color) { gdk_color_parse ("black", &sheet->grid_color); - gdk_color_alloc (gdk_colormap_get_system (), &sheet->grid_color); + gdk_colormap_alloc_color (gdk_colormap_get_system (), &sheet->grid_color, FALSE, TRUE); } else sheet->grid_color = *color; @@ -1794,7 +1815,7 @@ gtk_sheet_thaw (GtkSheet *sheet) "value_changed"); if (sheet->state == GTK_STATE_NORMAL) - if (sheet->sheet_entry && GTK_WIDGET_MAPPED (sheet->sheet_entry)) + if (sheet->entry_widget && GTK_WIDGET_MAPPED (sheet->entry_widget)) { gtk_sheet_activate_cell (sheet, sheet->active_cell.row, sheet->active_cell.col); @@ -2401,7 +2422,7 @@ gtk_sheet_finalize (GObject * object) } static void -gtk_sheet_dispose (GObject * object) +gtk_sheet_dispose (GObject *object) { GtkSheet *sheet = GTK_SHEET (object); GList *children; @@ -2412,17 +2433,17 @@ gtk_sheet_dispose (GObject * object) if ( sheet->dispose_has_run ) return ; - if (sheet->model) g_object_unref (sheet->model); sheet->dispose_has_run = TRUE; - /* destroy the entry */ - if (sheet->sheet_entry && GTK_IS_WIDGET (sheet->sheet_entry)) - { - gtk_widget_destroy (sheet->sheet_entry); - sheet->sheet_entry = NULL; - } + if (sheet->model) g_object_unref (sheet->model); + if (sheet->row_geometry) g_object_unref (sheet->row_geometry); + if (sheet->column_geometry) g_object_unref (sheet->column_geometry); + + g_object_unref (sheet->entry_container); + sheet->entry_container = NULL; g_object_unref (sheet->button); + sheet->button = NULL; /* unref adjustments */ if (sheet->hadjustment) @@ -2577,43 +2598,37 @@ gtk_sheet_realize (GtkWidget * widget) /* GCs */ if (sheet->fg_gc) - gdk_gc_unref (sheet->fg_gc); + g_object_unref (sheet->fg_gc); if (sheet->bg_gc) - gdk_gc_unref (sheet->bg_gc); + g_object_unref (sheet->bg_gc); sheet->fg_gc = gdk_gc_new (widget->window); sheet->bg_gc = gdk_gc_new (widget->window); colormap = gtk_widget_get_colormap (widget); - gdk_color_white (colormap, &widget->style->white); - gdk_color_black (colormap, &widget->style->black); - gdk_gc_get_values (sheet->fg_gc, &auxvalues); values.foreground = widget->style->white; values.function = GDK_INVERT; values.subwindow_mode = GDK_INCLUDE_INFERIORS; if (sheet->xor_gc) - gdk_gc_unref (sheet->xor_gc); + g_object_unref (sheet->xor_gc); sheet->xor_gc = gdk_gc_new_with_values (widget->window, &values, GDK_GC_FOREGROUND | GDK_GC_FUNCTION | GDK_GC_SUBWINDOW); - if (sheet->sheet_entry->parent) - { - gtk_widget_ref (sheet->sheet_entry); - gtk_widget_unparent (sheet->sheet_entry); - } - gtk_widget_set_parent_window (sheet->sheet_entry, sheet->sheet_window); - gtk_widget_set_parent (sheet->sheet_entry, GTK_WIDGET (sheet)); + + 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)); - if (!sheet->cursor_drag) - sheet->cursor_drag = gdk_cursor_new (GDK_PLUS); + + gdk_cursor_unref (sheet->cursor_drag); + sheet->cursor_drag = gdk_cursor_new (GDK_PLUS); if (sheet->column_titles_visible) gdk_window_show (sheet->column_title_window); @@ -2687,11 +2702,11 @@ gtk_sheet_unrealize (GtkWidget * widget) sheet = GTK_SHEET (widget); - gdk_cursor_destroy (sheet->cursor_drag); + gdk_cursor_unref (sheet->cursor_drag); - gdk_gc_destroy (sheet->xor_gc); - gdk_gc_destroy (sheet->fg_gc); - gdk_gc_destroy (sheet->bg_gc); + g_object_unref (sheet->xor_gc); + g_object_unref (sheet->fg_gc); + g_object_unref (sheet->bg_gc); gdk_window_destroy (sheet->sheet_window); gdk_window_destroy (sheet->column_title_window); @@ -2705,11 +2720,14 @@ gtk_sheet_unrealize (GtkWidget * widget) sheet->column_title_window = NULL; sheet->sheet_window = NULL; - sheet->cursor_drag = NULL; sheet->xor_gc = NULL; sheet->fg_gc = NULL; sheet->bg_gc = NULL; + 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); } @@ -2728,10 +2746,7 @@ gtk_sheet_map (GtkWidget * widget) { GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); - if (!sheet->cursor_drag) sheet->cursor_drag = gdk_cursor_new (GDK_PLUS); - gdk_window_show (widget->window); - gdk_window_show (sheet->sheet_window); if (sheet->column_titles_visible) @@ -2745,12 +2760,12 @@ gtk_sheet_map (GtkWidget * widget) gdk_window_show (sheet->row_title_window); } - if (!GTK_WIDGET_MAPPED (sheet->sheet_entry) + if (!GTK_WIDGET_MAPPED (sheet->entry_widget) && sheet->active_cell.row >= 0 && sheet->active_cell.col >= 0 ) { - gtk_widget_show (sheet->sheet_entry); - gtk_widget_map (sheet->sheet_entry); + gtk_widget_show (sheet->entry_widget); + gtk_widget_map (sheet->entry_widget); } if (GTK_WIDGET_VISIBLE (sheet->button) && @@ -2810,8 +2825,8 @@ gtk_sheet_unmap (GtkWidget * widget) gdk_window_hide (sheet->row_title_window); gdk_window_hide (widget->window); - if (GTK_WIDGET_MAPPED (sheet->sheet_entry)) - gtk_widget_unmap (sheet->sheet_entry); + if (GTK_WIDGET_MAPPED (sheet->entry_widget)) + gtk_widget_unmap (sheet->entry_widget); if (GTK_WIDGET_MAPPED (sheet->button)) gtk_widget_unmap (sheet->button); @@ -2983,18 +2998,18 @@ gtk_sheet_cell_draw_label (GtkSheet *sheet, gint row, gint col) case GTK_JUSTIFY_RIGHT: size = area.width; area.x +=area.width; - { - for (i = col - 1; i >= MIN_VISIBLE_COLUMN (sheet); i--) - { - if ( !gtk_sheet_cell_empty (sheet, row, i)) break; - if (size >= text_width + CELLOFFSET) break; - size +=xxx_column_width (sheet, i); - xxx_column_set_right_column (sheet, i, - MAX (col, - xxx_column_right_column (sheet, i))); - } - area.width = size; - } + { + for (i = col - 1; i >= MIN_VISIBLE_COLUMN (sheet); i--) + { + if ( !gtk_sheet_cell_empty (sheet, row, i)) break; + if (size >= text_width + CELLOFFSET) break; + size +=xxx_column_width (sheet, i); + xxx_column_set_right_column (sheet, i, + MAX (col, + xxx_column_right_column (sheet, i))); + } + area.width = size; + } area.x -= size; xoffset += area.width - text_width - 2 * CELLOFFSET - attributes.border.width / 2; @@ -3003,28 +3018,28 @@ gtk_sheet_cell_draw_label (GtkSheet *sheet, gint row, gint col) sizel = area.width / 2; sizer = area.width / 2; area.x += area.width / 2; - { - for (i = col + 1; i <= MAX_VISIBLE_COLUMN (sheet); i++) - { - if ( ! gtk_sheet_cell_empty (sheet, row, i)) break; - if (sizer >= text_width / 2) break; - sizer += xxx_column_width (sheet, i); - xxx_column_set_left_column (sheet, i, - MIN ( - col, - xxx_column_left_column (sheet, i))); - } - for (i = col - 1; i >= MIN_VISIBLE_COLUMN (sheet); i--) - { - if ( ! gtk_sheet_cell_empty (sheet, row, i)) break; - if (sizel >= text_width / 2) break; - sizel +=xxx_column_width (sheet, i); - xxx_column_set_right_column (sheet, i, - MAX (col, - xxx_column_right_column (sheet, i))); - } - size = MIN (sizel, sizer); - } + { + for (i = col + 1; i <= MAX_VISIBLE_COLUMN (sheet); i++) + { + if ( ! gtk_sheet_cell_empty (sheet, row, i)) break; + if (sizer >= text_width / 2) break; + sizer += xxx_column_width (sheet, i); + xxx_column_set_left_column (sheet, i, + MIN ( + col, + xxx_column_left_column (sheet, i))); + } + for (i = col - 1; i >= MIN_VISIBLE_COLUMN (sheet); i--) + { + if ( ! gtk_sheet_cell_empty (sheet, row, i)) break; + if (sizel >= text_width / 2) break; + sizel +=xxx_column_width (sheet, i); + xxx_column_set_right_column (sheet, i, + MAX (col, + xxx_column_right_column (sheet, i))); + } + size = MIN (sizel, sizer); + } area.x -= sizel; xoffset += sizel - text_width / 2 - CELLOFFSET; area.width = sizel + sizer; @@ -3032,20 +3047,20 @@ gtk_sheet_cell_draw_label (GtkSheet *sheet, gint row, gint col) case GTK_JUSTIFY_LEFT: default: size = area.width; - { - for (i = col + 1; i <= MAX_VISIBLE_COLUMN (sheet); i++) - { - if (! gtk_sheet_cell_empty (sheet, row, i)) break; - if (size >= text_width + CELLOFFSET) break; - size +=xxx_column_width (sheet, i); - xxx_column_set_left_column (sheet, i, - MIN ( - col, - xxx_column_left_column (sheet, i))); - - } - area.width = size; - } + { + for (i = col + 1; i <= MAX_VISIBLE_COLUMN (sheet); i++) + { + if (! gtk_sheet_cell_empty (sheet, row, i)) break; + if (size >= text_width + CELLOFFSET) break; + size +=xxx_column_width (sheet, i); + xxx_column_set_left_column (sheet, i, + MIN ( + col, + xxx_column_left_column (sheet, i))); + + } + area.width = size; + } xoffset += attributes.border.width / 2; break; } @@ -3061,7 +3076,7 @@ gtk_sheet_cell_draw_label (GtkSheet *sheet, gint row, gint col) gdk_gc_set_clip_rectangle (fg_gc, NULL); g_object_unref (layout); - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, area.x, @@ -3128,7 +3143,7 @@ gtk_sheet_range_draw (GtkSheet *sheet, const GtkSheetRange *range) sheet->sheet_window_width - area.x, sheet->sheet_window_height); - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, area.x, @@ -3155,7 +3170,7 @@ gtk_sheet_range_draw (GtkSheet *sheet, const GtkSheetRange *range) sheet->sheet_window_width, sheet->sheet_window_height - area.y); - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, area.x, @@ -3301,7 +3316,7 @@ gtk_sheet_draw_backing_pixmap (GtkSheet *sheet, GtkSheetRange range) if (range.rowi == yyy_row_count (sheet) - 1) height = sheet->sheet_window_height - y; - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, x, @@ -3647,7 +3662,7 @@ gtk_sheet_set_active_cell (GtkSheet *sheet, gint row, gint column) return FALSE; if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) - gtk_sheet_deactivate_cell (sheet); + gtk_sheet_deactivate_cell (sheet); sheet->active_cell.row = row; sheet->active_cell.col = column; @@ -3698,8 +3713,8 @@ gtk_sheet_entry_changed (GtkWidget *widget, gpointer data) if (row < 0 || col < 0) return; - sheet->active_cell.row =- 1; - sheet->active_cell.col =- 1; + sheet->active_cell.row = -1; + sheet->active_cell.col = -1; text = gtk_entry_get_text (GTK_ENTRY (gtk_sheet_get_entry (sheet))); @@ -3778,11 +3793,11 @@ gtk_sheet_hide_active_cell (GtkSheet *sheet) row = sheet->active_cell.row; col = sheet->active_cell.col; - gtk_widget_hide (sheet->sheet_entry); - gtk_widget_unmap (sheet->sheet_entry); + gtk_widget_hide (sheet->entry_widget); + gtk_widget_unmap (sheet->entry_widget); if (row != -1 && col != -1) - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, COLUMN_LEFT_XPIXEL (sheet, col)- 1, @@ -3794,7 +3809,7 @@ gtk_sheet_hide_active_cell (GtkSheet *sheet) gtk_widget_grab_focus (GTK_WIDGET (sheet)); - GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (sheet->sheet_entry), GTK_VISIBLE); + GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE); } @@ -3865,7 +3880,7 @@ gtk_sheet_show_active_cell (GtkSheet *sheet) if (sheet->state != GTK_SHEET_NORMAL) return; if (GTK_SHEET_IN_SELECTION (sheet)) return; - GTK_WIDGET_SET_FLAGS (GTK_WIDGET (sheet->sheet_entry), GTK_VISIBLE); + GTK_WIDGET_SET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE); sheet_entry = GTK_ENTRY (gtk_sheet_get_entry (sheet)); @@ -3896,7 +3911,7 @@ gtk_sheet_show_active_cell (GtkSheet *sheet) gtk_sheet_entry_set_max_size (sheet); gtk_sheet_size_allocate_entry (sheet); - gtk_widget_map (sheet->sheet_entry); + gtk_widget_map (sheet->entry_widget); gtk_widget_grab_focus (GTK_WIDGET (sheet_entry)); @@ -3950,8 +3965,8 @@ gtk_sheet_make_backing_pixmap (GtkSheet *sheet, guint width, guint height) else { /* reallocate if sizes don't match */ - gdk_window_get_size (sheet->pixmap, - &pixmap_width, &pixmap_height); + gdk_drawable_get_size (sheet->pixmap, + &pixmap_width, &pixmap_height); if ( (pixmap_width != width) || (pixmap_height != height)) { g_object_unref (sheet->pixmap); @@ -4040,7 +4055,7 @@ gtk_sheet_new_selection (GtkSheet *sheet, GtkSheetRange *range) } if (j == sheet->range.coli) width = width + 3; - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, x + 1, @@ -4114,7 +4129,7 @@ gtk_sheet_new_selection (GtkSheet *sheet, GtkSheetRange *range) } if (j == sheet->range.coli) width = width + 3; - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, x + 1, @@ -4278,7 +4293,7 @@ gtk_sheet_draw_border (GtkSheet *sheet, GtkSheetRange new_range) gdk_gc_set_clip_rectangle (sheet->xor_gc, &area); - for (i =- 1; i <= 1; ++i) + for (i = -1; i <= 1; ++i) gdk_draw_rectangle (sheet->sheet_window, sheet->xor_gc, FALSE, @@ -4303,7 +4318,7 @@ gtk_sheet_draw_corners (GtkSheet *sheet, GtkSheetRange range) { x = COLUMN_LEFT_XPIXEL (sheet, range.col0); y = ROW_TOP_YPIXEL (sheet, range.row0); - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, x - 1, @@ -4331,7 +4346,7 @@ gtk_sheet_draw_corners (GtkSheet *sheet, GtkSheetRange range) y = ROW_TOP_YPIXEL (sheet, MIN_VISIBLE_ROW (sheet))+3; width = 3; } - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, x - width, @@ -4359,7 +4374,7 @@ gtk_sheet_draw_corners (GtkSheet *sheet, GtkSheetRange range) x = COLUMN_LEFT_XPIXEL (sheet, MIN_VISIBLE_COLUMN (sheet))+3; width = 3; } - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, x - width, @@ -4384,7 +4399,7 @@ gtk_sheet_draw_corners (GtkSheet *sheet, GtkSheetRange range) width = 1; if (sheet->state == GTK_SHEET_RANGE_SELECTED) width = 3; if (sheet->state == GTK_SHEET_NORMAL) width = 3; - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, x - width, @@ -4480,6 +4495,9 @@ gtk_sheet_select_range (GtkSheet * sheet, const GtkSheetRange *range) 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; @@ -4574,11 +4592,7 @@ gtk_sheet_expose (GtkWidget * widget, if ((!GTK_SHEET_IN_XDRAG (sheet)) && (!GTK_SHEET_IN_YDRAG (sheet))) { if (sheet->state == GTK_SHEET_NORMAL) - { - gtk_sheet_draw_active_cell (sheet); - if (!GTK_SHEET_IN_SELECTION (sheet)) - gtk_widget_queue_draw (sheet->sheet_entry); - } + gtk_sheet_draw_active_cell (sheet); } } } @@ -5217,7 +5231,7 @@ gtk_sheet_motion (GtkWidget * widget, new_cursor = GDK_SB_H_DOUBLE_ARROW; if (new_cursor != sheet->cursor_drag->type) { - gdk_cursor_destroy (sheet->cursor_drag); + gdk_cursor_unref (sheet->cursor_drag); sheet->cursor_drag = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW); gdk_window_set_cursor (sheet->column_title_window, sheet->cursor_drag); @@ -5229,7 +5243,7 @@ gtk_sheet_motion (GtkWidget * widget, if (!GTK_SHEET_IN_XDRAG (sheet) && new_cursor != sheet->cursor_drag->type) { - gdk_cursor_destroy (sheet->cursor_drag); + gdk_cursor_unref (sheet->cursor_drag); sheet->cursor_drag = gdk_cursor_new (GDK_TOP_LEFT_ARROW); gdk_window_set_cursor (sheet->column_title_window, sheet->cursor_drag); @@ -5246,7 +5260,7 @@ gtk_sheet_motion (GtkWidget * widget, new_cursor = GDK_SB_V_DOUBLE_ARROW; if (new_cursor != sheet->cursor_drag->type) { - gdk_cursor_destroy (sheet->cursor_drag); + gdk_cursor_unref (sheet->cursor_drag); sheet->cursor_drag = gdk_cursor_new (GDK_SB_V_DOUBLE_ARROW); gdk_window_set_cursor (sheet->row_title_window, sheet->cursor_drag); } @@ -5257,7 +5271,7 @@ gtk_sheet_motion (GtkWidget * widget, if (!GTK_SHEET_IN_YDRAG (sheet) && new_cursor != sheet->cursor_drag->type) { - gdk_cursor_destroy (sheet->cursor_drag); + gdk_cursor_unref (sheet->cursor_drag); sheet->cursor_drag = gdk_cursor_new (GDK_TOP_LEFT_ARROW); gdk_window_set_cursor (sheet->row_title_window, sheet->cursor_drag); } @@ -5272,7 +5286,7 @@ gtk_sheet_motion (GtkWidget * widget, !GTK_SHEET_IN_RESIZE (sheet) && new_cursor != sheet->cursor_drag->type) { - gdk_cursor_destroy (sheet->cursor_drag); + gdk_cursor_unref (sheet->cursor_drag); sheet->cursor_drag = gdk_cursor_new (GDK_PLUS); gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag); } @@ -5283,7 +5297,7 @@ gtk_sheet_motion (GtkWidget * widget, new_cursor != sheet->cursor_drag->type) { - gdk_cursor_destroy (sheet->cursor_drag); + gdk_cursor_unref (sheet->cursor_drag); sheet->cursor_drag = gdk_cursor_new (GDK_TOP_LEFT_ARROW); gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag); } @@ -5296,7 +5310,7 @@ gtk_sheet_motion (GtkWidget * widget, GTK_SHEET_IN_RESIZE (sheet)) && new_cursor != sheet->cursor_drag->type) { - gdk_cursor_destroy (sheet->cursor_drag); + gdk_cursor_unref (sheet->cursor_drag); sheet->cursor_drag = gdk_cursor_new (GDK_SIZING); gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag); } @@ -5464,8 +5478,8 @@ gtk_sheet_move_query (GtkSheet *sheet, gint row, gint column) row_move = FALSE; column_move = FALSE; - row_align =- 1.; - col_align =- 1.; + row_align = -1.; + col_align = -1.; height = sheet->sheet_window_height; width = sheet->sheet_window_width; @@ -5550,7 +5564,7 @@ gtk_sheet_extend_selection (GtkSheet *sheet, gint row, gint column) sheet->range.row0 = r; sheet->range.coli = c; sheet->range.rowi = r; - gdk_draw_pixmap (sheet->sheet_window, + gdk_draw_drawable (sheet->sheet_window, GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL], sheet->pixmap, COLUMN_LEFT_XPIXEL (sheet, c)- 1, @@ -5619,7 +5633,7 @@ gtk_sheet_key_press (GtkWidget *widget, if (sheet->state == GTK_SHEET_NORMAL && !GTK_SHEET_IN_SELECTION (sheet)) g_signal_stop_emission_by_name (gtk_sheet_get_entry (sheet), - "key-press-event"); + "key-press-event"); row = sheet->active_cell.row; col = sheet->active_cell.col; if (sheet->state == GTK_SHEET_COLUMN_SELECTED) @@ -6090,7 +6104,7 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet) &attributes) ) return ; - if ( GTK_WIDGET_REALIZED (sheet->sheet_entry) ) + if ( GTK_WIDGET_REALIZED (sheet->entry_widget) ) { if (!GTK_WIDGET (sheet_entry)->style) gtk_widget_ensure_style (GTK_WIDGET (sheet_entry)); @@ -6110,12 +6124,12 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet) style->font_desc = pango_font_description_copy (attributes.font_desc); GTK_WIDGET (sheet_entry)->style = style; - gtk_widget_size_request (sheet->sheet_entry, NULL); + gtk_widget_size_request (sheet->entry_widget, NULL); GTK_WIDGET (sheet_entry)->style = previous_style; if (style != previous_style) { - if (!GTK_IS_ITEM_ENTRY (sheet->sheet_entry)) + if (!GTK_IS_ITEM_ENTRY (sheet->entry_widget)) { style->bg[GTK_STATE_NORMAL] = previous_style->bg[GTK_STATE_NORMAL]; style->fg[GTK_STATE_NORMAL] = previous_style->fg[GTK_STATE_NORMAL]; @@ -6150,7 +6164,7 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet) shentry_allocation.width = column_width; shentry_allocation.height = yyy_row_height (sheet, sheet->active_cell.row); - if (GTK_IS_ITEM_ENTRY (sheet->sheet_entry)) + if (GTK_IS_ITEM_ENTRY (sheet->entry_widget)) { shentry_allocation.height -= 2 * CELLOFFSET; shentry_allocation.y += CELLOFFSET; @@ -6171,7 +6185,7 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet) } } - if (!GTK_IS_ITEM_ENTRY (sheet->sheet_entry)) + if (!GTK_IS_ITEM_ENTRY (sheet->entry_widget)) { shentry_allocation.x += 2; shentry_allocation.y += 2; @@ -6179,7 +6193,7 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet) shentry_allocation.height -= MIN (shentry_allocation.height, 3); } - gtk_widget_size_allocate (sheet->sheet_entry, &shentry_allocation); + gtk_widget_size_allocate (sheet->entry_widget, &shentry_allocation); if (previous_style == style) g_object_unref (previous_style); } @@ -6197,10 +6211,10 @@ gtk_sheet_entry_set_max_size (GtkSheet *sheet) row = sheet->active_cell.row; col = sheet->active_cell.col; - if ( ! GTK_IS_ITEM_ENTRY (sheet->sheet_entry) ) + if ( ! GTK_IS_ITEM_ENTRY (sheet->entry_widget) ) return; - justification = GTK_ITEM_ENTRY (sheet->sheet_entry)->justification; + justification = GTK_ITEM_ENTRY (sheet->entry_widget)->justification; switch (justification) { @@ -6248,76 +6262,56 @@ gtk_sheet_entry_set_max_size (GtkSheet *sheet) if (size != 0) size += xxx_column_width (sheet, col); - GTK_ITEM_ENTRY (sheet->sheet_entry)->text_max_size = size; + GTK_ITEM_ENTRY (sheet->entry_widget)->text_max_size = size; } static void create_sheet_entry (GtkSheet *sheet) { - GtkWidget *widget; - GtkWidget *parent; - GtkWidget *entry; - gint found_entry = FALSE; - - widget = GTK_WIDGET (sheet); - - if (sheet->sheet_entry) + if (sheet->entry_widget) { - /* avoids warnings */ - gtk_widget_ref (sheet->sheet_entry); - gtk_widget_unparent (sheet->sheet_entry); - gtk_widget_destroy (sheet->sheet_entry); + gtk_widget_unparent (sheet->entry_widget); } if (sheet->entry_type) { - if (!g_type_is_a (sheet->entry_type, GTK_TYPE_ENTRY)) - { - parent = g_object_new (sheet->entry_type, NULL); + sheet->entry_container = g_object_new (sheet->entry_type, NULL); + g_object_ref_sink (sheet->entry_container); + sheet->entry_widget = gtk_sheet_get_entry (sheet); - sheet->sheet_entry = parent; - - entry = gtk_sheet_get_entry (sheet); - if (GTK_IS_ENTRY (entry)) - found_entry = TRUE; - } - else + if ( NULL == sheet->entry_widget) { - parent = g_object_new (sheet->entry_type, NULL); - entry = parent; - found_entry = TRUE; + g_warning ("Entry type is %s. It must be GtkEntry subclass, or a widget containing one. " + "Using default", g_type_name (sheet->entry_type)); + g_object_unref (sheet->entry_container); + sheet->entry_widget = sheet->entry_container = gtk_item_entry_new (); } - - if (!found_entry) + else { - g_warning ("Entry type must be GtkEntry subclass, using default"); - entry = gtk_item_entry_new (); - sheet->sheet_entry = entry; + sheet->entry_widget = sheet->entry_container ; } - else - sheet->sheet_entry = parent; } else { - entry = gtk_item_entry_new (); - sheet->sheet_entry = entry; + sheet->entry_widget = sheet->entry_container = gtk_item_entry_new (); + g_object_ref_sink (sheet->entry_container); } - gtk_widget_size_request (sheet->sheet_entry, NULL); + gtk_widget_size_request (sheet->entry_widget, NULL); if (GTK_WIDGET_REALIZED (sheet)) { - gtk_widget_set_parent_window (sheet->sheet_entry, sheet->sheet_window); - gtk_widget_set_parent (sheet->sheet_entry, GTK_WIDGET (sheet)); - gtk_widget_realize (sheet->sheet_entry); + 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 (entry, "key_press_event", + g_signal_connect_swapped (sheet->entry_widget, "key_press_event", G_CALLBACK (gtk_sheet_entry_key_press), sheet); - gtk_widget_show (sheet->sheet_entry); + gtk_widget_show (sheet->entry_widget); } @@ -6343,11 +6337,12 @@ gtk_sheet_get_entry (GtkSheet *sheet) g_return_val_if_fail (sheet != NULL, NULL); g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL); - g_return_val_if_fail (sheet->sheet_entry != NULL, NULL); + g_return_val_if_fail (sheet->entry_widget != NULL, NULL); - if (GTK_IS_ENTRY (sheet->sheet_entry)) return (sheet->sheet_entry); + if (GTK_IS_ENTRY (sheet->entry_container)) + return (sheet->entry_container); - parent = GTK_WIDGET (sheet->sheet_entry); + parent = sheet->entry_container; if (GTK_IS_TABLE (parent)) children = GTK_TABLE (parent)->children; if (GTK_IS_BOX (parent)) children = GTK_BOX (parent)->children; @@ -6392,9 +6387,9 @@ gtk_sheet_get_entry_widget (GtkSheet *sheet) { g_return_val_if_fail (sheet != NULL, NULL); g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL); - g_return_val_if_fail (sheet->sheet_entry != NULL, NULL); + g_return_val_if_fail (sheet->entry_widget != NULL, NULL); - return (sheet->sheet_entry); + return (sheet->entry_widget); } @@ -6605,7 +6600,7 @@ gtk_sheet_column_title_button_draw (GtkSheet *sheet, gint column) is_sensitive, allocation); /* FIXME: Not freeing this button is correct (sort of), - because in PSPP the model always returns a static copy */ + because in PSPP the model always returns a static copy */ /* gtk_sheet_button_free (button); */ @@ -6692,16 +6687,14 @@ vadjustment_value_changed (GtkAdjustment * adjustment, if (GTK_SHEET_IS_FROZEN (sheet)) return; - row = ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + CELL_SPACING); - if (!sheet->column_titles_visible) - row = ROW_FROM_YPIXEL (sheet, CELL_SPACING); + row = ROW_FROM_YPIXEL (sheet, CELL_SPACING); old_value = - sheet->voffset; new_row = g_sheet_row_pixel_to_row (sheet->row_geometry, - adjustment->value, sheet); + adjustment->value); - y = g_sheet_row_start_pixel (sheet->row_geometry, new_row, sheet); + y = g_sheet_row_start_pixel (sheet->row_geometry, new_row); if (adjustment->value > sheet->old_vadjustment && sheet->old_vadjustment > 0. && yyy_row_height (sheet, row) > sheet->vadjustment->step_increment) @@ -6756,7 +6749,7 @@ vadjustment_value_changed (GtkAdjustment * adjustment, sheet->voffset = - value; - if (GTK_WIDGET_REALIZED (sheet->sheet_entry) && + if (GTK_WIDGET_REALIZED (sheet->entry_widget) && sheet->state == GTK_SHEET_NORMAL && sheet->active_cell.row >= 0 && sheet->active_cell.col >= 0 && !gtk_sheet_cell_isvisible (sheet, sheet->active_cell.row, @@ -6770,7 +6763,7 @@ vadjustment_value_changed (GtkAdjustment * adjustment, gtk_sheet_cell_clear (sheet, sheet->active_cell.row, sheet->active_cell.col); - gtk_widget_unmap (sheet->sheet_entry); + gtk_widget_unmap (sheet->entry_widget); } gtk_sheet_position_children (sheet); @@ -6797,9 +6790,7 @@ hadjustment_value_changed (GtkAdjustment * adjustment, if (GTK_SHEET_IS_FROZEN (sheet)) return; - column = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + CELL_SPACING); - if (!sheet->row_titles_visible) - column = COLUMN_FROM_XPIXEL (sheet, CELL_SPACING); + column = COLUMN_FROM_XPIXEL (sheet, CELL_SPACING); old_value = - sheet->hoffset; @@ -6862,7 +6853,7 @@ hadjustment_value_changed (GtkAdjustment * adjustment, } sheet->hoffset = - value; - if (GTK_WIDGET_REALIZED (sheet->sheet_entry) && + if (GTK_WIDGET_REALIZED (sheet->entry_widget) && sheet->state == GTK_SHEET_NORMAL && sheet->active_cell.row >= 0 && sheet->active_cell.col >= 0 && !gtk_sheet_cell_isvisible (sheet, sheet->active_cell.row, @@ -6876,7 +6867,7 @@ hadjustment_value_changed (GtkAdjustment * adjustment, sheet->active_cell.row, sheet->active_cell.col); - gtk_widget_unmap (sheet->sheet_entry); + gtk_widget_unmap (sheet->entry_widget); } gtk_sheet_position_children (sheet); @@ -6966,7 +6957,7 @@ draw_xor_rectangle (GtkSheet *sheet, GtkSheetRange range) gdk_gc_set_clip_rectangle (sheet->xor_gc, &clip_area); - for (i =- 1; i <= 1; ++i) + for (i = -1; i <= 1; ++i) gdk_draw_rectangle (sheet->sheet_window, sheet->xor_gc, FALSE, @@ -7159,7 +7150,6 @@ init_attributes (const GtkSheet *sheet, gint col, GtkSheetCellAttr *attributes) { GdkColormap *colormap; colormap = gdk_colormap_get_system (); - gdk_color_black (colormap, &attributes->foreground); attributes->background = sheet->bg_color; } attributes->justification = xxx_column_justification (sheet, col); @@ -7685,10 +7675,12 @@ gtk_sheet_forall (GtkContainer *container, (* callback) (child->widget, callback_data); } - if (sheet->button) + + if (sheet->button && sheet->button->parent) (* callback) (sheet->button, callback_data); - if (sheet->sheet_entry) - (* callback) (sheet->sheet_entry, callback_data); + + if (sheet->entry_container && GTK_IS_CONTAINER (sheet->entry_container)) + (* callback) (sheet->entry_container, callback_data); } @@ -7761,6 +7753,7 @@ gtk_sheet_remove (GtkContainer *container, GtkWidget *widget) g_free (child); } + gtk_widget_unparent (sheet->button); } static void @@ -7850,7 +7843,7 @@ gtk_sheet_button_new (void) } -inline void +void gtk_sheet_button_free (GtkSheetButton *button) { if (!button) return ; @@ -7860,10 +7853,21 @@ gtk_sheet_button_free (GtkSheetButton *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) { - gchar *celltext = NULL; gint r, c; GString *string; @@ -7876,16 +7880,12 @@ range_to_text (const GtkSheet *sheet) { for (c = sheet->range.col0; c < sheet->range.coli; ++c) { - celltext = gtk_sheet_cell_get_text (sheet, r, c); - g_string_append (string, celltext); + append_cell_text (string, sheet, r, c); g_string_append (string, "\t"); - g_free (celltext); } - celltext = gtk_sheet_cell_get_text (sheet, r, c); - g_string_append (string, celltext); + append_cell_text (string, sheet, r, c); if ( r < sheet->range.rowi) g_string_append (string, "\n"); - g_free (celltext); } return string; @@ -7894,7 +7894,6 @@ range_to_text (const GtkSheet *sheet) static GString * range_to_html (const GtkSheet *sheet) { - gchar *celltext = NULL; gint r, c; GString *string; @@ -7906,16 +7905,14 @@ range_to_html (const GtkSheet *sheet) g_string_append (string, "\n"); g_string_append (string, "\n"); g_string_append (string, "\n"); - for (r = sheet->range.row0; r <= sheet->range.rowi; ++r) + for (r = sheet->range.row0; r <= sheet->range.rowi; ++r) { g_string_append (string, "\n"); for (c = sheet->range.col0; c <= sheet->range.coli; ++c) { g_string_append (string, "\n"); - g_free (celltext); } g_string_append (string, "\n"); } @@ -7942,16 +7939,16 @@ primary_get_cb (GtkClipboard *clipboard, 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 (); - } + { + 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, @@ -7964,6 +7961,9 @@ 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); } @@ -7973,24 +7973,24 @@ 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 }, + { "TEXT", 0, SELECT_FMT_TEXT }, { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT }, - { "text/plain;charset=utf-8", 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), + 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, + if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets), primary_get_cb, primary_clear_cb, G_OBJECT (sheet)))
"); - celltext = gtk_sheet_cell_get_text (sheet, r, c); - g_string_append (string, celltext); + append_cell_text (string, sheet, r, c); g_string_append (string, "