From 9de25e88aa7b0d125739fda6bbbfdb4ebe16f951 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 13 Jun 2000 00:41:47 +0000 Subject: Removed the freeze/thaw stuff for the model. As Chris wisely pointed out, 2000-06-12 Federico Mena Quintero * e-table-model.[ch]: Removed the freeze/thaw stuff for the model. As Chris wisely pointed out, having freeze/thaw on the model makes its state inconsistent from the perspective of the views. * e-table-sorted-variable.c: Do not check for a frozen model. * e-table-subset.c: Likewise. * e-table-subset-variable.c: Likewise. * e-table-example-1.c: Removed the ETableModel thaw handler. * e-table-example-2.c: Likewise. * e-table-simple.c: Likewise. * e-table-size-test.c: Likewise. * test-check.c: Likewise. * test-cols.c: Likewise. * test-table.c: Likewise. svn path=/trunk/; revision=3543 --- widgets/e-table/e-table-subset.c | 42 ++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) (limited to 'widgets/e-table/e-table-subset.c') diff --git a/widgets/e-table/e-table-subset.c b/widgets/e-table/e-table-subset.c index a0add3b954..d2b1e37a9d 100644 --- a/widgets/e-table/e-table-subset.c +++ b/widgets/e-table/e-table-subset.c @@ -114,12 +114,6 @@ etss_value_is_empty (ETableModel *etm, int col, const void *value) return e_table_model_value_is_empty (etss->source, col, value); } -static void -etss_thaw (ETableModel *etm) -{ - e_table_model_changed (etm); -} - static void etss_class_init (GtkObjectClass *klass) { @@ -138,7 +132,6 @@ etss_class_init (GtkObjectClass *klass) table_class->free_value = etss_free_value; table_class->initialize_value = etss_initialize_value; table_class->value_is_empty = etss_value_is_empty; - table_class->thaw = etss_thaw; } E_MAKE_TYPE(e_table_subset, "ETableSubset", ETableSubset, etss_class_init, NULL, PARENT_TYPE); @@ -146,23 +139,20 @@ E_MAKE_TYPE(e_table_subset, "ETableSubset", ETableSubset, etss_class_init, NULL, static void etss_proxy_model_changed (ETableModel *etm, ETableSubset *etss) { - if (!E_TABLE_MODEL(etss)->frozen) - e_table_model_changed (E_TABLE_MODEL (etss)); + e_table_model_changed (E_TABLE_MODEL (etss)); } static void etss_proxy_model_row_changed (ETableModel *etm, int row, ETableSubset *etss) { - if (!E_TABLE_MODEL(etss)->frozen){ - const int n = etss->n_map; - const int * const map_table = etss->map_table; - int i; + const int n = etss->n_map; + const int * const map_table = etss->map_table; + int i; - for (i = 0; i < n; i++){ - if (map_table [i] == row){ - e_table_model_row_changed (E_TABLE_MODEL (etss), i); - return; - } + for (i = 0; i < n; i++){ + if (map_table [i] == row){ + e_table_model_row_changed (E_TABLE_MODEL (etss), i); + return; } } } @@ -170,16 +160,14 @@ etss_proxy_model_row_changed (ETableModel *etm, int row, ETableSubset *etss) static void etss_proxy_model_cell_changed (ETableModel *etm, int col, int row, ETableSubset *etss) { - if (!E_TABLE_MODEL(etss)->frozen){ - const int n = etss->n_map; - const int * const map_table = etss->map_table; - int i; + const int n = etss->n_map; + const int * const map_table = etss->map_table; + int i; - for (i = 0; i < n; i++){ - if (map_table [i] == row){ - e_table_model_cell_changed (E_TABLE_MODEL (etss), col, i); - return; - } + for (i = 0; i < n; i++){ + if (map_table [i] == row){ + e_table_model_cell_changed (E_TABLE_MODEL (etss), col, i); + return; } } } -- cgit v1.2.3