#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);
{
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);
}
{
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);
}
{
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
{
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
{
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;
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);
}
{
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);
}
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);
}
PROP_MODEL
};
+static void
+gtk_sheet_set_row_geometry (GtkSheet *sheet, GSheetRow *geo)
+{
+ 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,
guint prop_id,
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);
static void
gtk_sheet_init (GtkSheet *sheet)
{
+ sheet->model = NULL;
sheet->column_geometry = NULL;
sheet->row_geometry = NULL;
sheet->selection_cell.row = 0;
sheet->selection_cell.col = 0;
- sheet->sheet_entry = NULL;
sheet->pixmap = NULL;
sheet->range.row0 = 0;
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;
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;
if ( model)
{
+ g_object_ref (model);
+
g_signal_connect (model, "range_changed",
G_CALLBACK (range_update_callback), sheet);
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;
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;
"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);
}
static void
-gtk_sheet_dispose (GObject * object)
+gtk_sheet_dispose (GObject *object)
{
GtkSheet *sheet = GTK_SHEET (object);
GList *children;
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)
/* 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);
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);
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);
}
{
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)
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) &&
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);
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,
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,
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,
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,
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,
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);
}
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));
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));
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);
}
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,
}
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,
{
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,
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,
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,
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,
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;
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);
}
}
}
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);
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);
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);
}
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);
}
!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);
}
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);
}
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);
}
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,
&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));
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];
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;
}
}
- if (!GTK_IS_ITEM_ENTRY (sheet->sheet_entry))
+ if (!GTK_IS_ITEM_ENTRY (sheet->entry_widget))
{
shentry_allocation.x += 2;
shentry_allocation.y += 2;
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);
}
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)
{
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);
}
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;
{
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);
}
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)
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,
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);
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;
}
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,
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);
{
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);
(* 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);
}
g_free (child);
}
+ gtk_widget_unparent (sheet->button);
}
static void
}
-inline void
+void
gtk_sheet_button_free (GtkSheetButton *button)
{
if (!button) return ;
}
+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;
{
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;
static GString *
range_to_html (const GtkSheet *sheet)
{
- gchar *celltext = NULL;
gint r, c;
GString *string;
for (c = sheet->range.col0; c <= sheet->range.coli; ++c)
{
g_string_append (string, "<td>");
- 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, "</td>\n");
- g_free (celltext);
}
g_string_append (string, "</tr>\n");
}
gpointer data)
{
GtkSheet *sheet = GTK_SHEET (data);
+ if ( ! GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
+ return;
+
gtk_sheet_real_unselect_range (sheet, NULL);
}
projects / pspp-builds.git / blobdiff