diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/e-table/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/e-table/e-table-model.c | 6 | ||||
| -rw-r--r-- | widgets/e-table/e-table.c | 27 | ||||
| -rw-r--r-- | widgets/table/e-table-model.c | 6 | ||||
| -rw-r--r-- | widgets/table/e-table.c | 27 |
5 files changed, 48 insertions, 24 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index dfaec4ac67..cbe7259942 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,9 @@ +2000-06-11 Christopher James Lahey <clahey@helixcode.com> + + * e-table-model.c: Small syntactic changes. + + * e-table.c: Moved the table header into the scrolled view. + 2000-06-11 Ettore Perazzoli <ettore@helixcode.com> * Makefile.am (table_test_LDADD): Link with libemiscwidgets.a. diff --git a/widgets/e-table/e-table-model.c b/widgets/e-table/e-table-model.c index 7ed8a9ba5f..38f5592bb8 100644 --- a/widgets/e-table/e-table-model.c +++ b/widgets/e-table/e-table-model.c @@ -13,7 +13,7 @@ #define ETM_CLASS(e) ((ETableModelClass *)((GtkObject *)e)->klass) -#define PARENT_TYPE gtk_object_get_type (); +#define PARENT_TYPE gtk_object_get_type () static GtkObjectClass *e_table_model_parent_class; @@ -142,7 +142,7 @@ static void e_table_model_class_init (GtkObjectClass *object_class) { ETableModelClass *klass = E_TABLE_MODEL_CLASS(object_class); - e_table_model_parent_class = gtk_type_class (gtk_object_get_type ()); + e_table_model_parent_class = gtk_type_class (PARENT_TYPE); object_class->destroy = e_table_model_destroy; @@ -225,7 +225,7 @@ e_table_model_get_type (void) (GtkClassInitFunc) NULL, }; - type = gtk_type_unique (gtk_object_get_type (), &info); + type = gtk_type_unique (PARENT_TYPE, &info); } return type; diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c index d88daac5db..f278ad11a5 100644 --- a/widgets/e-table/e-table.c +++ b/widgets/e-table/e-table.c @@ -449,7 +449,8 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, xmlNode *xmlGrouping; int no_header; int row = 0; - + + GtkWidget *internal_table; GtkWidget *scrollframe; xmlRoot = xmlDocGetRootElement (xmlSpec); @@ -498,29 +499,37 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, E_SCROLL_FRAME (scrollframe), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - gtk_container_add ( - GTK_CONTAINER (scrollframe), - GTK_WIDGET (e_table->table_canvas)); - gtk_widget_show (scrollframe); - + + internal_table = gtk_table_new(1, 2, FALSE); if (!no_header) { /* * The header */ gtk_table_attach ( - GTK_TABLE (e_table), GTK_WIDGET (e_table->header_canvas), + GTK_TABLE (internal_table), GTK_WIDGET (e_table->header_canvas), 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); row ++; } + gtk_table_attach (GTK_TABLE (internal_table), GTK_WIDGET (e_table->table_canvas), + 0, 1, 0 + row, 1 + row, + GTK_FILL | GTK_EXPAND, + GTK_FILL | GTK_EXPAND, + 0, 0); + gtk_widget_show(internal_table); + + gtk_container_add ( + GTK_CONTAINER (scrollframe), + internal_table); + gtk_widget_show (scrollframe); + /* * The body */ gtk_table_attach ( GTK_TABLE (e_table), GTK_WIDGET (scrollframe), - 0, 1, 0 + row, 1 + row, + 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0); diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index 7ed8a9ba5f..38f5592bb8 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -13,7 +13,7 @@ #define ETM_CLASS(e) ((ETableModelClass *)((GtkObject *)e)->klass) -#define PARENT_TYPE gtk_object_get_type (); +#define PARENT_TYPE gtk_object_get_type () static GtkObjectClass *e_table_model_parent_class; @@ -142,7 +142,7 @@ static void e_table_model_class_init (GtkObjectClass *object_class) { ETableModelClass *klass = E_TABLE_MODEL_CLASS(object_class); - e_table_model_parent_class = gtk_type_class (gtk_object_get_type ()); + e_table_model_parent_class = gtk_type_class (PARENT_TYPE); object_class->destroy = e_table_model_destroy; @@ -225,7 +225,7 @@ e_table_model_get_type (void) (GtkClassInitFunc) NULL, }; - type = gtk_type_unique (gtk_object_get_type (), &info); + type = gtk_type_unique (PARENT_TYPE, &info); } return type; diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index d88daac5db..f278ad11a5 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -449,7 +449,8 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, xmlNode *xmlGrouping; int no_header; int row = 0; - + + GtkWidget *internal_table; GtkWidget *scrollframe; xmlRoot = xmlDocGetRootElement (xmlSpec); @@ -498,29 +499,37 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm, E_SCROLL_FRAME (scrollframe), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - gtk_container_add ( - GTK_CONTAINER (scrollframe), - GTK_WIDGET (e_table->table_canvas)); - gtk_widget_show (scrollframe); - + + internal_table = gtk_table_new(1, 2, FALSE); if (!no_header) { /* * The header */ gtk_table_attach ( - GTK_TABLE (e_table), GTK_WIDGET (e_table->header_canvas), + GTK_TABLE (internal_table), GTK_WIDGET (e_table->header_canvas), 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); row ++; } + gtk_table_attach (GTK_TABLE (internal_table), GTK_WIDGET (e_table->table_canvas), + 0, 1, 0 + row, 1 + row, + GTK_FILL | GTK_EXPAND, + GTK_FILL | GTK_EXPAND, + 0, 0); + gtk_widget_show(internal_table); + + gtk_container_add ( + GTK_CONTAINER (scrollframe), + internal_table); + gtk_widget_show (scrollframe); + /* * The body */ gtk_table_attach ( GTK_TABLE (e_table), GTK_WIDGET (scrollframe), - 0, 1, 0 + row, 1 + row, + 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0); |