[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/lib/gtksheet gtksheet.c gtksheet.h
From: |
John Darrington |
Subject: |
[Pspp-cvs] pspp/lib/gtksheet gtksheet.c gtksheet.h |
Date: |
Sun, 02 Mar 2008 04:39:51 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 08/03/02 04:39:51
Modified files:
lib/gtksheet : gtksheet.c gtksheet.h
Log message:
GtkSheet now properly owns its model(s)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.h?cvsroot=pspp&r1=1.18&r2=1.19
Patches:
Index: gtksheet.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- gtksheet.c 29 Feb 2008 09:13:50 -0000 1.40
+++ gtksheet.c 2 Mar 2008 04:39:51 -0000 1.41
@@ -889,6 +889,27 @@
};
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,
const GValue *value,
@@ -900,10 +921,10 @@
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 +1253,7 @@
static void
gtk_sheet_init (GtkSheet *sheet)
{
+ sheet->model = NULL;
sheet->column_geometry = NULL;
sheet->row_geometry = NULL;
@@ -1482,6 +1504,8 @@
if ( model)
{
+ g_object_ref (model);
+
g_signal_connect (model, "range_changed",
G_CALLBACK (range_update_callback), sheet);
@@ -2401,7 +2425,7 @@
}
static void
-gtk_sheet_dispose (GObject * object)
+gtk_sheet_dispose (GObject *object)
{
GtkSheet *sheet = GTK_SHEET (object);
GList *children;
@@ -2412,9 +2436,12 @@
if ( sheet->dispose_has_run )
return ;
- if (sheet->model) g_object_unref (sheet->model);
sheet->dispose_has_run = TRUE;
+ 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);
g_object_unref (sheet->button);
@@ -2595,6 +2622,7 @@
GDK_GC_FUNCTION |
GDK_GC_SUBWINDOW);
+
gtk_widget_set_parent_window (sheet->entry_widget, sheet->sheet_window);
gtk_widget_set_parent (sheet->entry_widget, GTK_WIDGET (sheet));
@@ -2699,6 +2727,9 @@
sheet->fg_gc = NULL;
sheet->bg_gc = NULL;
+ gtk_widget_unparent (sheet->entry_widget);
+ gtk_widget_unparent (sheet->button);
+
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
@@ -6662,8 +6693,6 @@
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);
old_value = - sheet->voffset;
@@ -6767,8 +6796,6 @@
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);
old_value = - sheet->hoffset;
@@ -7937,6 +7964,9 @@
gpointer data)
{
GtkSheet *sheet = GTK_SHEET (data);
+ if ( ! GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
+ return;
+
gtk_sheet_real_unselect_range (sheet, NULL);
}
Index: gtksheet.h
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gtksheet.h 27 Feb 2008 10:10:28 -0000 1.18
+++ gtksheet.h 2 Mar 2008 04:39:51 -0000 1.19
@@ -436,6 +436,11 @@
gtk_sheet_show_row_titles (GtkSheet *sheet);
void
gtk_sheet_hide_row_titles (GtkSheet *sheet);
+void
+gtk_sheet_show_column_titles (GtkSheet *sheet);
+void
+gtk_sheet_hide_column_titles (GtkSheet *sheet);
+
gboolean
gtk_sheet_row_titles_visible (GtkSheet *sheet);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/lib/gtksheet gtksheet.c gtksheet.h,
John Darrington <=